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

Commit d781a45c authored by Corina Grigoras's avatar Corina Grigoras
Browse files

DO NOT MERGE: Disable ENABLE_DYNAMIC_PERMISSIONS without helper method. 

This includes reverting "DO NOT MERGE: Disable ENABLE_DYNAMIC_PERMISSIONS flag for now to avoid crashes.", commit 39150a74.

Reason for revert: Be able to follow up  with a clean patch that enables this flag using the helper method.

Bug: 115619667
Test: No

Change-Id: I930964259572cc8c145b82d84928fbf02fc0a19e
parent 39150a74

services/core/java/com/android/server/uri/UriGrantsManagerService.java

+2 −13
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub { 
    private static final String TAG = "UriGrantsManagerService";

    // Maximum number of persisted Uri grants a package is allowed

    private static final int MAX_PERSISTED_URI_GRANTS = 512;

    private static final boolean ENABLE_DYNAMIC_PERMISSIONS = true;

    private static final boolean ENABLE_DYNAMIC_PERMISSIONS = false;



    private final Object mLock = new Object();

    private final H mH;
@@ -991,9 +991,7 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub { 
        // If this provider says that grants are always required, we need to

        // consult it directly to determine if the UID has permission

        final boolean forceMet;

        if (ENABLE_DYNAMIC_PERMISSIONS

                && pi.forceUriPermissions

                && isDynamicPermissionEnabledInMP()) {

        if (ENABLE_DYNAMIC_PERMISSIONS && pi.forceUriPermissions) {

            final int providerUserId = UserHandle.getUserId(pi.applicationInfo.uid);

            final int clientUserId = UserHandle.getUserId(uid);

            if (providerUserId == clientUserId) {
@@ -1011,15 +1009,6 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub { 
        return readMet && writeMet && forceMet;

    }



    /**

     * Returns true if the available MediaProvider version contains the changes that enable dynamic

     * permission.

     */

    private boolean isDynamicPermissionEnabledInMP() {

        // TODO(b/159995598) Check MediaProvider version.

        return false;

    }



    @GuardedBy("mLock")

    private void removeUriPermissionIfNeededLocked(UriPermission perm) {

        if (perm.modeFlags != 0) {