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

Commit 8a0bca43 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge changes from topic "jun1" into rvc-dev 

* changes:
  Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #4.
  Remove thread delegation when checking grants.
parents 4cdb5dde 14c5c4d9

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

+2 −24
Original line number Original line Diff line number Diff line
@@ -18900,30 +18900,8 @@ public class ActivityManagerService extends IActivityManager.Stub 
        @Override

        @Override

        public int checkContentProviderUriPermission(Uri uri, int userId,

        public int checkContentProviderUriPermission(Uri uri, int userId,

                int callingUid, int modeFlags) {

                int callingUid, int modeFlags) {

            // We can find ourselves needing to check Uri permissions while

            // already holding the WM lock, which means reaching back here for

            // the AM lock would cause an inversion. The WM team has requested

            // that we use the strategy below instead of shifting where Uri

            // grants are calculated.














            // Since we could also arrive here while holding the AM lock, we














            // can't always delegate the call through the handler, and we need














            // to delicately dance between the deadlocks.














            if (Thread.currentThread().holdsLock(ActivityManagerService.this)) {














            return ActivityManagerService.this.checkContentProviderUriPermission(uri,







            return ActivityManagerService.this.checkContentProviderUriPermission(uri,











                    userId, callingUid, modeFlags);







                    userId, callingUid, modeFlags);











            } else {














                final CompletableFuture<Integer> res = new CompletableFuture<>();














                mHandler.post(() -> {














                    res.complete(ActivityManagerService.this.checkContentProviderUriPermission(uri,














                            userId, callingUid, modeFlags));














                });














                try {














                    return res.get();














                } catch (InterruptedException | ExecutionException e) {














                    throw new RuntimeException(e);














                }














            }














        }







        }



























        @Override







        @Override

























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



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -114,7 +114,7 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub {









    private static final String TAG = "UriGrantsManagerService";







    private static final String TAG = "UriGrantsManagerService";











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







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











    private static final int MAX_PERSISTED_URI_GRANTS = 128;







    private static final int MAX_PERSISTED_URI_GRANTS = 128;











    private static final boolean ENABLE_DYNAMIC_PERMISSIONS = false;







    private static final boolean ENABLE_DYNAMIC_PERMISSIONS = true;































    private final Object mLock = new Object();







    private final Object mLock = new Object();











    private final H mH;







    private final H mH;