Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev am: 77aeb2a0a7

am: ea98db9946

Change-Id: I5b125c60c4cc39b8f8661b2eff6d19de0c1c5eff
This commit is contained in:
Sundeep Ghuman
2017-09-19 21:22:08 +00:00
committed by android-build-merger

View File

@@ -89,7 +89,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;
@@ -387,8 +386,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();
@@ -774,8 +773,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;