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

[Mainline] Removed non-formal API getAllSubscriptionInfoList to used in Settings

Browse Source 
Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest
      make RunSettingsRoboTests ROBOTEST_FILTER=SettingsDumpServiceTest
Change-Id: Ie9c01afa2b128f8d296b160d3628ea1fb7176e59
This commit is contained in:
changbetty
2020-01-15 16:57:19 +08:00
parent 69a7e054f5
commit 50d7506103
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/SettingsDumpService.java
View File

@@ -102,11 +102,11 @@ public class SettingsDumpService extends Service {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
DataUsageController controller = new DataUsageController(this); DataUsageController controller = new DataUsageController(this);
ConnectivityManager connectivityManager = getSystemService(ConnectivityManager.class); ConnectivityManager connectivityManager = getSystemService(ConnectivityManager.class);
SubscriptionManager manager = SubscriptionManager.from(this); SubscriptionManager manager = this.getSystemService(SubscriptionManager.class);
TelephonyManager telephonyManager = this.getSystemService(TelephonyManager.class); TelephonyManager telephonyManager = this.getSystemService(TelephonyManager.class);
if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) { if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
JSONArray array = new JSONArray(); JSONArray array = new JSONArray();
for (SubscriptionInfo info : manager.getAllSubscriptionInfoList()) { for (SubscriptionInfo info : manager.getAvailableSubscriptionInfoList()) {
telephonyManager = telephonyManager telephonyManager = telephonyManager
.createForSubscriptionId(info.getSubscriptionId()); .createForSubscriptionId(info.getSubscriptionId());
NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll( NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(

2
src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
View File

@@ -272,7 +272,7 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll
SubscriptionInfo subInfo = mSubscriptionManager.getActiveSubscriptionInfo(mSubscriptionId); SubscriptionInfo subInfo = mSubscriptionManager.getActiveSubscriptionInfo(mSubscriptionId);
if (subInfo == null) { if (subInfo == null) {
subInfo = mSubscriptionManager.getAllSubscriptionInfoList().stream().filter( subInfo = mSubscriptionManager.getAvailableSubscriptionInfoList().stream().filter(
i -> i.getSubscriptionId() == mSubscriptionId).findFirst().orElse(null); i -> i.getSubscriptionId() == mSubscriptionId).findFirst().orElse(null);
} }
if (subInfo != null && mHasMobileData) { if (subInfo != null && mHasMobileData) {

2
src/com/android/settings/datausage/DataUsageUtils.java
View File

@@ -166,7 +166,7 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU
SubscriptionInfo subscriptionInfo = SubscriptionInfo subscriptionInfo =
subManager.getActiveSubscriptionInfo(subManager.getDefaultDataSubscriptionId()); subManager.getActiveSubscriptionInfo(subManager.getDefaultDataSubscriptionId());
if (subscriptionInfo == null) { if (subscriptionInfo == null) {
List<SubscriptionInfo> list = subManager.getAllSubscriptionInfoList(); List<SubscriptionInfo> list = subManager.getAvailableSubscriptionInfoList();
if (list.size() == 0) { if (list.size() == 0) {
return SubscriptionManager.INVALID_SUBSCRIPTION_ID; return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
} }