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

Merge "Update network state of apps leaving the whitelist" into mnc-dev

Browse Source
This commit is contained in:
Amith Yamasani
2015-06-12 20:26:41 +00:00
committed by Android (Google) Code Review
parent 1c24a8cd31 06f0806bd5
commit bc9b102453
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -376,8 +376,13 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub
void updatePowerSaveTempWhitelistLocked() {
try {
// Clear the states of the current whitelist
final int N = mPowerSaveTempWhitelistAppIds.size();
for (int i = 0; i < N; i++) {
mPowerSaveTempWhitelistAppIds.setValueAt(i, false);
}
// Update the states with the new whitelist
final int[] whitelist = mDeviceIdleController.getAppIdTempWhitelist();
mPowerSaveTempWhitelistAppIds.clear();
if (whitelist != null) {
for (int uid : whitelist) {
mPowerSaveTempWhitelistAppIds.put(uid, true);
@@ -387,6 +392,18 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub
}
}
/**
* Remove unnecessary entries in the temp whitelist
*/
void purgePowerSaveTempWhitelistLocked() {
final int N = mPowerSaveTempWhitelistAppIds.size();
for (int i = N - 1; i >= 0; i--) {
if (mPowerSaveTempWhitelistAppIds.valueAt(i) == false) {
mPowerSaveTempWhitelistAppIds.removeAt(i);
}
}
}
public void systemReady() {
if (!isBandwidthControlEnabled()) {
Slog.w(TAG, "bandwidth controls disabled, unable to enforce policy");
@@ -521,6 +538,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub
} else {
updatePowerSaveTempWhitelistLocked();
updateRulesForTempWhitelistChangeLocked();
purgePowerSaveTempWhitelistLocked();
}
}
}