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

am 44e3a4cb: Merge "fix temp white list update in device idle" into mnc-dev

Browse Source 
* commit '44e3a4cbfab5d1d3298540759feeb495016d2158':
  fix temp white list update in device idle
This commit is contained in:
Xiaohui Chen
2015-06-27 04:05:37 +00:00
committed by Android Git Automerger
parent e436e19e0f 44e3a4cbfa
commit d1de261ae6
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2093,8 +2093,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
for (UserInfo user : users) { for (UserInfo user : users) {
for (int i = mPowerSaveTempWhitelistAppIds.size() - 1; i >= 0; i--) { for (int i = mPowerSaveTempWhitelistAppIds.size() - 1; i >= 0; i--) {
int appId = mPowerSaveTempWhitelistAppIds.keyAt(i); int appId = mPowerSaveTempWhitelistAppIds.keyAt(i);
boolean isAllow = mPowerSaveTempWhitelistAppIds.valueAt(i);
int uid = UserHandle.getUid(user.id, appId); int uid = UserHandle.getUid(user.id, appId);
updateRulesForUidLocked(uid); updateRulesForUidLocked(uid);
setUidFirewallRule(FIREWALL_CHAIN_DOZABLE, uid, !isAllow);
} }
} }
} }
@@ -2190,11 +2192,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
final boolean firewallReject = (uidRules & RULE_REJECT_ALL) != 0; final boolean firewallReject = (uidRules & RULE_REJECT_ALL) != 0;
if (oldFirewallReject != firewallReject) { if (oldFirewallReject != firewallReject) {
setUidFirewallRule(FIREWALL_CHAIN_STANDBY, uid, firewallReject); setUidFirewallRule(FIREWALL_CHAIN_STANDBY, uid, firewallReject);
if (mFirewallChainStates.get(FIREWALL_CHAIN_DOZABLE) && !firewallReject) {
// if the dozable chain is on, and we decide to allow this uid. we need to punch
// a hole in the dozable chain.
setUidFirewallRule(FIREWALL_CHAIN_DOZABLE, uid, false);
}
} }
// dispatch changed rule to existing listeners // dispatch changed rule to existing listeners