Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08f1959e authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Always create grant structures when persistable. 

Certain apps may already hold permissions to an underlying provider,
but they expect APIs like takePersistableUriPermission() and
getPersistedUriPermissions() to work when a permission grant was
extended with FLAG_GRANT_PERSISTABLE_URI_PERMISSION.

Test: builds, boots
Bug: 31239684
Change-Id: I4b21c57956b70133ecadb50d0d3ee339f41e2260
parent d0abcbeb

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)) {