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

Commit 787685b2 authored by Les Lee's avatar Les Lee Committed by Android (Google) Code Review
Browse files

Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev

parents b734aa3f 204f0215

src/com/android/settings/SettingsDumpService.java

+7 −3
Original line number Original line Diff line number Diff line
@@ -111,9 +111,13 @@ public class SettingsDumpService extends Service { 
            for (SubscriptionInfo info : manager.getAvailableSubscriptionInfoList()) {

            for (SubscriptionInfo info : manager.getAvailableSubscriptionInfoList()) {

                telephonyManager = telephonyManager

                telephonyManager = telephonyManager

                        .createForSubscriptionId(info.getSubscriptionId());

                        .createForSubscriptionId(info.getSubscriptionId());

                NetworkTemplate carrier = NetworkTemplate.buildTemplateCarrierMetered(

                String subscriberId = telephonyManager.getSubscriberId();

                        telephonyManager.getSubscriberId());

                // The null subscriberId means that no any mobile/carrier network will be matched.

                final JSONObject usage = dumpDataUsage(carrier, controller);

                // Using old API: buildTemplateMobileAll for the null subscriberId to avoid NPE.

                NetworkTemplate template = subscriberId != null

                        ? NetworkTemplate.buildTemplateCarrierMetered(subscriberId)

                        : NetworkTemplate.buildTemplateMobileAll(subscriberId);

                final JSONObject usage = dumpDataUsage(template, controller);

                usage.put("subId", info.getSubscriptionId());

                usage.put("subId", info.getSubscriptionId());

                array.put(usage);

                array.put(usage);

            }

            }

src/com/android/settings/datausage/lib/DataUsageLib.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -73,7 +73,10 @@ public class DataUsageLib { 




    private static NetworkTemplate getMobileTemplateForSubId(

    private static NetworkTemplate getMobileTemplateForSubId(

            TelephonyManager telephonyManager, int subId) {

            TelephonyManager telephonyManager, int subId) {

        return NetworkTemplate.buildTemplateCarrierMetered(

        // The null subscriberId means that no any mobile/carrier network will be matched.

                telephonyManager.getSubscriberId(subId));

        // Using old API: buildTemplateMobileAll for the null subscriberId to avoid NPE.

        String subscriberId = telephonyManager.getSubscriberId(subId);

        return subscriberId != null ? NetworkTemplate.buildTemplateCarrierMetered(subscriberId)

                : NetworkTemplate.buildTemplateMobileAll(subscriberId);

    }

    }

}
 
}