summaryrefslogtreecommitdiffstats
path: root/service/java/com/android
diff options
context:
space:
mode:
authorRebecca Silberstein <silberst@google.com>2016-08-04 13:51:10 -0700
committerRebecca Silberstein <silberst@google.com>2016-08-05 16:50:45 +0000
commit01dafe766c969517561dd9fd733ec475bc8eee5d (patch)
tree89d67842d908ebd424513abae20935e52511702d /service/java/com/android
parent24750cd1f8148d6a935bda96f3b17f22b0c1d8bd (diff)
downloadandroid_frameworks_opt_net_wifi-01dafe766c969517561dd9fd733ec475bc8eee5d.tar.gz
android_frameworks_opt_net_wifi-01dafe766c969517561dd9fd733ec475bc8eee5d.tar.bz2
android_frameworks_opt_net_wifi-01dafe766c969517561dd9fd733ec475bc8eee5d.zip
[DO NOT MERGE] WifiStateMachine: check verbosity level in update
When updating the setting for verbose logging, first check if we are already at the desired setting. If we are, return from enableVerboseLogging immediately. This avoids updating the size in the underlying StateMachine log record vectors, and thereby avoids clearing them. BUG: 30675249 Change-Id: I005f236baa3149c46470e79dee3491e691908da0 TEST: runtest frameworks-wifi TEST: manual testing
Diffstat (limited to 'service/java/com/android')
-rw-r--r--service/java/com/android/server/wifi/WifiStateMachine.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index ccb313624..0e3ed542f 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -1294,6 +1294,11 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
}
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);