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

Merge "Add setSubscriptionPlans() and getSubscriptionPlans() @SystemApi"

Browse Source
This commit is contained in:
Aaron Huang
2020-02-05 11:48:26 +00:00
committed by Gerrit Code Review
parent 2c1f3e9a16 bfbaa0bbca
commit 12aeaefeaf
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -4603,7 +4603,9 @@ package android.net {
}
public class NetworkPolicyManager {
method @NonNull public android.telephony.SubscriptionPlan[] getSubscriptionPlans(int, @NonNull String);
method public void setSubscriptionOverride(int, int, int, long, @NonNull String);
method public void setSubscriptionPlans(int, @NonNull android.telephony.SubscriptionPlan[], @NonNull String);
field public static final int SUBSCRIPTION_OVERRIDE_CONGESTED = 2; // 0x2
field public static final int SUBSCRIPTION_OVERRIDE_UNMETERED = 1; // 0x1
}

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

@@ -337,7 +337,6 @@ public class NetworkPolicyManager {
* requested state until explicitly cleared, or the next reboot,
* whichever happens first
* @param callingPackage the name of the package making the call.
*
*/
public void setSubscriptionOverride(int subId, @SubscriptionOverrideMask int overrideMask,
@SubscriptionOverrideMask int overrideValue, long timeoutMillis,
@@ -350,6 +349,37 @@ public class NetworkPolicyManager {
}
}
/**
* Set the subscription plans for a specific subscriber.
*
* @param subId the subscriber this relationship applies to.
* @param plans the list of plans.
* @param callingPackage the name of the package making the call
*/
public void setSubscriptionPlans(int subId, @NonNull SubscriptionPlan[] plans,
@NonNull String callingPackage) {
try {
mService.setSubscriptionPlans(subId, plans, callingPackage);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/**
* Get subscription plans for the given subscription id.
*
* @param subId the subscriber to get the subscription plans for.
* @param callingPackage the name of the package making the call.
*/
@NonNull
public SubscriptionPlan[] getSubscriptionPlans(int subId, @NonNull String callingPackage) {
try {
return mService.getSubscriptionPlans(subId, callingPackage);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/**
* Resets network policy settings back to factory defaults.
*