From bca895e7651c2929ff883568940892987c1a03d3 Mon Sep 17 00:00:00 2001 From: Samuel Tan Date: Tue, 12 Apr 2016 13:19:27 -0700 Subject: WifiConfigManager: set default value of mShowNetworks back to false Since b/17516271 is marked as fixed, act on the TODO and set the default value of this field back to false. While there, re-order some fields in accordance to the style in WifiConfigManager.java. BUG: 28088219 Change-Id: Ib6a0985babdbebb35916278fe64bacdeb863ab8e TEST: 'runtest frameworks-wifi' passes. --- service/java/com/android/server/wifi/WifiConfigManager.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'service') 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 mLostConfigsDbg = new HashSet(); private ScanDetail mActiveScanDetail; // ScanDetail associated with active network - private final Object mActiveScanDetailLock = new Object(); private class SupplicantBridgeCallbacks implements SupplicantBridge.SupplicantBridgeCallbacks { @Override -- cgit v1.2.3