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

Merge "[Settings] Replace #getSimCount with #getActiveModemCount" am: 171eabcb2d am: 22c2c14605

Browse Source 
Change-Id: Ic45f318e6784205e88a13f8a2fdf7fcdb04c9955
This commit is contained in:
Automerger Merge Worker
2019-12-26 04:17:42 +00:00
parent c5d575f085 22c2c14605
commit 631a1d206c
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;