Merge "Don't send transitions to Shell until finished booting" (e69aa70e) · Commits · e / os / android_frameworks_base

data/etc/services.core.protolog.json

+18 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,12 @@
		"group": "WM_DEBUG_APP_TRANSITIONS",
		"at": "com\/android\/server\/wm\/WindowToken.java"
		},
		"-2088209279": {
		"message": "Notified TransitionController that the display is ready.",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/WindowManagerService.java"
		},
		"-2072089308": {
		"message": "Attempted to add window with token that is a sub-window: %s. Aborting.",
		"level": "WARN",
		@@ -2767,6 +2773,12 @@
		"group": "WM_DEBUG_STATES",
		"at": "com\/android\/server\/wm\/TaskFragment.java"
		},
		"378890013": {
		"message": "Apply and finish immediately because player is disabled for transition #%d .",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/Transition.java"
		},
		"385237117": {
		"message": "moveFocusableActivityToTop: already on top and focused, activity=%s",
		"level": "DEBUG",
		@@ -3649,6 +3661,12 @@
		"group": "WM_DEBUG_STATES",
		"at": "com\/android\/server\/wm\/ActivityRecord.java"
		},
		"1282992082": {
		"message": "Disabling player for transition #%d because display isn't enabled yet",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/TransitionController.java"
		},
		"1284122013": {
		"message": "TaskFragment appeared name=%s",
		"level": "VERBOSE",

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

+24 −5

Original line number	Diff line number	Diff line
		@@ -216,6 +216,12 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {

		final TransitionController.Logger mLogger = new TransitionController.Logger();

		/**
		* {@code false} if this transition runs purely in WMCore (meaning Shell is completely unaware
		* of it). Currently, this happens before the display is ready since nothing can be seen yet.
		*/
		boolean mIsPlayerEnabled = true;

		Transition(@TransitionType int type, @TransitionFlags int flags,
		TransitionController controller, BLASTSyncEngine syncEngine) {
		mType = type;
		@@ -777,7 +783,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		* be called directly; use {@link TransitionController#finishTransition} instead.
		*/
		void finishTransition() {
		if (Trace.isTagEnabled(TRACE_TAG_WINDOW_MANAGER)) {
		if (Trace.isTagEnabled(TRACE_TAG_WINDOW_MANAGER) && mIsPlayerEnabled) {
		Trace.asyncTraceEnd(TRACE_TAG_WINDOW_MANAGER, TRACE_NAME_PLAY_TRANSITION,
		System.identityHashCode(this));
		}
		@@ -1112,7 +1118,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		controller.setupStartTransaction(transaction);
		}
		buildFinishTransaction(mFinishTransaction, info.getRootLeash());
		if (mController.getTransitionPlayer() != null) {
		if (mController.getTransitionPlayer() != null && mIsPlayerEnabled) {
		mController.dispatchLegacyAppTransitionStarting(info, mStatusBarTransitionDelay);
		try {
		ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS,
		@@ -1128,11 +1134,16 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		} catch (RemoteException e) {
		// If there's an exception when trying to send the mergedTransaction to the
		// client, we should finish and apply it here so the transactions aren't lost.
		cleanUpOnFailure();
		postCleanupOnFailure();
		}
		} else {
		// No player registered, so just finish/apply immediately
		cleanUpOnFailure();
		// No player registered or it's not enabled, so just finish/apply immediately
		if (!mIsPlayerEnabled) {
		mLogger.mSendTimeNs = SystemClock.uptimeNanos();
		ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Apply and finish immediately"
		+ " because player is disabled for transition #%d .", mSyncId);
		}
		postCleanupOnFailure();
		}
		mController.mLoggerHandler.post(mLogger::logOnSend);
		mOverrideOptions = null;
		@@ -1143,6 +1154,14 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		info.releaseAnimSurfaces();
		}

		private void postCleanupOnFailure() {
		mController.mAtm.mH.post(() -> {
		synchronized (mController.mAtm.mGlobalLock) {
		cleanUpOnFailure();
		}
		});
		}

		/**
		* If the remote failed for any reason, use this to do any appropriate clean-up. Do not call
		* this directly, it's designed to by called by {@link TransitionController} only.

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,13 @@ class TransitionController {

		final Handler mLoggerHandler = FgThread.getHandler();

		/**
		* {@code true} While this waits for the display to become enabled (during boot). While waiting
		* for the display, all core-initiated transitions will be "local".
		* Note: This defaults to false so that it doesn't interfere with unit tests.
		*/
		boolean mIsWaitingForDisplayEnabled = false;

		TransitionController(ActivityTaskManagerService atm,
		TaskSnapshotController taskSnapshotController,
		TransitionTracer transitionTracer) {
		@@ -486,6 +493,15 @@ class TransitionController {
		Transition requestStartTransition(@NonNull Transition transition, @Nullable Task startTask,
		@Nullable RemoteTransition remoteTransition,
		@Nullable TransitionRequestInfo.DisplayChange displayChange) {
		if (mIsWaitingForDisplayEnabled) {
		ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Disabling player for transition"
		+ " #%d because display isn't enabled yet", transition.getSyncId());
		transition.mIsPlayerEnabled = false;
		transition.mLogger.mRequestTimeNs = SystemClock.uptimeNanos();
		mAtm.mH.post(() -> mAtm.mWindowOrganizerController.startTransition(
		transition.getToken(), null));
		return transition;
		}
		try {
		ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS,
		"Requesting StartTransition: %s", transition);

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -310,6 +310,7 @@ import com.android.internal.policy.IKeyguardDismissCallback;
		import com.android.internal.policy.IKeyguardLockedStateListener;
		import com.android.internal.policy.IShortcutService;
		import com.android.internal.policy.KeyInterceptionInfo;
		import com.android.internal.protolog.ProtoLogGroup;
		import com.android.internal.protolog.ProtoLogImpl;
		import com.android.internal.protolog.common.ProtoLog;
		import com.android.internal.util.DumpUtils;
		@@ -3776,6 +3777,12 @@ public class WindowManagerService extends IWindowManager.Stub

		// Make sure the last requested orientation has been applied.
		updateRotationUnchecked(false, false);

		synchronized (mGlobalLock) {
		mAtmService.getTransitionController().mIsWaitingForDisplayEnabled = false;
		ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Notified TransitionController "
		+ "that the display is ready.");
		}
		}

		private boolean checkBootAnimationCompleteLocked() {

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -168,6 +168,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
		void setWindowManager(WindowManagerService wms) {
		mTransitionController = new TransitionController(mService, wms.mTaskSnapshotController,
		wms.mTransitionTracer);
		mTransitionController.mIsWaitingForDisplayEnabled = !wms.mDisplayEnabled;
		mTransitionController.registerLegacyListener(wms.mActivityManagerAppTransitionNotifier);
		}