summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sudheer Shanka <sudheersai@google.com> 2020-10-12 23:31:17 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-10-12 23:31:17 +0000
commit114124c348c80fc30f964c5e598c27f09645bc5b (patch)
tree7c8a09e1432144903034f141da27a82a0d828905
parent9c0f722e2eccdec98bf93f3aeb0a0e3e5b79c569 (diff)
parent42f3c9496ef1b0291e01d72363fc3b2db20804bd (diff)
Merge "Check UID's process state before restricting its network."
-rw-r--r--services/core/java/com/android/server/net/NetworkPolicyManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 2d7e79a7073c..a31aacbde46f 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -3867,7 +3867,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
// quick check: if this uid doesn't have INTERNET permission, it
// doesn't have network access anyway, so it is a waste to mess
// with it here.
- if (hasInternetPermissionUL(uid)) {
+ if (hasInternetPermissionUL(uid) && !isUidForegroundOnRestrictPowerUL(uid)) {
uidRules.put(uid, FIREWALL_RULE_DENY);
}
}