From 3c42fedeb539c9bfc7088887fe5cea7059672802 Mon Sep 17 00:00:00 2001 From: Treehugger Robot Date: Thu, 22 Jul 2021 02:56:25 +0000 Subject: [PATCH] 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 --- .../src/com/android/server/connectivity/PermissionMonitor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/src/com/android/server/connectivity/PermissionMonitor.java b/service/src/com/android/server/connectivity/PermissionMonitor.java index 56b2e6d2d8..03cc3a097b 100755 --- a/service/src/com/android/server/connectivity/PermissionMonitor.java +++ b/service/src/com/android/server/connectivity/PermissionMonitor.java @@ -303,7 +303,7 @@ public class PermissionMonitor { 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