Merge "Fixes activity not resumed after applying WCT" into main (ed5cc9b3) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1105,6 +1105,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
	break;		break;
	}		}
	if (activity.isVisible() \|\| activity.isVisibleRequested()) {		if (activity.isVisible() \|\| activity.isVisibleRequested()) {
			effects \|= TRANSACT_EFFECTS_LIFECYCLE;
	// Prevent the transition from being executed too early if the activity is		// Prevent the transition from being executed too early if the activity is
	// visible.		// visible.
	activity.finishIfPossible("finish-activity-op", false /* oomAdj */);		activity.finishIfPossible("finish-activity-op", false /* oomAdj */);
	@@ -1122,6 +1123,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
	launchOpts.remove(WindowContainerTransaction.HierarchyOp.LAUNCH_KEY_TASK_ID);		launchOpts.remove(WindowContainerTransaction.HierarchyOp.LAUNCH_KEY_TASK_ID);
	final SafeActivityOptions safeOptions =		final SafeActivityOptions safeOptions =
	SafeActivityOptions.fromBundle(launchOpts, caller.mPid, caller.mUid);		SafeActivityOptions.fromBundle(launchOpts, caller.mPid, caller.mUid);
			effects \|= TRANSACT_EFFECTS_LIFECYCLE;
	waitAsyncStart(() -> mService.mTaskSupervisor.startActivityFromRecents(		waitAsyncStart(() -> mService.mTaskSupervisor.startActivityFromRecents(
	caller.mPid, caller.mUid, taskId, safeOptions));		caller.mPid, caller.mUid, taskId, safeOptions));
	break;		break;