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

Merge "Removed the POLICY_ALLOW_BACKGROUND_BATTERY_SAVE constant."

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-23 21:18:24 +00:00
committed by Android (Google) Code Review
parent ebae3b55b7 8546a44480
commit eabb482ab8
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,8 +46,6 @@ public class NetworkPolicyManager {
public static final int POLICY_NONE = 0x0;
/** Reject network usage on metered networks when application in background. */
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).
@@ -126,8 +124,8 @@ public class NetworkPolicyManager {
/**
* Set policy flags for specific UID.
*
* @param policy {@link #POLICY_NONE} or combination of flags like
* {@link #POLICY_REJECT_METERED_BACKGROUND} or {@link #POLICY_ALLOW_BACKGROUND_BATTERY_SAVE}.
* @param policy should be {@link #POLICY_NONE} or any combination of {@code POLICY_} flags,
* although it is not validated.
*/
public void setUidPolicy(int uid, int policy) {
try {
@@ -138,9 +136,12 @@ public class NetworkPolicyManager {
}
/**
* Add policy flags for specific UID. The given policy bits will be set for
* the uid. Policy flags may be either
* {@link #POLICY_REJECT_METERED_BACKGROUND} or {@link #POLICY_ALLOW_BACKGROUND_BATTERY_SAVE}.
* Add policy flags for specific UID.
*
* <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) {
try {
@@ -151,9 +152,12 @@ public class NetworkPolicyManager {
}
/**
* Clear/remove policy flags for specific UID. The given policy bits will be set for
* the uid. Policy flags may be either
* {@link #POLICY_REJECT_METERED_BACKGROUND} or {@link #POLICY_ALLOW_BACKGROUND_BATTERY_SAVE}.
* Clear/remove policy flags for specific UID.
*
* <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) {
try {

3
core/tests/coretests/src/android/net/NetworkPolicyManagerTest.java
View File

@@ -17,7 +17,6 @@ package android.net;
import static android.net.NetworkPolicyManager.MASK_ALL_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_REJECT_METERED_BACKGROUND;
import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;
@@ -79,8 +78,6 @@ public class NetworkPolicyManagerTest {
uidPoliciesToStringTest(POLICY_NONE, "0 (NONE)");
uidPoliciesToStringTest(POLICY_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) {

9
services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
View File

@@ -20,7 +20,6 @@ import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.NetworkPolicy.LIMIT_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_REJECT_METERED_BACKGROUND;
import static android.net.NetworkPolicyManager.computeLastCycleBoundary;
@@ -297,17 +296,19 @@ public class NetworkPolicyManagerServiceTest {
@Test
@NetPolicyXml("restrict-background-lists-whitelist-format.xml")
public void testRestrictBackgroundLists_whitelistFormat() throws Exception {
// UIds that are whitelisted
// UIds that are whitelisted.
final int[] whitelisted = mService.getRestrictBackgroundWhitelistedUids();
assertContainsInAnyOrder(whitelisted, UID_A, UID_B, UID_C);
assertUidPolicy(UID_A, POLICY_NONE);
assertUidPolicy(UID_B, POLICY_NONE);
assertUidPolicy(UID_C, POLICY_NONE);
// UIDs that are blacklisted
// UIDs that are blacklisted.
assertUidPolicy(UID_D, POLICY_NONE);
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