[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem

Context#getResources loading is done based on the last SIM to
come up, we may get wrong customization settings.

This fix check the setting of active subscription and shows the preference.

Bug: 138956509
Test: CellularFallbackPreferenceControllerTest
      manual test:
          1. Insert feature supported SIM and check UI.
          2. Remove feature supported SIM and check UI.
          3. Turn airplane mode on and check 1. and 2..

Change-Id: I72b6db415429181395a02f163889bb1b9c0f070f
Merged-In: I72b6db415429181395a02f163889bb1b9c0f070f
This commit is contained in:
Arc Wang
2019-08-12 20:11:13 +08:00
parent 37b38f872f
commit 91200e610d
2 changed files with 54 additions and 12 deletions

View File

@@ -17,8 +17,11 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.provider.Settings; import android.provider.Settings;
import android.telephony.SubscriptionManager;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
/** /**
@@ -33,7 +36,7 @@ public class CellularFallbackPreferenceController extends TogglePreferenceContro
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return !avoidBadWifiConfig() ? AVAILABLE : UNSUPPORTED_ON_DEVICE; return avoidBadWifiConfig() ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
} }
@Override @Override
@@ -49,8 +52,24 @@ public class CellularFallbackPreferenceController extends TogglePreferenceContro
} }
private boolean avoidBadWifiConfig() { private boolean avoidBadWifiConfig() {
return mContext.getResources().getInteger( final int activeDataSubscriptionId = getActiveDataSubscriptionId();
com.android.internal.R.integer.config_networkAvoidBadWifi) == 1; 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() { private boolean avoidBadWifiCurrentSettings() {

View File

@@ -18,36 +18,54 @@ package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat; 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 static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.telephony.SubscriptionManager;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class CellularFallbackPreferenceControllerTest { public class CellularFallbackPreferenceControllerTest {
private static final String KEY_CELLULAR_FALLBACK = "wifi_cellular_data_fallback"; private static final String KEY_CELLULAR_FALLBACK = "wifi_cellular_data_fallback";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private CellularFallbackPreferenceController mController; private CellularFallbackPreferenceController mController;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); 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 @Test
public void isAvailable_avoidBadWifiConfigIsFalse_shouldReturnTrue() { 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)) com.android.internal.R.integer.config_networkAvoidBadWifi))
.thenReturn(0); .thenReturn(0);
@@ -56,7 +74,12 @@ public class CellularFallbackPreferenceControllerTest {
@Test @Test
public void isAvailable_avoidBadWifiConfigIsTrue_shouldReturnFalse() { 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)) com.android.internal.R.integer.config_networkAvoidBadWifi))
.thenReturn(1); .thenReturn(1);