commit 2e818f6401f66a6eeffec4b0dfcaee1ead30d341
author Rebecca Silberstein <silberst@google.com> Fri Aug 05 16:59:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 05 16:59:22 2016 +0000
tree cd903acb186b687bcd261a49cb73346c7c8fcbf8
parent 2efcaa62b92a20fed7c370a18b948ea1fcdd7e51
parent 01dafe766c969517561dd9fd733ec475bc8eee5d

[DO NOT MERGE] WifiStateMachine: check verbosity level in update
am: 01dafe766c

Change-Id: I0c01e190bf3431dbb90a698167ac4df582fff916

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

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 65bf102..05d1ab5 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -1299,6 +1299,11 @@
     }
 
     void enableVerboseLogging(int verbose) {
+        if (mVerboseLoggingLevel == verbose) {
+            // We are already at the desired verbosity, avoid resetting StateMachine log records by
+            // returning here until underlying bug is fixed (b/28027593)
+            return;
+        }
         mVerboseLoggingLevel = verbose;
         mFacade.setIntegerSetting(
                 mContext, Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED, verbose);