| commit | 3c42fedeb539c9bfc7088887fe5cea7059672802 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jul 22 02:56:25 2021 +0000 |
| committer | Paul Hu <paulhu@google.com> | Thu Jul 22 03:19:56 2021 +0000 |
| tree | 8f2e5ac42a0a29a5c148a7be3c6dcf3fb4b668be | |
| parent | 3c20df39d0eb77c85218f3bb0d3ed5ef6360a3ef [diff] |
Use appId for looking up allowed on restricted networks uids list aosp/1770606 change uid to appId when filling allowed on restricted networks uids list. So add UserHandle.getAppId() to ensure that uses appId for looking up the list. Bug: 192116643 Test: atest FrameworksNetTests Original-Change: https://android-review.googlesource.com/1773886 Merged-In: I04fe3a77464d4cb02e7d53026f8f9a10bd0829e1 Change-Id: I04fe3a77464d4cb02e7d53026f8f9a10bd0829e1
diff --git a/service/src/com/android/server/connectivity/PermissionMonitor.java b/service/src/com/android/server/connectivity/PermissionMonitor.java index 56b2e6d..03cc3a0 100755 --- a/service/src/com/android/server/connectivity/PermissionMonitor.java +++ b/service/src/com/android/server/connectivity/PermissionMonitor.java
@@ -303,7 +303,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