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

Commit c98d3dde authored by Les Lee's avatar Les Lee
Browse files

Usage Settings: Fix NPE when subscriberId is Null. 

For mobile, a old API: buildTemplateMobileAll doesn't includes the
merged wifi network, call the new API: buildTemplateCarrierMetered
to replace the old one.

But new API: buildTemplateCarrierMetered requires non-null subscriberId.
Call old API: buildTemplateMobileAll when subscriberId is NULL since
the matched result is always empty when subscriberId is NULL. No any different
between buildTemplateCarrierMetered and buildTemplateMobileAll.

Bug: 190233044
Bug: 190135429
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageUtilsTest
Change-Id: I3c7166e60e32142d5995d41722955dd54c21938f
parent d529b061

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

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


    private static NetworkTemplate getMobileTemplateForSubId(

            TelephonyManager telephonyManager, int subId) {

        return NetworkTemplate.buildTemplateCarrierMetered(

                telephonyManager.getSubscriberId(subId));

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

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

    }

}