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

Commit 07f5a07b authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "StartActivity in TaskFragments without globalLock held" into main

parents 64c8c811 b02d6cdb
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1367,10 +1367,10 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
                final IBinder callerActivityToken = operation.getActivityToken();
                final Intent activityIntent = operation.getActivityIntent();
                final Bundle activityOptions = operation.getBundle();
                final int result = mService.getActivityStartController()
                final int result = waitAsyncStart(() -> mService.getActivityStartController()
                        .startActivityInTaskFragment(taskFragment, activityIntent, activityOptions,
                                callerActivityToken, caller.mUid, caller.mPid,
                                errorCallbackToken);
                                errorCallbackToken));
                if (!isStartResultSuccessful(result)) {
                    sendTaskFragmentOperationFailure(organizer, errorCallbackToken, taskFragment,
                            opType, convertStartFailureToThrowable(result, activityIntent));