Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "jun1" into rvc-dev am: 8a0bca43c3

Browse Source 
Original change: undetermined

Change-Id: I2b7061de97f3204f0c1e5818b40a5a74dabdce27
This commit is contained in:
Jeff Sharkey
2020-06-01 21:37:52 +00:00
committed by Automerger Merge Worker
parent 0d11f70230 8a0bca43c3
commit 858c59fad5
2 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -18900,30 +18900,8 @@ public class ActivityManagerService extends IActivityManager.Stub
@Override
public int checkContentProviderUriPermission(Uri uri, int userId,
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,
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);
}
}
return ActivityManagerService.this.checkContentProviderUriPermission(uri,
userId, callingUid, modeFlags);
}
@Override

2
services/core/java/com/android/server/uri/UriGrantsManagerService.java
View File

@@ -114,7 +114,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 static final boolean ENABLE_DYNAMIC_PERMISSIONS = true;
private final Object mLock = new Object();
private final H mH;