LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Create new system API in UserHandle to get uid" am: 2173785652

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8303c08be1e76ff48e60965518de4d469dc0352
This commit is contained in:
Chiachang Wang
2021-02-08 04:30:03 +00:00
committed by Automerger Merge Worker
parent 05bf3641ea 2173785652
commit 59a29b670e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/connectivity/PermissionMonitor.java
View File

@@ -265,7 +265,10 @@ public class PermissionMonitor implements PackageManagerInternal.PackageListObse
for (Entry<Integer, Boolean> app : apps.entrySet()) {
List<Integer> list = app.getValue() ? system : network;
for (int user : users) {
list.add(UserHandle.getUid(user, app.getKey()));
final UserHandle handle = UserHandle.of(user);
if (handle == null) continue;
list.add(UserHandle.getUid(handle, app.getKey()));
}
}
try {
@@ -550,7 +553,10 @@ public class PermissionMonitor implements PackageManagerInternal.PackageListObse
for (UidRange range : ranges) {
for (int userId = range.getStartUser(); userId <= range.getEndUser(); userId++) {
for (int appId : appIds) {
final int uid = UserHandle.getUid(userId, appId);
final UserHandle handle = UserHandle.of(userId);
if (handle == null) continue;
final int uid = UserHandle.getUid(handle, appId);
if (range.contains(uid)) {
result.add(uid);
}