Merge "Add setSubscriptionPlans() and getSubscriptionPlans() @SystemApi" am:... (eeb878fd) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4603,7 +4603,9 @@ package android.net {
	}		}

	public class NetworkPolicyManager {		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 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_CONGESTED = 2; // 0x2
	field public static final int SUBSCRIPTION_OVERRIDE_UNMETERED = 1; // 0x1		field public static final int SUBSCRIPTION_OVERRIDE_UNMETERED = 1; // 0x1
	}		}

core/java/android/net/NetworkPolicyManager.java

+31 −1

Original line number	Original line	Diff line number	Diff line
	@@ -337,7 +337,6 @@ public class NetworkPolicyManager {
	* requested state until explicitly cleared, or the next reboot,		* requested state until explicitly cleared, or the next reboot,
	* whichever happens first		* whichever happens first
	* @param callingPackage the name of the package making the call.		* @param callingPackage the name of the package making the call.
	*
	*/		*/
	public void setSubscriptionOverride(int subId, @SubscriptionOverrideMask int overrideMask,		public void setSubscriptionOverride(int subId, @SubscriptionOverrideMask int overrideMask,
	@SubscriptionOverrideMask int overrideValue, long timeoutMillis,		@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.		* Resets network policy settings back to factory defaults.
	*		*