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

Commit 9dea81b4 authored by Les Lee's avatar Les Lee Committed by Automerger Merge Worker
Browse files

Merge "carrier data usage: Use carrier template as default policy" am: 9eb76885 

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

Change-Id: Ie10a2dfe6c959a591cda641863af873eea409a37
parents 2ed60973 9eb76885

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.