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

Replace isSubscriptionEnabled with isActiveSubId.

Browse Source 
As we don't allow pSIM modem disablment, we should simply use isActiveSubId
to decide whether a subscription's preferences is changable. This will
avoid potential modem bugs that reports wrong modem status that result
in Setting's UX error.

Bug: 135222940
Test: manual and robo
Change-Id: I7cccf2fdab7c89d26dac4daad51cd5d6f3a90eba
This commit is contained in:
Malcolm Chen
2019-06-18 14:01:45 -07:00
committed by Xiangyu/Malcolm Chen
parent d1defa1bdf
commit dd0b2fc380
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/telephony/DisabledSubscriptionController.java
View File

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

8
src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
View File

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