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

Don't show hidden Cellular subscription in Settings.

Browse Source 
Replace getActiveSubscriptionInfoList() with
getActiveSubscriptionInfoList(true) so that settings will not show
hidden subscriptions to the user in various pages.

Bug: 121396526
Test: manual
Change-Id: I717999fed7d3a5a037914239694bef52df7c6207
This commit is contained in:
Malcolm Chen
2019-01-14 15:13:10 -08:00
parent de324b9b70
commit 14dde50c3a
19 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
View File

@@ -111,7 +111,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController im
private CharSequence getFirstPhoneNumber() {
final List<SubscriptionInfo> subscriptionInfoList =
mSubscriptionManager.getActiveSubscriptionInfoList();
mSubscriptionManager.getActiveSubscriptionInfoList(true);
if (subscriptionInfoList == null) {
return mContext.getText(R.string.device_info_default);
}
@@ -138,7 +138,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController im
@VisibleForTesting
SubscriptionInfo getSubscriptionInfo(int simSlot) {
final List<SubscriptionInfo> subscriptionInfoList =
mSubscriptionManager.getActiveSubscriptionInfoList();
mSubscriptionManager.getActiveSubscriptionInfoList(true);
if (subscriptionInfoList != null) {
for (SubscriptionInfo info : subscriptionInfoList) {
if (info.getSimSlotIndex() == simSlot) {

2
src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
View File

@@ -127,7 +127,7 @@ public class ImeiInfoDialogController {
private SubscriptionInfo getSubscriptionInfo(Context context, int slotId) {
final List<SubscriptionInfo> subscriptionInfoList = SubscriptionManager.from(context)
.getActiveSubscriptionInfoList();
.getActiveSubscriptionInfoList(true);
if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) {
return null;
}

2
src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
View File

@@ -404,7 +404,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
private SubscriptionInfo getPhoneSubscriptionInfo(int slotId) {
final List<SubscriptionInfo> subscriptionInfoList = SubscriptionManager.from(
mContext).getActiveSubscriptionInfoList();
mContext).getActiveSubscriptionInfoList(true);
if (subscriptionInfoList != null && subscriptionInfoList.size() > slotId) {
return subscriptionInfoList.get(slotId);
} else {

2
src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
View File

@@ -107,7 +107,7 @@ public class SimStatusPreferenceController extends
private CharSequence getCarrierName(int simSlot) {
final List<SubscriptionInfo> subscriptionInfoList =
mSubscriptionManager.getActiveSubscriptionInfoList();
mSubscriptionManager.getActiveSubscriptionInfoList(true);
if (subscriptionInfoList != null) {
for (SubscriptionInfo info : subscriptionInfoList) {
if (info.getSimSlotIndex() == simSlot) {