diff options
3 files changed, 8 insertions, 7 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java index fc49658818a0..759648dc5c5d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java @@ -258,7 +258,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro /** Synchronously update the list of access points with the latest information. */ @MainThread - public void forceUpdate() { + private void forceUpdate() { synchronized (mLock) { mLastInfo = mWifiManager.getConnectionInfo(); mLastNetworkInfo = mConnectivityManager.getNetworkInfo(mWifiManager.getCurrentNetwork()); @@ -335,6 +335,9 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro mConnectivityManager.registerNetworkCallback(mNetworkRequest, mNetworkCallback); mRegistered = true; } + + // fetch current ScanResults instead of waiting for broadcast of fresh results + forceUpdate(); } } diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java index 03c31bdaf5e5..8fd4700b9bb0 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java @@ -436,7 +436,6 @@ public class WifiTrackerTest { mRequestScoresLatch = new CountDownLatch(1); startTracking(tracker); - tracker.forceUpdate(); assertTrue("Latch timed out", mRequestScoresLatch.await(LATCH_TIMEOUT, TimeUnit.MILLISECONDS)); @@ -647,7 +646,8 @@ public class WifiTrackerTest { when(mockWifiManager.getConfiguredNetworks()) .thenReturn(new ArrayList<WifiConfiguration>()); when(mockWifiManager.getScanResults()).thenReturn(results); - tracker.forceUpdate(); + + startTracking(tracker); } @Test @@ -671,7 +671,7 @@ public class WifiTrackerTest { } @Test - public void forceUpdateShouldSynchronouslyFetchLatestInformation() throws Exception { + public void onStartShouldSynchronouslyFetchLatestInformation() throws Exception { Network mockNetwork = mock(Network.class); when(mockWifiManager.getCurrentNetwork()).thenReturn(mockNetwork); @@ -683,7 +683,7 @@ public class WifiTrackerTest { when(mockConnectivityManager.getNetworkInfo(any(Network.class))).thenReturn(networkInfo); WifiTracker tracker = createMockedWifiTracker(); - tracker.forceUpdate(); + startTracking(tracker); verify(mockWifiManager).getConnectionInfo(); verify(mockWifiManager, times(1)).getConfiguredNetworks(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java index 0d21c4efe22e..6ee6cb2ed177 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java @@ -102,8 +102,6 @@ public class AccessPointControllerImpl @Override public void scanForAccessPoints() { - if (DEBUG) Log.d(TAG, "force update APs!"); - mWifiTracker.forceUpdate(); fireAcccessPointsCallback(mWifiTracker.getAccessPoints()); } |