commit 04665dbfccd9705172caf2d283651499d6dacd25
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 08 03:12:58 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 08 03:12:58 2019 +0000
tree 5f458f655790bd2728dc78e4024caacac4974e03
parent f605363ce46a6ebaa5bbab04e1b22478f9edb48d
parent e896c6d665bbce5b4c4277b8ba82dcdf2cf548df

Merge "ConnectivityService: Grant networkstack uid extra privileges"

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 9acafae..b158c32 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3268,7 +3268,8 @@
         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;