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

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

Merge changes from topic "network_policy_for_supporting_merged_wifi" into... 

Merge changes from topic "network_policy_for_supporting_merged_wifi" into sc-dev am: 7b4645f3 am: a17cdbab

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

Change-Id: Ib7f2dbc69a4618425c65df87ee9d6d8edd642ddf
parents 515d977d a17cdbab

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

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


    private static NetworkTemplate getMobileTemplateForSubId(

            TelephonyManager telephonyManager, int subId) {

        return NetworkTemplate.buildTemplateMobileAll(telephonyManager.getSubscriberId(subId));

        return NetworkTemplate.buildTemplateCarrierMetered(

                telephonyManager.getSubscriberId(subId));

    }

}

packages/SettingsLib/tests/integ/src/com/android/settingslib/utils/NetworkPolicyEditorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class NetworkPolicyEditorTest { 


    @Before

    public void setUp() {

        mNetworkTemplate = NetworkTemplate.buildTemplateMobileAll("123456789123456");

        mNetworkTemplate = NetworkTemplate.buildTemplateCarrierMetered("123456789123456");

        NetworkPolicyManager policyManager = NetworkPolicyManager.from(InstrumentationRegistry

                .getContext());

        mNetworkPolicyEditor = new NetworkPolicyEditor(policyManager);

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

+2 −2
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ public class DataUsageControllerTest { 
        ShadowSubscriptionManager.setDefaultDataSubscriptionId(mDefaultSubscriptionId);

        doReturn(SUB_ID).when(mTelephonyManager).getSubscriberId();



        mNetworkTemplate = NetworkTemplate.buildTemplateMobileAll(SUB_ID);

        mNetworkTemplate2 = NetworkTemplate.buildTemplateMobileAll(SUB_ID_2);

        mNetworkTemplate = NetworkTemplate.buildTemplateCarrierMetered(SUB_ID);

        mNetworkTemplate2 = NetworkTemplate.buildTemplateCarrierMetered(SUB_ID_2);

        mWifiNetworkTemplate = NetworkTemplate.buildTemplateWifi(

                NetworkTemplate.WIFI_NETWORKID_ALL, null);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class NetworkCycleDataForUidLoaderTest { 
        when(mContext.getSystemService(Context.NETWORK_POLICY_SERVICE))

                .thenReturn(mNetworkPolicyManager);

        when(mNetworkPolicyManager.getNetworkPolicies()).thenReturn(new NetworkPolicy[0]);

        mNetworkTemplate = NetworkTemplate.buildTemplateMobileAll(SUB_ID);

        mNetworkTemplate = NetworkTemplate.buildTemplateCarrierMetered(SUB_ID);

    }



    @Test