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

Merge "Fix mobile data on/off switch for multi-sim case"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-07 16:51:02 +00:00
committed by Android (Google) Code Review
parent 6f7b68ca62 8af118bd87
commit 16d8f7087a
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,7 +118,8 @@ public class MobileDataPreferenceController extends TogglePreferenceController
@Override
public boolean isChecked() {
return mTelephonyManager.isDataEnabled();
return mTelephonyManager.isDataEnabled()
&& mSubId == SubscriptionManager.getDefaultDataSubscriptionId();
}
public void init(FragmentManager fragmentManager, int subId) {
@@ -129,7 +130,7 @@ public class MobileDataPreferenceController extends TogglePreferenceController
@VisibleForTesting
boolean isDialogNeeded() {
final boolean enableData = !mTelephonyManager.isDataEnabled();
final boolean enableData = !isChecked();
final boolean isMultiSim = (mTelephonyManager.getSimCount() > 1);
final int defaultSubId = mSubscriptionManager.getDefaultDataSubscriptionId();
final boolean needToDisableOthers = mSubscriptionManager