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

Commit a8e85e6c authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Use ActivityManagerService lock in grantUriPermission" into sc-dev am: 76946f28 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13494810

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38c116aeb39e19ae62fd70a6745d0e6dd335680b
parents 8553dba7 76946f28

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

+2 −2
Original line number Diff line number Diff line
@@ -5632,7 +5632,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
            final int modeFlags, int userId) {

        enforceNotIsolatedCaller("grantUriPermission");

        GrantUri grantUri = new GrantUri(userId, uri, modeFlags);

        synchronized (mProcLock) {

        synchronized (this) {

            final ProcessRecord r = getRecordForAppLOSP(caller);

            if (r == null) {

                throw new SecurityException("Unable to find app for caller "
@@ -5666,7 +5666,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
    public void revokeUriPermission(IApplicationThread caller, String targetPackage, Uri uri,

            final int modeFlags, int userId) {

        enforceNotIsolatedCaller("revokeUriPermission");

        synchronized (mProcLock) {

        synchronized (this) {

            final ProcessRecord r = getRecordForAppLOSP(caller);

            if (r == null) {

                throw new SecurityException("Unable to find app for caller "