| commit | 7d0eb2b22a3665a94fa028e75b697aeac8ff0589 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jul 22 02:21:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 22 02:21:16 2021 +0000 |
| tree | 2c7bb477d5f49a71891c4246a0cd3e9c035f6006 | |
| parent | ca4a4a1b86ca121f5e506f2ad49301d6b7218534 [diff] | |
| parent | 02d7eb2abe0e61dc3648d1eac4b7f925567a4d7b [diff] |
Merge "Use appId for looking up allowed on restricted networks uids list" am: 02d7eb2abe Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1773886 Change-Id: I0a853cfa3abfec8588dc0bdc97aef60230206bb8
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