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

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

Merge changes from topic "network_policy_for_supporting_merged_wifi" into sc-dev 

* changes:
  wifi: Use new API for data usage function
  carrier data usage: Use carrier template as default policy
parents f142b5a3 35c9bb85

core/java/android/net/NetworkTemplate.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -514,6 +514,10 @@ public class NetworkTemplate implements Parcelable { 
        return mSubscriberIdMatchRule;

        return mSubscriberIdMatchRule;

    }

    }





    public int getMeteredness() {

        return mMetered;

    }



    /**

    /**

     * Test if given {@link NetworkIdentity} matches this template.

     * Test if given {@link NetworkIdentity} matches this template.

     */

     */

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

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




    private static NetworkTemplate getMobileTemplateForSubId(

    private static NetworkTemplate getMobileTemplateForSubId(

            TelephonyManager telephonyManager, int subId) {

            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 Original line Diff line number Diff line
@@ -44,7 +44,7 @@ public class NetworkPolicyEditorTest { 




    @Before

    @Before

    public void setUp() {

    public void setUp() {

        mNetworkTemplate = NetworkTemplate.buildTemplateMobileAll("123456789123456");

        mNetworkTemplate = NetworkTemplate.buildTemplateCarrierMetered("123456789123456");

        NetworkPolicyManager policyManager = NetworkPolicyManager.from(InstrumentationRegistry

        NetworkPolicyManager policyManager = NetworkPolicyManager.from(InstrumentationRegistry

                .getContext());

                .getContext());

        mNetworkPolicyEditor = new NetworkPolicyEditor(policyManager);

        mNetworkPolicyEditor = new NetworkPolicyEditor(policyManager);

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

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

        ShadowSubscriptionManager.setDefaultDataSubscriptionId(mDefaultSubscriptionId);

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

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





        mNetworkTemplate = NetworkTemplate.buildTemplateMobileAll(SUB_ID);

        mNetworkTemplate = NetworkTemplate.buildTemplateCarrierMetered(SUB_ID);

        mNetworkTemplate2 = NetworkTemplate.buildTemplateMobileAll(SUB_ID_2);

        mNetworkTemplate2 = NetworkTemplate.buildTemplateCarrierMetered(SUB_ID_2);

        mWifiNetworkTemplate = NetworkTemplate.buildTemplateWifi(

        mWifiNetworkTemplate = NetworkTemplate.buildTemplateWifi(

                NetworkTemplate.WIFI_NETWORKID_ALL, null);

                NetworkTemplate.WIFI_NETWORKID_ALL, null);

    }

    }

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

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

        when(mContext.getSystemService(Context.NETWORK_POLICY_SERVICE))

                .thenReturn(mNetworkPolicyManager);

                .thenReturn(mNetworkPolicyManager);

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

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

        mNetworkTemplate = NetworkTemplate.buildTemplateMobileAll(SUB_ID);

        mNetworkTemplate = NetworkTemplate.buildTemplateCarrierMetered(SUB_ID);

    }

    }





    @Test

    @Test