diff options
author | Sanket Padawe <sanketpadawe@google.com> | 2015-01-08 11:23:11 -0800 |
---|---|---|
committer | Sanket Padawe <sanketpadawe@google.com> | 2015-01-08 11:23:11 -0800 |
commit | 24f834d74505a77c0b490738e86643570f8ce831 (patch) | |
tree | 19babe8e5281f9295ba4636c90a475b338bc537a /src/com/android/settings/DataUsageSummary.java | |
parent | f11feccf99948d166e6873315252fdaf416ae272 (diff) | |
download | packages_apps_Settings-24f834d74505a77c0b490738e86643570f8ce831.zip packages_apps_Settings-24f834d74505a77c0b490738e86643570f8ce831.tar.gz packages_apps_Settings-24f834d74505a77c0b490738e86643570f8ce831.tar.bz2 |
Fixed Cellular data toggling issue in settings for multisim
Bug: 18916033
Bug: 18779784
Change-Id: Ifda57b5ae89268f921ee2b75b5b6d90d75514540
Diffstat (limited to 'src/com/android/settings/DataUsageSummary.java')
-rw-r--r-- | src/com/android/settings/DataUsageSummary.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index 732d4c8..2908829 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -993,9 +993,9 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable return isEnable; } - private void setMobileDataEnabled(boolean enabled) { + private void setMobileDataEnabled(int subId, boolean enabled) { if (LOGD) Log.d(TAG, "setMobileDataEnabled()"); - mTelephonyManager.setDataEnabled(enabled); + mTelephonyManager.setDataEnabled(subId, enabled); mMobileDataEnabled = enabled; updatePolicy(false); } @@ -1162,12 +1162,12 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable if (Utils.showSimCardTile(getActivity())) { handleMultiSimDataDialog(); } else { - setMobileDataEnabled(true); + setMobileDataEnabled(getSubId(currentTab), true); } } else { // disabling data; show confirmation dialog which eventually // calls setMobileDataEnabled() once user confirms. - ConfirmDataDisableFragment.show(DataUsageSummary.this); + ConfirmDataDisableFragment.show(DataUsageSummary.this, getSubId(mCurrentTab)); } } @@ -1185,7 +1185,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable // the pop-up. if (!Utils.showSimCardTile(context) || (nextSir != null && currentSir.getSubscriptionId() == nextSir.getSubscriptionId())) { - setMobileDataEnabled(true); + setMobileDataEnabled(currentSir.getSubscriptionId(), true); updateBody(); return; } @@ -1204,7 +1204,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable @Override public void onClick(DialogInterface dialog, int id) { mSubscriptionManager.setDefaultDataSubId(currentSir.getSubscriptionId()); - setMobileDataEnabled(true); + setMobileDataEnabled(currentSir.getSubscriptionId(), true); updateBody(); } }); @@ -2142,7 +2142,9 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable * Dialog to request user confirmation before disabling data. */ public static class ConfirmDataDisableFragment extends DialogFragment { - public static void show(DataUsageSummary parent) { + static int mSubId; + public static void show(DataUsageSummary parent, int subId) { + mSubId = subId; if (!parent.isAdded()) return; final ConfirmDataDisableFragment dialog = new ConfirmDataDisableFragment(); @@ -2163,7 +2165,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable final DataUsageSummary target = (DataUsageSummary) getTargetFragment(); if (target != null) { // TODO: extend to modify policy enabled flag. - target.setMobileDataEnabled(false); + target.setMobileDataEnabled(mSubId, false); } } }); |