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

6
src/com/android/settings/network/telephony/MobileNetworkActivity.java
View File

@@ -67,7 +67,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity {
@Override
public void onSubscriptionsChanged() {
if (!Objects.equals(mSubscriptionInfos,
mSubscriptionManager.getActiveSubscriptionInfoList())) {
mSubscriptionManager.getActiveSubscriptionInfoList(true))) {
updateSubscriptions(null);
}
}
@@ -81,7 +81,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity {
setActionBar(findViewById(R.id.mobile_action_bar));
mPhoneChangeReceiver = new PhoneChangeReceiver();
mSubscriptionManager = getSystemService(SubscriptionManager.class);
mSubscriptionInfos = mSubscriptionManager.getActiveSubscriptionInfoList();
mSubscriptionInfos = mSubscriptionManager.getActiveSubscriptionInfoList(true);
mCurSubscriptionId = savedInstanceState != null
? savedInstanceState.getInt(Settings.EXTRA_SUB_ID, SUB_ID_NULL)
: SUB_ID_NULL;
@@ -130,7 +130,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity {
@VisibleForTesting
void updateSubscriptions(Bundle savedInstanceState) {
mSubscriptionInfos = mSubscriptionManager.getActiveSubscriptionInfoList();
mSubscriptionInfos = mSubscriptionManager.getActiveSubscriptionInfoList(true);
updateBottomNavigationView();

2
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -227,7 +227,7 @@ public class MobileNetworkUtils {
if (disableOtherSubscriptions) {
List<SubscriptionInfo> subInfoList =
subscriptionManager.getActiveSubscriptionInfoList();
subscriptionManager.getActiveSubscriptionInfoList(true);
if (subInfoList != null) {
for (SubscriptionInfo subInfo : subInfoList) {
// We never disable mobile data for opportunistic subscriptions.