Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev

This commit is contained in:
TreeHugger Robot
2017-09-19 20:56:34 +00:00
committed by Android (Google) Code Review

View File

@@ -88,7 +88,6 @@ public class WifiSettings extends RestrictedSettingsFragment
WifiDialog.WifiDialogListener { WifiDialog.WifiDialogListener {
private static final String TAG = "WifiSettings"; private static final String TAG = "WifiSettings";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
/* package */ static final int MENU_ID_WPS_PBC = Menu.FIRST; /* package */ static final int MENU_ID_WPS_PBC = Menu.FIRST;
private static final int MENU_ID_WPS_PIN = Menu.FIRST + 1; private static final int MENU_ID_WPS_PIN = Menu.FIRST + 1;
@@ -386,8 +385,8 @@ public class WifiSettings extends RestrictedSettingsFragment
} }
setProgressBarVisible(true); setProgressBarVisible(true);
mWifiTracker.forceUpdate(); mWifiTracker.forceUpdate();
if (DEBUG) { if (WifiTracker.sVerboseLogging) {
Log.d(TAG, "WifiSettings force update APs: " + mWifiTracker.getAccessPoints()); Log.i(TAG, "WifiSettings force update APs: " + mWifiTracker.getAccessPoints());
} }
getView().removeCallbacks(mUpdateAccessPointsRunnable); getView().removeCallbacks(mUpdateAccessPointsRunnable);
updateAccessPointPreferences(); updateAccessPointPreferences();
@@ -775,8 +774,8 @@ 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 (DEBUG) { if (WifiTracker.sVerboseLogging) {
Log.d(TAG, "updateAccessPoints called for: " + accessPoints); Log.i(TAG, "updateAccessPoints called for: " + accessPoints);
} }
boolean hasAvailableAccessPoints = false; boolean hasAvailableAccessPoints = false;