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

Commit 3fb52135 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Settings: Fix cellular internet option Not seen after internet reset"... 

Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d am: a1a5091f

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445



Change-Id: Ida0dd5521a0bf94599315658b70c14a058295585
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents caa0bbd9 a1a5091f

src/com/android/settings/network/InternetResetHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public class InternetResetHelper implements LifecycleObserver, 
    protected void resumePreferences() {

        if (mIsRecoveryReady && mMobileNetworkController != null) {

            Log.d(TAG, "Resume the Mobile Network controller");

            mMobileNetworkController.hidePreference(false /* hide */, false /* immediately */);

            mMobileNetworkController.hidePreference(false /* hide */, true /* immediately */);

        }

        if (mIsWifiReady && mWifiTogglePreferences != null) {

            Log.d(TAG, "Resume the Wi-Fi preferences");

tests/unit/src/com/android/settings/network/InternetResetHelperTest.java

+3 −3
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ public class InternetResetHelperTest { 
        // Show resetting preference

        assertThat(mResettingPreference.isVisible()).isTrue();

        // Show Mobile Network controller

        verify(mMobileNetworkController).hidePreference(false /* hide */, false /* immediately*/);

        verify(mMobileNetworkController).hidePreference(false /* hide */, true /* immediately*/);

        // Hide Wi-Fi preferences

        assertThat(mWifiTogglePreferences.isVisible()).isFalse();

        assertThat(mConnectedWifiEntryPreferences.isVisible()).isFalse();
@@ -240,7 +240,7 @@ public class InternetResetHelperTest { 
        assertThat(mWifiEntryPreferences.isVisible()).isTrue();

        // Hide Mobile Network controller

        verify(mMobileNetworkController, never())

                .hidePreference(false /* hide */, false /* immediately*/);

                .hidePreference(false /* hide */, true /* immediately*/);

    }



    @Test
@@ -251,7 +251,7 @@ public class InternetResetHelperTest { 
        mInternetResetHelper.resumePreferences();



        // Show subsystem preferences

        verify(mMobileNetworkController).hidePreference(false, false);

        verify(mMobileNetworkController).hidePreference(false, true);

        assertThat(mWifiTogglePreferences.isVisible()).isTrue();

        assertThat(mConnectedWifiEntryPreferences.isVisible()).isTrue();

        assertThat(mWifiEntryPreferences.isVisible()).isTrue();