diff options
| author | 2019-10-04 06:33:37 -0700 | |
|---|---|---|
| committer | 2019-10-06 14:32:19 -0700 | |
| commit | e896c6d665bbce5b4c4277b8ba82dcdf2cf548df (patch) | |
| tree | 25c57cdc9fbcc4bce6b0a384253ae18346724f21 | |
| parent | 87700db4ef58327f11b9bb4bcc69a0a05ec6bca9 (diff) | |
ConnectivityService: Grant networkstack uid extra privileges
The wifi network factories/agents are going to run in the network stack
process for devices which accept wifi mainline module. Allow these
factories/agents to perform privileged operations.
Bug: 142115344
Test: ACTS test
Change-Id: I2dd412ac5c6b67f52c87113fcda345e1f531f9c4
WifiNetworkRequestTest:test_connect_failure_user_rejected passes now.
(cherry-picked from c7580b1d59ee126cd6867cb6fe4485a69e2b4622)
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 667445b1c58f..0be9e1dfe8bc 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -3264,7 +3264,8 @@ public class ConnectivityService extends IConnectivityManager.Stub final NetworkRequestInfo nri = mNetworkRequests.get(request); if (nri != null) { - if (Process.SYSTEM_UID != callingUid && nri.mUid != callingUid) { + if (Process.SYSTEM_UID != callingUid && Process.NETWORK_STACK_UID != callingUid + && nri.mUid != callingUid) { log(String.format("UID %d attempted to %s for unowned request %s", callingUid, requestedOperation, nri)); return null; |