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

Commit b8b282e5 authored by lesl's avatar lesl Committed by Les Lee
Browse files

carrier data usage: Use carrier template as default policy 

The carrier network means any network which linked with sepcific
subscriberId (for instances: merged Wifi or mobile).
Update default policy to use carrier network template to replace mobile
template.

No impact for current AOSP user because no any wifi network is merged
wifi. (Because the merged wifi network requires to support from the wifi module).

Also this change convert all of the old policies which template is
TYEP_MOBILE to TYPE_CARRIER to match the default policy.

Bug: 176396812
Test: atest -c NetworkPolicyManagerServiceTest
Test: atest -c CtsHostsideNetworkTests
Test: Manual Test with test code (Force wifi to merged wifi).
      The data will limit when using merged wifi.
      And mobile policy also work normally.

Merged-In: I33c10f7549e713c52ce9afd5b8c4cce2abbda616
Change-Id: I33c10f7549e713c52ce9afd5b8c4cce2abbda616
parent 10cbb66f

core/java/android/net/NetworkTemplate.java

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

    }



    public int getMeteredness() {

        return mMetered;

    }



    /**

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

     */

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+81 −41

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/assets/NetworkPolicyManagerServiceTest/netpolicy/network-policy-mobile.xml

0 → 100644
+6 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>

<policy-list version="12" restrictBackground="false">

  <network-policy networkTemplate="1" subscriberId="466977604504520" cycleStart="2020-01-09T00:00+08:00[Asia/Taipei]" cyclePeriod="P1M" warningBytes="2147483648" limitBytes="-1" lastWarningSnooze="-1" lastLimitSnooze="-1" metered="true" inferred="true" />

</policy-list>

<whitelist />

services/tests/servicestests/assets/NetworkPolicyManagerServiceTest/netpolicy/network-policy-wifi-with-subscriberId-match-rule-all-and-templateMetered-no.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>

<policy-list version="13" restrictBackground="false">

<network-policy networkTemplate="4" subscriberIdMatchRule="1" networkId="TEST_SSID" templateMetered="0" cycleStart="2020-01-09T00:00+08:00[Asia/Taipei]" cyclePeriod="P1M" warningBytes="2147483648" limitBytes="-1" lastWarningSnooze="-1" lastLimitSnooze="-1" metered="true" inferred="true" />

</policy-list>

<whitelist />

services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java

+67 −29

File changed.

Preview size limit exceeded, changes collapsed.