From 29c1be284b96a2e5451a93ab400d22ede715fc73 Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Thu, 12 Mar 2020 16:55:15 +0800 Subject: [PATCH] [Settings] Refactor DisabledSubscriptionController Refactor DisabledSubscriptionController Bug: 150352656 Test: make Change-Id: I6d31247d77c8fb515b9ba1b1ead33102f0e9e12f --- .../telephony/DisabledSubscriptionController.java | 2 +- .../DisabledSubscriptionControllerTest.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/network/telephony/DisabledSubscriptionController.java b/src/com/android/settings/network/telephony/DisabledSubscriptionController.java index cd517359227..e6cace48dfa 100644 --- a/src/com/android/settings/network/telephony/DisabledSubscriptionController.java +++ b/src/com/android/settings/network/telephony/DisabledSubscriptionController.java @@ -73,7 +73,7 @@ public class DisabledSubscriptionController extends BasePreferenceController imp return; } // TODO b/135222940: re-evaluate whether to use mSubscriptionManager#isSubscriptionEnabled - mCategory.setVisible(mSubscriptionManager.isActiveSubId(mSubId)); + mCategory.setVisible(mSubscriptionManager.isActiveSubscriptionId(mSubId)); } @Override diff --git a/tests/robotests/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java index f25ffa4532a..38223b8ff56 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java @@ -69,32 +69,32 @@ public class DisabledSubscriptionControllerTest { @Test public void displayPreference_subscriptionEnabled_categoryIsVisible() { - doReturn(true).when(mSubscriptionManager).isActiveSubId(SUB_ID); + doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID); mController.displayPreference(mScreen); assertThat(mCategory.isVisible()).isTrue(); } @Test public void displayPreference_subscriptionDisabled_categoryIsNotVisible() { - doReturn(false).when(mSubscriptionManager).isActiveSubId(SUB_ID); + doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID); mController.displayPreference(mScreen); assertThat(mCategory.isVisible()).isFalse(); } @Test public void onSubscriptionsChanged_subscriptionBecomesDisabled_categoryIsNotVisible() { - doReturn(true).when(mSubscriptionManager).isActiveSubId(SUB_ID); + doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID); mController.displayPreference(mScreen); - doReturn(false).when(mSubscriptionManager).isActiveSubId(SUB_ID); + doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID); mController.onSubscriptionsChanged(); assertThat(mCategory.isVisible()).isFalse(); } @Test public void onSubscriptionsChanged_subscriptionBecomesEnabled_categoryIsVisible() { - doReturn(false).when(mSubscriptionManager).isActiveSubId(SUB_ID); + doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID); mController.displayPreference(mScreen); - doReturn(true).when(mSubscriptionManager).isActiveSubId(SUB_ID); + doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID); mController.onSubscriptionsChanged(); assertThat(mCategory.isVisible()).isTrue(); }