Merge "Always create grant structures when persistable." (1205974d) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -8154,6 +8154,12 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		}

		// If we're extending a persistable grant, then we always need to create
		// the grant data structure so that take/release APIs work
		if ((modeFlags & Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION) != 0) {
		return targetUid;
		}

		if (targetUid >= 0) {
		// First... does the target actually need this permission?
		if (checkHoldingPermissionsLocked(pm, pi, grantUri, targetUid, modeFlags)) {