commit cb2db75d6f77217abf190c0b19313181da265001
author Lucas Lin <lucaslin@google.com> Tue Mar 16 12:44:29 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 16 12:44:29 2021 +0000
tree 0b8559aecc94af899c464ff17543abb5a8437538
parent 8885169a2e11287483bd60381b4c5444d240de93
parent f23bda53b2b7ee3b046a7ab856d81d37a8787ccb

Merge "Remove NETWORK_STACK_UID check" am: 5f7eb9024e am: f23bda53b2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635323

Change-Id: I82eec664bd11bfb713e52c08fc38dc49dec973c4

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 841d8c7..92d9b08 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3806,8 +3806,7 @@
                 ? mNetworkRequests.get(request) : getNriForAppRequest(request);
 
         if (nri != null) {
-            if (Process.SYSTEM_UID != callingUid && Process.NETWORK_STACK_UID != callingUid
-                    && nri.mUid != callingUid) {
+            if (Process.SYSTEM_UID != callingUid && nri.mUid != callingUid) {
                 log(String.format("UID %d attempted to %s for unowned request %s",
                         callingUid, requestedOperation, nri));
                 return null;