Modify logging in WifiSettings.

This now respects both the Log tag setting and the developer options
toggle.

Bug: NA
Test: NA
Change-Id: I444b00cb35a61d8779cc46c90b33e611d5b0ac06
This commit is contained in:
Sundeep Ghuman
2018-02-02 16:46:32 -08:00
parent 6a4c3301ec
commit 790dcdcd96

View File

@@ -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_CONFIGURE_WIFI_SETTINGS = "configure_settings";
private static final String PREF_KEY_SAVED_NETWORKS = "saved_networks"; 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 = () -> { private final Runnable mUpdateAccessPointsRunnable = () -> {
updateAccessPointPreferences(); updateAccessPointPreferences();
}; };
@@ -371,7 +375,7 @@ public class WifiSettings extends RestrictedSettingsFragment
} }
setProgressBarVisible(true); setProgressBarVisible(true);
mWifiTracker.forceUpdate(); mWifiTracker.forceUpdate();
if (WifiTracker.sVerboseLogging) { if (isVerboseLoggingEnabled()) {
Log.i(TAG, "WifiSettings force update APs: " + mWifiTracker.getAccessPoints()); Log.i(TAG, "WifiSettings force update APs: " + mWifiTracker.getAccessPoints());
} }
getView().removeCallbacks(mUpdateAccessPointsRunnable); getView().removeCallbacks(mUpdateAccessPointsRunnable);
@@ -762,7 +766,7 @@ public class WifiSettings extends RestrictedSettingsFragment
} }
// AccessPoints are sorted by the WifiTracker // AccessPoints are sorted by the WifiTracker
final List<AccessPoint> accessPoints = mWifiTracker.getAccessPoints(); final List<AccessPoint> accessPoints = mWifiTracker.getAccessPoints();
if (WifiTracker.sVerboseLogging) { if (isVerboseLoggingEnabled()) {
Log.i(TAG, "updateAccessPoints called for: " + accessPoints); Log.i(TAG, "updateAccessPoints called for: " + accessPoints);
} }