Merge "Always create grant structures when persistable."

2016-12-21 21:55:45 +00:00
parent 15a30363af 08f1959e10
commit 1205974dd7
1 changed files with 6 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -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)) {