PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94

Browse Source 
Change-Id: I07ac521d3822a644cad29667a59fd1ae0bf848a3
This commit is contained in:
Automerger Merge Worker
2020-03-13 12:06:59 +00:00
parent a0d1887a98 0972a6dd94
commit 7ecae6dd06
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/DisabledSubscriptionController.java
View File

@@ -73,7 +73,7 @@ public class DisabledSubscriptionController extends BasePreferenceController imp
return; return;
} }
// TODO b/135222940: re-evaluate whether to use mSubscriptionManager#isSubscriptionEnabled // TODO b/135222940: re-evaluate whether to use mSubscriptionManager#isSubscriptionEnabled
mCategory.setVisible(mSubscriptionManager.isActiveSubId(mSubId)); mCategory.setVisible(mSubscriptionManager.isActiveSubscriptionId(mSubId));
} }
@Override @Override

12
tests/robotests/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java
View File

@@ -69,32 +69,32 @@ public class DisabledSubscriptionControllerTest {
@Test @Test
public void displayPreference_subscriptionEnabled_categoryIsVisible() { public void displayPreference_subscriptionEnabled_categoryIsVisible() {
doReturn(true).when(mSubscriptionManager).isActiveSubId(SUB_ID); doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
assertThat(mCategory.isVisible()).isTrue(); assertThat(mCategory.isVisible()).isTrue();
} }
@Test @Test
public void displayPreference_subscriptionDisabled_categoryIsNotVisible() { public void displayPreference_subscriptionDisabled_categoryIsNotVisible() {
doReturn(false).when(mSubscriptionManager).isActiveSubId(SUB_ID); doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
assertThat(mCategory.isVisible()).isFalse(); assertThat(mCategory.isVisible()).isFalse();
} }
@Test @Test
public void onSubscriptionsChanged_subscriptionBecomesDisabled_categoryIsNotVisible() { public void onSubscriptionsChanged_subscriptionBecomesDisabled_categoryIsNotVisible() {
doReturn(true).when(mSubscriptionManager).isActiveSubId(SUB_ID); doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
doReturn(false).when(mSubscriptionManager).isActiveSubId(SUB_ID); doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
mController.onSubscriptionsChanged(); mController.onSubscriptionsChanged();
assertThat(mCategory.isVisible()).isFalse(); assertThat(mCategory.isVisible()).isFalse();
} }
@Test @Test
public void onSubscriptionsChanged_subscriptionBecomesEnabled_categoryIsVisible() { public void onSubscriptionsChanged_subscriptionBecomesEnabled_categoryIsVisible() {
doReturn(false).when(mSubscriptionManager).isActiveSubId(SUB_ID); doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
doReturn(true).when(mSubscriptionManager).isActiveSubId(SUB_ID); doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
mController.onSubscriptionsChanged(); mController.onSubscriptionsChanged();
assertThat(mCategory.isVisible()).isTrue(); assertThat(mCategory.isVisible()).isTrue();
} }