commit 62755e77ea2a8709b8df74c13782d9115859fae8
author Etan Cohen <etancohen@google.com> Tue Nov 28 10:42:18 2017 -0800
committer Etan Cohen <etancohen@google.com> Thu Dec 14 17:57:51 2017 -0800
tree 01eb6fe6cdbca98ed2ff9a3eeb4989a0c72ae86e
parent 040c542b3313748f40a4135b6650eecff8ad4d62

[WIFI] Move verbose logging init to Injector

Move generic verbose logging to the injector (which is generic
across all Wi-Fi components).

Bug: 69432628
Test: build, enable verbose & verify log
Change-Id: I90c57793cdefb3c46729ff465a1c731b61d077c5

service/java/com/android/server/wifi/WifiInjector.java

diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java
index 9c9622c..ba1d4d6 100644
--- a/service/java/com/android/server/wifi/WifiInjector.java
+++ b/service/java/com/android/server/wifi/WifiInjector.java
@@ -261,6 +261,16 @@
         return sWifiInjector;
     }
 
+    /**
+     * Enable verbose logging in Injector objects. Called from the WifiServiceImpl (based on
+     * binder call).
+     */
+    public void enableVerboseLogging(int verbose) {
+        mWifiLastResortWatchdog.enableVerboseLogging(verbose);
+        mWifiBackupRestore.enableVerboseLogging(verbose);
+        LogcatLog.enableVerboseLogging(verbose);
+    }
+
     public UserManager getUserManager() {
         return UserManager.get(mContext);
     }

service/java/com/android/server/wifi/WifiServiceImpl.java

diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index 2724cb5..ce49e55 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -2407,9 +2407,7 @@
         mWifiStateMachine.enableVerboseLogging(verbose);
         mWifiLockManager.enableVerboseLogging(verbose);
         mWifiMulticastLockManager.enableVerboseLogging(verbose);
-        mWifiInjector.getWifiLastResortWatchdog().enableVerboseLogging(verbose);
-        mWifiInjector.getWifiBackupRestore().enableVerboseLogging(verbose);
-        LogcatLog.enableVerboseLogging(verbose);
+        mWifiInjector.enableVerboseLogging(verbose);
     }
 
     @Override