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

Commit 9da5f37f authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Don't hold AM lock in AMS.getIntentSender"

parents cc10721c 5b3d6804
Loading
Loading
Loading
Loading
+36 −34
Original line number Diff line number Diff line
@@ -4820,6 +4820,10 @@ public class ActivityManagerService extends IActivityManager.Stub
            String packageName, IBinder token, String resultWho,
            int requestCode, Intent[] intents, String[] resolvedTypes,
            int flags, Bundle bOptions, int userId) {
        // NOTE: The service lock isn't held in this method because nothing in the method requires
        // the service lock to be held.
        enforceNotIsolatedCaller("getIntentSender");
        // Refuse possible leaked file descriptors
        if (intents != null) {
@@ -4851,7 +4855,6 @@ public class ActivityManagerService extends IActivityManager.Stub
            }
        }
        synchronized(this) {
        int callingUid = Binder.getCallingUid();
        int origUserId = userId;
        userId = mUserController.handleIncomingUser(Binder.getCallingPid(), callingUid, userId,
@@ -4889,7 +4892,6 @@ public class ActivityManagerService extends IActivityManager.Stub
            throw new SecurityException(e);
        }
    }
    }
    @Override
    public int sendIntentSender(IIntentSender target, IBinder whitelistToken, int code,