From 5b336b1bd90c1034f16013cfb6ca041724a939e2 Mon Sep 17 00:00:00 2001 From: zoey chen Date: Tue, 24 Dec 2019 14:40:23 +0800 Subject: [PATCH] [Settings] Replace #getSimCount with #getActiveModemCount Bug: 146815553 Test: make Change-Id: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355 Merged-In: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355 --- .../settings/network/MobileDataContentObserver.java | 2 +- .../network/telephony/MobileDataPreferenceController.java | 2 +- .../telephony/MobileDataPreferenceControllerTest.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/network/MobileDataContentObserver.java b/src/com/android/settings/network/MobileDataContentObserver.java index 15e726f5f53..0aab75f473b 100644 --- a/src/com/android/settings/network/MobileDataContentObserver.java +++ b/src/com/android/settings/network/MobileDataContentObserver.java @@ -39,7 +39,7 @@ public class MobileDataContentObserver extends ContentObserver { public static Uri getObservableUri(Context context, int subId) { Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA); TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class); - if (telephonyManager.getSimCount() != 1) { + if (telephonyManager.getActiveModemCount() != 1) { uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + subId); } return uri; diff --git a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java index f18340a75a0..daee6ababbe 100644 --- a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java +++ b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java @@ -145,7 +145,7 @@ public class MobileDataPreferenceController extends TelephonyTogglePreferenceCon @VisibleForTesting boolean isDialogNeeded() { final boolean enableData = !isChecked(); - final boolean isMultiSim = (mTelephonyManager.getSimCount() > 1); + final boolean isMultiSim = (mTelephonyManager.getActiveModemCount() > 1); final int defaultSubId = mSubscriptionManager.getDefaultDataSubscriptionId(); final boolean needToDisableOthers = mSubscriptionManager .isActiveSubscriptionId(defaultSubId) && defaultSubId != mSubId; diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java index 86f2355e064..1a11c49bc7b 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java @@ -99,7 +99,7 @@ public class MobileDataPreferenceControllerTest { doReturn(true).when(mTelephonyManager).isDataEnabled(); doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID); doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); - doReturn(1).when(mTelephonyManager).getSimCount(); + doReturn(1).when(mTelephonyManager).getActiveModemCount(); assertThat(mController.isDialogNeeded()).isFalse(); } @@ -110,7 +110,7 @@ public class MobileDataPreferenceControllerTest { doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID); doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID_OTHER); ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_OTHER); - doReturn(2).when(mTelephonyManager).getSimCount(); + doReturn(2).when(mTelephonyManager).getActiveModemCount(); assertThat(mController.isDialogNeeded()).isTrue(); assertThat(mController.mDialogType).isEqualTo( @@ -131,7 +131,7 @@ public class MobileDataPreferenceControllerTest { doReturn(true).when(mTelephonyManager).isDataEnabled(); doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID); doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); - doReturn(1).when(mTelephonyManager).getSimCount(); + doReturn(1).when(mTelephonyManager).getActiveModemCount(); mController.onPreferenceChange(mPreference, true); @@ -143,7 +143,7 @@ public class MobileDataPreferenceControllerTest { doReturn(true).when(mTelephonyManager).isDataEnabled(); doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID); doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); - doReturn(2).when(mTelephonyManager).getSimCount(); + doReturn(2).when(mTelephonyManager).getActiveModemCount(); mController.onPreferenceChange(mPreference, true);