Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dac6dda5 authored by Betty Chang's avatar Betty Chang Committed by Android (Google) Code Review
Browse files

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

parents eb8658a8 50d75061

src/com/android/settings/SettingsDumpService.java

+2 −2
Original line number Diff line number Diff line
@@ -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(

src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {

src/com/android/settings/datausage/DataUsageUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU 
        SubscriptionInfo subscriptionInfo =

                subManager.getActiveSubscriptionInfo(subManager.getDefaultDataSubscriptionId());

        if (subscriptionInfo == null) {

            List<SubscriptionInfo> list = subManager.getAllSubscriptionInfoList();

            List<SubscriptionInfo> list = subManager.getAvailableSubscriptionInfoList();

            if (list.size() == 0) {

                return SubscriptionManager.INVALID_SUBSCRIPTION_ID;

            }