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

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

Merge "Don't acquire WM service lock in ActivityStackSupervisor.resolveIntent()"

parents 2150cfa8 1f573383

services/core/java/com/android/server/wm/ActivityStackSupervisor.java

+19 −21
Original line number Diff line number Diff line
@@ -662,7 +662,6 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 


    ResolveInfo resolveIntent(Intent intent, String resolvedType, int userId, int flags,

            int filterCallingUid) {

        synchronized (mService.mGlobalLock) {

        try {

            Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "resolveIntent");

            int modifiedFlags = flags
@@ -688,7 +687,6 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 
            Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);

        }

    }

    }



    ActivityInfo resolveActivity(Intent intent, String resolvedType, int startFlags,

            ProfilerInfo profilerInfo, int userId, int filterCallingUid) {