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

Merge "[Settings] Replace #getSimCount with #getActiveModemCount"

Browse Source 
am: 171eabcb2d

Change-Id: I2d015004494903e791d3cb3a93e8f428798e99db
This commit is contained in:
Zoey Chen
2019-12-25 20:02:43 -08:00
committed by android-build-merger
parent 4be4ae6a75 171eabcb2d
commit 22c2c14605
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/MobileDataContentObserver.java
View File

@@ -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;

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

@@ -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;

8
tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
View File

@@ -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);