From 48e920c2f33443e7c763f7e61b3c81b73ead6c43 Mon Sep 17 00:00:00 2001 From: Rhed Jao Date: Wed, 30 Jun 2021 13:09:02 +0000 Subject: [PATCH] Revert "Enforce package visibility to the api checkUriPermission" Revert "Add tests for the api Context#checkUriPermission" Revert submission 15065651-pm_package_visibility_check_uri_permission Reason for revert: [Regression] Cross-profile sharing is broken Reverted Changes: Iea2f2d8a8:Enforce package visibility to the api checkUriPerm... I0a4ed9350:Add tests for the api Context#checkUriPermission Bug: 192357488 Change-Id: I0050e70121e23e8457dbfc061f488c40f7ec2a93 --- .../com/android/server/am/ActivityManagerService.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 0c97724777342..2de091bb34bff 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -5684,16 +5684,6 @@ public class ActivityManagerService extends IActivityManager.Stub if (pid == MY_PID) { return PackageManager.PERMISSION_GRANTED; } - try { - if (uid != 0) { // bypass the root - final String[] packageNames = getPackageManager().getPackagesForUid(uid); - if (ArrayUtils.isEmpty(packageNames)) { - // The uid is not existed or not visible to the caller. - return PackageManager.PERMISSION_DENIED; - } - } - } catch (RemoteException e) { - } return mUgmInternal.checkUriPermission(new GrantUri(userId, uri, modeFlags), uid, modeFlags) ? PackageManager.PERMISSION_GRANTED : PackageManager.PERMISSION_DENIED; }