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

Commit c3bc2b1f authored by Les Lee's avatar Les Lee Committed by Automerger Merge Worker
Browse files

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

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14842882

Change-Id: Ia8582a054d4e09520a1064170a8fad6992daea6c
parents 988c0503 b4a424f9

packages/SettingsLib/src/com/android/settingslib/net/DataUsageUtils.java

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




    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);

    }

    }

}
 
}