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

Commit b1c88b76 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Temporarily disable dynamic permission checks. 

The current implementation has shown obscure deadlock issues.

Bug: 137724333
Test: none
Change-Id: I2d263bf7c7e8cfa9a71076d642680143ce5f6f66
parent 2a4030a3

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

+2 −1
Original line number Diff line number Diff line
@@ -110,6 +110,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 = 128;

    private static final boolean ENABLE_DYNAMIC_PERMISSIONS = false;



    private final Object mLock = new Object();

    private final Context mContext;
@@ -952,7 +953,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 (pi.forceUriPermissions) {

        if (ENABLE_DYNAMIC_PERMISSIONS && pi.forceUriPermissions) {

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

            final int clientUserId = UserHandle.getUserId(uid);

            if (providerUserId == clientUserId) {