Merge cherrypicks of [15176934, 15176724] into sc-d1-release (392e0040) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -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;
		}