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

Commit 3746de82 authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline"

parents 0fb4b69e afebfaba

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class DataUsageUtils { 
        final NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(

                telephonyManager.createForSubscriptionId(subId).getSubscriberId());



        if (!subscriptionManager.isActiveSubId(subId)) {

        if (!subscriptionManager.isActiveSubscriptionId(subId)) {

            Log.i(TAG, "Subscription is not active: " + subId);

            return mobileAll;

        }

packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageUtilsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -72,13 +72,13 @@ public class DataUsageUtilsTest { 
        when(mTelephonyManager.getSubscriberId(SUB_ID)).thenReturn(SUBSCRIBER_ID);

        when(mTelephonyManager.getSubscriberId(SUB_ID_2)).thenReturn(SUBSCRIBER_ID_2);

        when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);

        when(mSubscriptionManager.isActiveSubId(anyInt())).thenReturn(true);

        when(mSubscriptionManager.isActiveSubscriptionId(anyInt())).thenReturn(true);

    }



    @Test

    @Ignore

    public void getMobileTemplate_infoNull_returnMobileAll() {

        when(mSubscriptionManager.isActiveSubId(SUB_ID)).thenReturn(false);

        when(mSubscriptionManager.isActiveSubscriptionId(SUB_ID)).thenReturn(false);



        final NetworkTemplate networkTemplate = DataUsageUtils.getMobileTemplate(mContext, SUB_ID);

        assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID)).isTrue();