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

Commit 395c6757 authored by Weng Su's avatar Weng Su Committed by Automerger Merge Worker
Browse files

Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec 

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



Change-Id: I2d1d5c15f39a86c93322e07f2f0cf17869a0d41d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 61ffcb9b 750376ec

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

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.core.TogglePreferenceController;

import com.android.settings.wifi.WifiPickerTrackerHelper;

import com.android.wifitrackerlib.WifiPickerTracker;
@@ -65,7 +64,7 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr 


    @Override

    public boolean isChecked() {

        return mWifiPickerTrackerHelper.isCarrierNetworkEnabled(mSubId);

        return mWifiPickerTrackerHelper.isCarrierNetworkEnabled();

    }



    @Override

src/com/android/settings/wifi/WifiPickerTrackerHelper.java

+11 −2
Original line number Diff line number Diff line
@@ -117,16 +117,25 @@ public class WifiPickerTrackerHelper implements LifecycleObserver { 
    }



    /** Return the enabled/disabled state of the carrier network */

    public boolean isCarrierNetworkEnabled(int subId) {

        return mWifiManager.isCarrierNetworkOffloadEnabled(subId, true /* merged */);

    public boolean isCarrierNetworkEnabled() {

        final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();

        if (mergedCarrierEntry == null) {

            Log.e(TAG, "Failed to get MergedCarrierEntry to query enabled status");

            return false;

        }

        final boolean isCarrierNetworkEnabled = mergedCarrierEntry.isEnabled();

        Log.i(TAG, "isCarrierNetworkEnabled:" + isCarrierNetworkEnabled);

        return isCarrierNetworkEnabled;

    }



    /** Enables/disables the carrier network */

    public void setCarrierNetworkEnabled(boolean enabled) {

        final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();

        if (mergedCarrierEntry == null) {

            Log.e(TAG, "Unable to get MergedCarrierEntry to set enabled status");

            return;

        }

        Log.i(TAG, "setCarrierNetworkEnabled:" + enabled);

        mergedCarrierEntry.setEnabled(enabled);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -107,14 +107,14 @@ public class CarrierWifiTogglePreferenceControllerTest { 


    @Test

    public void isChecked_carrierNetworkEnabled_returnTrue() {

        doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled(SUB_ID);

        doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled();



        assertThat(mController.isChecked()).isEqualTo(true);

    }



    @Test

    public void isChecked_carrierNetworkDisabled_returnFalse() {

        doReturn(false).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled(SUB_ID);

        doReturn(false).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled();



        assertThat(mController.isChecked()).isEqualTo(false);

    }

tests/unit/src/com/android/settings/wifi/WifiPickerTrackerHelperTest.java

+4 −6
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static com.google.common.truth.Truth.assertThat; 


import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyLong;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;
@@ -135,14 +134,13 @@ public class WifiPickerTrackerHelperTest { 


    @Test

    public void isCarrierNetworkEnabled_returnCorrect() {

        doReturn(true).when(mWifiManager).isCarrierNetworkOffloadEnabled(SUB_ID, true /* merged */);

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



        assertThat(mWifiPickerTrackerHelper.isCarrierNetworkEnabled(SUB_ID)).isTrue();

        assertThat(mWifiPickerTrackerHelper.isCarrierNetworkEnabled()).isTrue();



        doReturn(false).when(mWifiManager)

                .isCarrierNetworkOffloadEnabled(SUB_ID, true /* merged */);

        when(mMergedCarrierEntry.isEnabled()).thenReturn(false);



        assertThat(mWifiPickerTrackerHelper.isCarrierNetworkEnabled(SUB_ID)).isFalse();

        assertThat(mWifiPickerTrackerHelper.isCarrierNetworkEnabled()).isFalse();

    }



    @Test