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

Commit 42dfae7f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Provider Model] Reduce WiFi list in airplane mode (QS Internet... 

Merge "[Provider Model] Reduce WiFi list in airplane mode (QS Internet Dialog)" into sc-v2-dev am: 4e9facf9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16388476

Change-Id: Ifd6c945b489217863617233ba3be07ea0fb34c16
parents 1cb7dbff 4e9facf9

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java

+1 −1
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi 
        if (mHasEthernet) {

            count -= 1;

        }

        if (hasActiveSubId()) {

        if (hasActiveSubId() || isCarrierNetworkActive()) {

            count -= 1;

        }

        if (count > accessPoints.size()) {

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java

+30 −0
Original line number Diff line number Diff line
@@ -540,6 +540,36 @@ public class InternetDialogControllerTest extends SysuiTestCase { 
        verify(mInternetDialogCallback).onAccessPointsChanged(mWifiEntries, mConnectedEntry);

    }



    @Test

    public void onAccessPointsChanged_oneCarrierWifiAndFourOthers_callbackCutMore() {

        reset(mInternetDialogCallback);

        fakeAirplaneModeEnabled(true);

        when(mMergedCarrierEntry.isDefaultNetwork()).thenReturn(true);

        mAccessPoints.clear();

        mAccessPoints.add(mWifiEntry1);

        mAccessPoints.add(mWifiEntry2);

        mAccessPoints.add(mWifiEntry3);

        mAccessPoints.add(mWifiEntry4);



        mInternetDialogController.onAccessPointsChanged(mAccessPoints);



        mWifiEntries.clear();

        mWifiEntries.add(mWifiEntry1);

        mWifiEntries.add(mWifiEntry2);

        mWifiEntries.add(mWifiEntry3);

        verify(mInternetDialogCallback)

                .onAccessPointsChanged(mWifiEntries, null /* connectedEntry */);



        // Turn off airplane mode to has carrier WiFi, then Wi-Fi entries will keep the same.

        reset(mInternetDialogCallback);

        fakeAirplaneModeEnabled(false);



        mInternetDialogController.onAccessPointsChanged(mAccessPoints);



        verify(mInternetDialogCallback)

                .onAccessPointsChanged(mWifiEntries, null /* connectedEntry */);

    }



    @Test

    public void onAccessPointsChanged_fourWifiEntries_callbackCutMore() {

        reset(mInternetDialogCallback);