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

Commit b02d6cdb authored by ByungSeok Jung's avatar ByungSeok Jung Committed by Chris Li
Browse files

StartActivity in TaskFragments without globalLock held 

If a intent has Content Uri, security exception can occur because
ContentProviderHelper always return "Permission Deinied" if
globalLock is held.

So, startActivity in TaskFragments without globalLock held.

Bug: 333529514
Test: Launch Intent with Content Uri
Change-Id: Ia43ea98ae8026e1515ee4b87b1f1d1aa6138a84b
parent 55a2e077

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

+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));