Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add ability to override subscriber capabilities." am: d6cd4b241a

Browse Source 
am: 5e097d452b

Change-Id: Ib22d57c7cde75560cfd5bdd71b75d29b1056f783
This commit is contained in:
Jeff Sharkey
2018-01-19 01:11:41 +00:00
committed by android-build-merger
parent 4775f0c76e 5e097d452b
commit 992cfa2667
5 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/INetworkPolicyListener.aidl
View File

@@ -18,10 +18,9 @@ package android.net;
/** {@hide} */
oneway interface INetworkPolicyListener {
void onUidRulesChanged(int uid, int uidRules);
void onMeteredIfacesChanged(in String[] meteredIfaces);
void onRestrictBackgroundChanged(boolean restrictBackground);
void onUidPoliciesChanged(int uid, int uidPolicies);
void onSubscriptionOverride(int subId, int overrideMask, int overrideValue);
}

12
core/java/android/net/NetworkPolicyManager.java
View File

@@ -114,6 +114,9 @@ public class NetworkPolicyManager {
*/
public static final String EXTRA_NETWORK_TEMPLATE = "android.net.NETWORK_TEMPLATE";
public static final int OVERRIDE_UNMETERED = 1 << 0;
public static final int OVERRIDE_CONGESTED = 1 << 1;
private final Context mContext;
private INetworkPolicyManager mService;
@@ -348,4 +351,13 @@ public class NetworkPolicyManager {
public static String resolveNetworkId(String ssid) {
return WifiInfo.removeDoubleQuotes(ssid);
}
/** {@hide} */
public static class Listener extends INetworkPolicyListener.Stub {
@Override public void onUidRulesChanged(int uid, int uidRules) { }
@Override public void onMeteredIfacesChanged(String[] meteredIfaces) { }
@Override public void onRestrictBackgroundChanged(boolean restrictBackground) { }
@Override public void onUidPoliciesChanged(int uid, int uidPolicies) { }
@Override public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue) { }
}
}