From 50d75061037f1531f8151531d39e63450a9909a2 Mon Sep 17 00:00:00 2001 From: changbetty Date: Wed, 15 Jan 2020 16:57:19 +0800 Subject: [PATCH] [Mainline] Removed non-formal API getAllSubscriptionInfoList to used in Settings Bug: 147206736 Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest make RunSettingsRoboTests ROBOTEST_FILTER=SettingsDumpServiceTest Change-Id: Ie9c01afa2b128f8d296b160d3628ea1fb7176e59 --- src/com/android/settings/SettingsDumpService.java | 4 ++-- .../datausage/DataUsageSummaryPreferenceController.java | 2 +- src/com/android/settings/datausage/DataUsageUtils.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/SettingsDumpService.java b/src/com/android/settings/SettingsDumpService.java index 487ccf51e77..2b6c7d87f89 100644 --- a/src/com/android/settings/SettingsDumpService.java +++ b/src/com/android/settings/SettingsDumpService.java @@ -102,11 +102,11 @@ public class SettingsDumpService extends Service { JSONObject obj = new JSONObject(); DataUsageController controller = new DataUsageController(this); ConnectivityManager connectivityManager = getSystemService(ConnectivityManager.class); - SubscriptionManager manager = SubscriptionManager.from(this); + SubscriptionManager manager = this.getSystemService(SubscriptionManager.class); TelephonyManager telephonyManager = this.getSystemService(TelephonyManager.class); if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) { JSONArray array = new JSONArray(); - for (SubscriptionInfo info : manager.getAllSubscriptionInfoList()) { + for (SubscriptionInfo info : manager.getAvailableSubscriptionInfoList()) { telephonyManager = telephonyManager .createForSubscriptionId(info.getSubscriptionId()); NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll( diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java index a26e3591cb9..92b8a9df488 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java @@ -272,7 +272,7 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll SubscriptionInfo subInfo = mSubscriptionManager.getActiveSubscriptionInfo(mSubscriptionId); if (subInfo == null) { - subInfo = mSubscriptionManager.getAllSubscriptionInfoList().stream().filter( + subInfo = mSubscriptionManager.getAvailableSubscriptionInfoList().stream().filter( i -> i.getSubscriptionId() == mSubscriptionId).findFirst().orElse(null); } if (subInfo != null && mHasMobileData) { diff --git a/src/com/android/settings/datausage/DataUsageUtils.java b/src/com/android/settings/datausage/DataUsageUtils.java index 0308cf733c3..5ed62fb6ab3 100644 --- a/src/com/android/settings/datausage/DataUsageUtils.java +++ b/src/com/android/settings/datausage/DataUsageUtils.java @@ -166,7 +166,7 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU SubscriptionInfo subscriptionInfo = subManager.getActiveSubscriptionInfo(subManager.getDefaultDataSubscriptionId()); if (subscriptionInfo == null) { - List list = subManager.getAllSubscriptionInfoList(); + List list = subManager.getAvailableSubscriptionInfoList(); if (list.size() == 0) { return SubscriptionManager.INVALID_SUBSCRIPTION_ID; }