diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-06-19 03:11:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-19 03:11:25 +0000 |
| commit | 0304f4d1ce59ceedd6cd7ce843e5a62fea24c2ca (patch) | |
| tree | 3b9a2ce6b8c734e800a2a4b674959bea252bcbb7 /src/com/android/settings | |
| parent | e2ab7540a34d5c42851eb5fef0962927d1eaead8 (diff) | |
| parent | dd0b2fc380c15e510bd2c75bef7047b7782a04c5 (diff) | |
| download | packages_apps_Settings-0304f4d1ce59ceedd6cd7ce843e5a62fea24c2ca.tar.gz packages_apps_Settings-0304f4d1ce59ceedd6cd7ce843e5a62fea24c2ca.tar.bz2 packages_apps_Settings-0304f4d1ce59ceedd6cd7ce843e5a62fea24c2ca.zip | |
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/network/telephony/DisabledSubscriptionController.java | 3 | ||||
| -rw-r--r-- | src/com/android/settings/network/telephony/MobileNetworkSwitchController.java | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/settings/network/telephony/DisabledSubscriptionController.java b/src/com/android/settings/network/telephony/DisabledSubscriptionController.java index 22cbb138c3..cd51735922 100644 --- a/src/com/android/settings/network/telephony/DisabledSubscriptionController.java +++ b/src/com/android/settings/network/telephony/DisabledSubscriptionController.java @@ -72,7 +72,8 @@ public class DisabledSubscriptionController extends BasePreferenceController imp if (mCategory == null || mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { return; } - mCategory.setVisible(mSubscriptionManager.isSubscriptionEnabled(mSubId)); + // TODO b/135222940: re-evaluate whether to use mSubscriptionManager#isSubscriptionEnabled + mCategory.setVisible(mSubscriptionManager.isActiveSubId(mSubId)); } @Override diff --git a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java index e6422f00d6..02396ddef7 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java @@ -81,7 +81,9 @@ public class MobileNetworkSwitchController extends BasePreferenceController impl R.string.mobile_network_use_sim_off); mSwitchBar.addOnSwitchChangeListener((switchView, isChecked) -> { - if (mSubscriptionManager.isSubscriptionEnabled(mSubId) != isChecked + // TODO b/135222940: re-evaluate whether to use + // mSubscriptionManager#isSubscriptionEnabled + if (mSubscriptionManager.isActiveSubId(mSubId) != isChecked && (!mSubscriptionManager.setSubscriptionEnabled(mSubId, isChecked))) { mSwitchBar.setChecked(!isChecked); } @@ -108,7 +110,9 @@ public class MobileNetworkSwitchController extends BasePreferenceController impl mSwitchBar.hide(); } else { mSwitchBar.show(); - mSwitchBar.setChecked(mSubscriptionManager.isSubscriptionEnabled(mSubId)); + // TODO b/135222940: re-evaluate whether to use + // mSubscriptionManager#isSubscriptionEnabled + mSwitchBar.setChecked(mSubscriptionManager.isActiveSubId(mSubId)); } } |