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

Commit 0e53b629 authored by Arc Wang's avatar Arc Wang Committed by android-build-merger
Browse files

Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically... 

Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
am: 54dbed85

Change-Id: I0d5071d429dbd82d420e1199bd5baed0b687e2ae
parents ddd4fb66 54dbed85

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

+23 −4
Original line number Diff line number Diff line
@@ -17,8 +17,11 @@ 
package com.android.settings.wifi;



import android.content.Context;

import android.content.res.Resources;

import android.provider.Settings;

import android.telephony.SubscriptionManager;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.core.TogglePreferenceController;



/**
@@ -33,7 +36,7 @@ public class CellularFallbackPreferenceController extends TogglePreferenceContro 


    @Override

    public int getAvailabilityStatus() {

        return !avoidBadWifiConfig() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;

        return avoidBadWifiConfig() ? UNSUPPORTED_ON_DEVICE : AVAILABLE;

    }



    @Override
@@ -49,8 +52,24 @@ public class CellularFallbackPreferenceController extends TogglePreferenceContro 
    }



    private boolean avoidBadWifiConfig() {

        return mContext.getResources().getInteger(

                com.android.internal.R.integer.config_networkAvoidBadWifi) == 1;

        final int activeDataSubscriptionId = getActiveDataSubscriptionId();

        if (activeDataSubscriptionId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

            return true;

        }



        final Resources resources = getResourcesForSubId(activeDataSubscriptionId);

        return resources.getInteger(com.android.internal.R.integer.config_networkAvoidBadWifi) == 1;

    }



    @VisibleForTesting

    int getActiveDataSubscriptionId() {

        return SubscriptionManager.getActiveDataSubscriptionId();

    }



    @VisibleForTesting

    Resources getResourcesForSubId(int subscriptionId) {

        return SubscriptionManager.getResourcesForSubId(mContext, subscriptionId,

                false /* useRootLocale */);

    }



    private boolean avoidBadWifiCurrentSettings() {

tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java

+31 −8
Original line number Diff line number Diff line
@@ -18,36 +18,54 @@ package com.android.settings.wifi; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.content.res.Resources;

import android.telephony.SubscriptionManager;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



@RunWith(RobolectricTestRunner.class)

public class CellularFallbackPreferenceControllerTest {

    private static final String KEY_CELLULAR_FALLBACK = "wifi_cellular_data_fallback";



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private Context mContext;



    private CellularFallbackPreferenceController mController;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mController = new CellularFallbackPreferenceController(mContext, KEY_CELLULAR_FALLBACK);



        mController = spy(new CellularFallbackPreferenceController(RuntimeEnvironment.application,

                KEY_CELLULAR_FALLBACK));

    }



    @Test

    public void isAvailable_invalidActiveSubscriptionId_shouldReturnFalse() {

        doReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID)

                .when(mController).getActiveDataSubscriptionId();



        assertThat(mController.isAvailable()).isFalse();

    }



    @Test

    public void isAvailable_avoidBadWifiConfigIsFalse_shouldReturnTrue() {

        when(mContext.getResources().getInteger(

        final Resources resources = mock(Resources.class);



        doReturn(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID)

                .when(mController).getActiveDataSubscriptionId();

        doReturn(resources).when(mController).getResourcesForSubId(anyInt());

        when(resources.getInteger(

                com.android.internal.R.integer.config_networkAvoidBadWifi))

                .thenReturn(0);
@@ -56,7 +74,12 @@ public class CellularFallbackPreferenceControllerTest { 


    @Test

    public void isAvailable_avoidBadWifiConfigIsTrue_shouldReturnFalse() {

        when(mContext.getResources().getInteger(

        final Resources resources = mock(Resources.class);



        doReturn(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID)

                .when(mController).getActiveDataSubscriptionId();

        doReturn(resources).when(mController).getResourcesForSubId(anyInt());

        when(resources.getInteger(

                com.android.internal.R.integer.config_networkAvoidBadWifi))

                .thenReturn(1);