Merge "Removed the POLICY_ALLOW_BACKGROUND_BATTERY_SAVE constant." (eabb482a) · Commits · e / os / android_frameworks_base

core/java/android/net/NetworkPolicyManager.java

+14 −10

Original line number	Original line	Diff line number	Diff line
	@@ -46,8 +46,6 @@ public class NetworkPolicyManager {
	public static final int POLICY_NONE = 0x0;		public static final int POLICY_NONE = 0x0;
	/** Reject network usage on metered networks when application in background. */		/** Reject network usage on metered networks when application in background. */
	public static final int POLICY_REJECT_METERED_BACKGROUND = 0x1;		public static final int POLICY_REJECT_METERED_BACKGROUND = 0x1;
	/** Allow network use (metered or not) in the background in battery save mode. */
	public static final int POLICY_ALLOW_BACKGROUND_BATTERY_SAVE = 0x2;

	/*		/*
	* Rules defining whether an uid has access to a network given its type (metered / non-metered).		* Rules defining whether an uid has access to a network given its type (metered / non-metered).
	@@ -126,8 +124,8 @@ public class NetworkPolicyManager {
	/**		/**
	* Set policy flags for specific UID.		* Set policy flags for specific UID.
	*		*
	* @param policy {@link #POLICY_NONE} or combination of flags like		* @param policy should be {@link #POLICY_NONE} or any combination of {@code POLICY_} flags,
	* {@link #POLICY_REJECT_METERED_BACKGROUND} or {@link #POLICY_ALLOW_BACKGROUND_BATTERY_SAVE}.		* although it is not validated.
	*/		*/
	public void setUidPolicy(int uid, int policy) {		public void setUidPolicy(int uid, int policy) {
	try {		try {
	@@ -138,9 +136,12 @@ public class NetworkPolicyManager {
	}		}

	/**		/**
	* Add policy flags for specific UID. The given policy bits will be set for		* Add policy flags for specific UID.
	* the uid. Policy flags may be either		*
	* {@link #POLICY_REJECT_METERED_BACKGROUND} or {@link #POLICY_ALLOW_BACKGROUND_BATTERY_SAVE}.		* <p>The given policy bits will be set for the uid.
			*
			* @param policy should be {@link #POLICY_NONE} or any combination of {@code POLICY_} flags,
			* although it is not validated.
	*/		*/
	public void addUidPolicy(int uid, int policy) {		public void addUidPolicy(int uid, int policy) {
	try {		try {
	@@ -151,9 +152,12 @@ public class NetworkPolicyManager {
	}		}

	/**		/**
	* Clear/remove policy flags for specific UID. The given policy bits will be set for		* Clear/remove policy flags for specific UID.
	* the uid. Policy flags may be either		*
	* {@link #POLICY_REJECT_METERED_BACKGROUND} or {@link #POLICY_ALLOW_BACKGROUND_BATTERY_SAVE}.		* <p>The given policy bits will be set for the uid.
			*
			* @param policy should be {@link #POLICY_NONE} or any combination of {@code POLICY_} flags,
			* although it is not validated.
	*/		*/
	public void removeUidPolicy(int uid, int policy) {		public void removeUidPolicy(int uid, int policy) {
	try {		try {

core/tests/coretests/src/android/net/NetworkPolicyManagerTest.java

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,6 @@ package android.net;

	import static android.net.NetworkPolicyManager.MASK_ALL_NETWORKS;		import static android.net.NetworkPolicyManager.MASK_ALL_NETWORKS;
	import static android.net.NetworkPolicyManager.MASK_METERED_NETWORKS;		import static android.net.NetworkPolicyManager.MASK_METERED_NETWORKS;
	import static android.net.NetworkPolicyManager.POLICY_ALLOW_BACKGROUND_BATTERY_SAVE;
	import static android.net.NetworkPolicyManager.POLICY_NONE;		import static android.net.NetworkPolicyManager.POLICY_NONE;
	import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;		import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
	import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;		import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;
	@@ -79,8 +78,6 @@ public class NetworkPolicyManagerTest {
	uidPoliciesToStringTest(POLICY_NONE, "0 (NONE)");		uidPoliciesToStringTest(POLICY_NONE, "0 (NONE)");
	uidPoliciesToStringTest(POLICY_REJECT_METERED_BACKGROUND,		uidPoliciesToStringTest(POLICY_REJECT_METERED_BACKGROUND,
	"1 (REJECT_METERED_BACKGROUND)");		"1 (REJECT_METERED_BACKGROUND)");
	uidPoliciesToStringTest(POLICY_ALLOW_BACKGROUND_BATTERY_SAVE,
	"2 (ALLOW_BACKGROUND_BATTERY_SAVE)");
	}		}

	private void uidPoliciesToStringTest(int policyRules, String... expectedOptions) {		private void uidPoliciesToStringTest(int policyRules, String... expectedOptions) {

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

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,6 @@ import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
	import static android.net.ConnectivityManager.TYPE_WIFI;		import static android.net.ConnectivityManager.TYPE_WIFI;
	import static android.net.NetworkPolicy.LIMIT_DISABLED;		import static android.net.NetworkPolicy.LIMIT_DISABLED;
	import static android.net.NetworkPolicy.WARNING_DISABLED;		import static android.net.NetworkPolicy.WARNING_DISABLED;
	import static android.net.NetworkPolicyManager.POLICY_ALLOW_BACKGROUND_BATTERY_SAVE;
	import static android.net.NetworkPolicyManager.POLICY_NONE;		import static android.net.NetworkPolicyManager.POLICY_NONE;
	import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;		import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
	import static android.net.NetworkPolicyManager.computeLastCycleBoundary;		import static android.net.NetworkPolicyManager.computeLastCycleBoundary;
	@@ -297,17 +296,19 @@ public class NetworkPolicyManagerServiceTest {
	@Test		@Test
	@NetPolicyXml("restrict-background-lists-whitelist-format.xml")		@NetPolicyXml("restrict-background-lists-whitelist-format.xml")
	public void testRestrictBackgroundLists_whitelistFormat() throws Exception {		public void testRestrictBackgroundLists_whitelistFormat() throws Exception {
	// UIds that are whitelisted		// UIds that are whitelisted.
	final int[] whitelisted = mService.getRestrictBackgroundWhitelistedUids();		final int[] whitelisted = mService.getRestrictBackgroundWhitelistedUids();
	assertContainsInAnyOrder(whitelisted, UID_A, UID_B, UID_C);		assertContainsInAnyOrder(whitelisted, UID_A, UID_B, UID_C);
	assertUidPolicy(UID_A, POLICY_NONE);		assertUidPolicy(UID_A, POLICY_NONE);
	assertUidPolicy(UID_B, POLICY_NONE);		assertUidPolicy(UID_B, POLICY_NONE);
	assertUidPolicy(UID_C, POLICY_NONE);		assertUidPolicy(UID_C, POLICY_NONE);

	// UIDs that are blacklisted		// UIDs that are blacklisted.
	assertUidPolicy(UID_D, POLICY_NONE);		assertUidPolicy(UID_D, POLICY_NONE);
	assertUidPolicy(UID_E, POLICY_REJECT_METERED_BACKGROUND);		assertUidPolicy(UID_E, POLICY_REJECT_METERED_BACKGROUND);
	assertUidPolicy(UID_F, POLICY_ALLOW_BACKGROUND_BATTERY_SAVE);
			// UIDS that have legacy policies.
			assertUidPolicy(UID_F, 2);
	}		}

	// NOTE: testPolicyChangeTriggersListener() and testUidForeground() are too superficial, they		// NOTE: testPolicyChangeTriggersListener() and testUidForeground() are too superficial, they