commit c6a375706ebe71b5ca9c1ac3cada014fff7ee131
author Iavor-Valentin Iftime <valiiftime@google.com> Tue Oct 08 15:08:18 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 08 15:08:18 2019 +0000
tree 90a7c568742e0467f01e096ee1ffa35d8fef13e7
parent 9d450f632fecb7181a831c3c154195c0fb12f51b
parent 9fa3509a51a7d4684aa53f0ddf52c993d36bc242

Merge "API to detect which network interfaces support wake-on-lan"

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 b13df58..e0f60b4 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3274,7 +3274,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;