Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3421740 authored by Sundeep Ghuman's avatar Sundeep Ghuman
Browse files

Convert forceUpdate to 'onStart' lifecycle event. 

Although the AccessPointControllerImpl class is modified, there is no
longer a wifi picker in QuickSettings.

Bug: 68030053
Test: runtest --path
      frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Manual testing of WifiSettings cold start / resumption scenarios for UI
jank

Change-Id: Ib28edebb0acf4160cc9eda7c1620c1b4280dcdc4
parent dc67f4d2

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+4 −1
Original line number Diff line number Diff line
@@ -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();

        }

    }

packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -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();

packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java

+0 −2
Original line number Diff line number Diff line
@@ -102,8 +102,6 @@ public class AccessPointControllerImpl 


    @Override

    public void scanForAccessPoints() {

        if (DEBUG) Log.d(TAG, "force update APs!");

        mWifiTracker.forceUpdate();

        fireAcccessPointsCallback(mWifiTracker.getAccessPoints());

    }