Merge "WifiConfigManager: set default value of mShowNetworks back to false" into nyc-dev

1 files changed, 3 insertions, 5 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 3c8d219af..3aa3b9319 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -287,12 +287,14 @@ public class WifiConfigManager {
     private final boolean mEnableOsuQueries;
     private final SIMAccessor mSIMAccessor;
     private final UserManager mUserManager;
+    private final Object mActiveScanDetailLock = new Object();
 
     private FrameworkFacade mFacade;
     private Clock mClock;
-    private boolean mOnlyLinkSameCredentialConfigurations;
     private IpConfigStore mIpconfigStore;
     private DelayedDiskWrite mWriter;
+    private boolean mOnlyLinkSameCredentialConfigurations;
+    private boolean mShowNetworks = false;
     private int mCurrentUserId = UserHandle.USER_SYSTEM;
 
     /* Stores a map of NetworkId to ScanCache */
@@ -307,9 +309,6 @@ public class WifiConfigManager {
     /* Tracks the highest priority of configured networks */
     private int mLastPriority = -1;
 
-    // TODO set this back to false, used for debugging b/17516271.
-    private boolean mShowNetworks = true;
-
     /**
      * The mLastSelectedConfiguration is used to remember which network
      * was selected last by the user.
@@ -328,7 +327,6 @@ public class WifiConfigManager {
     private HashSet<String> mLostConfigsDbg = new HashSet<String>();
 
     private ScanDetail mActiveScanDetail;   // ScanDetail associated with active network
-    private final Object mActiveScanDetailLock = new Object();
 
     private class SupplicantBridgeCallbacks implements SupplicantBridge.SupplicantBridgeCallbacks {
         @Override