From 790dcdcd96591abe2dd59c240149a202fde46406 Mon Sep 17 00:00:00 2001 From: Sundeep Ghuman Date: Fri, 2 Feb 2018 16:46:32 -0800 Subject: [PATCH] Modify logging in WifiSettings. This now respects both the Log tag setting and the developer options toggle. Bug: NA Test: NA Change-Id: I444b00cb35a61d8779cc46c90b33e611d5b0ac06 --- src/com/android/settings/wifi/WifiSettings.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 22f8c43f237..ab873dd685c 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -109,6 +109,10 @@ public class WifiSettings extends RestrictedSettingsFragment private static final String PREF_KEY_CONFIGURE_WIFI_SETTINGS = "configure_settings"; private static final String PREF_KEY_SAVED_NETWORKS = "saved_networks"; + private static boolean isVerboseLoggingEnabled() { + return WifiTracker.sVerboseLogging || Log.isLoggable(TAG, Log.VERBOSE); + } + private final Runnable mUpdateAccessPointsRunnable = () -> { updateAccessPointPreferences(); }; @@ -371,7 +375,7 @@ public class WifiSettings extends RestrictedSettingsFragment } setProgressBarVisible(true); mWifiTracker.forceUpdate(); - if (WifiTracker.sVerboseLogging) { + if (isVerboseLoggingEnabled()) { Log.i(TAG, "WifiSettings force update APs: " + mWifiTracker.getAccessPoints()); } getView().removeCallbacks(mUpdateAccessPointsRunnable); @@ -762,7 +766,7 @@ public class WifiSettings extends RestrictedSettingsFragment } // AccessPoints are sorted by the WifiTracker final List accessPoints = mWifiTracker.getAccessPoints(); - if (WifiTracker.sVerboseLogging) { + if (isVerboseLoggingEnabled()) { Log.i(TAG, "updateAccessPoints called for: " + accessPoints); }