commit 02d7eb2abe0e61dc3648d1eac4b7f925567a4d7b
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 22 01:48:45 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 22 01:48:45 2021 +0000
tree 2c7bb477d5f49a71891c4246a0cd3e9c035f6006
parent 42cbf4ebabd8fe126b2a2c1323cb6cf8e4deaccc
parent 25094906ff807ecb1681158bc151a76f9641c54d

Merge "Use appId for looking up allowed on restricted networks uids list"

service/src/com/android/server/connectivity/PermissionMonitor.java

diff --git a/service/src/com/android/server/connectivity/PermissionMonitor.java b/service/src/com/android/server/connectivity/PermissionMonitor.java
index 3b5a706..a49c0a6 100755
--- a/service/src/com/android/server/connectivity/PermissionMonitor.java
+++ b/service/src/com/android/server/connectivity/PermissionMonitor.java
@@ -310,7 +310,7 @@
         if (appInfo == null) return false;
         // Check whether package's uid is in allowed on restricted networks uid list. If so, this
         // uid can have netd system permission.
-        return mUidsAllowedOnRestrictedNetworks.contains(appInfo.uid);
+        return mUidsAllowedOnRestrictedNetworks.contains(UserHandle.getAppId(appInfo.uid));
     }
 
     @VisibleForTesting