Merge "ConnectivityService: Grant networkstack uid extra privileges" am: 04665dbfcc am: 24487ef5a6

am: 2d8ed7edde

Change-Id: Ib7c3190806733244672a38822febd7f2d37195b6

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 9acafaec185e..b158c32cb7b2 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3268,7 +3268,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;