Merge changes Ida331585,I255fb336 (7481586a) · Commits · e / os / android_frameworks_base

data/etc/services.core.protolog.json

+24 −0

Original line number	Diff line number	Diff line
		@@ -319,6 +319,12 @@
		"group": "WM_DEBUG_RECENTS_ANIMATIONS",
		"at": "com\/android\/server\/wm\/RecentsAnimationController.java"
		},
		"-1764792832": {
		"message": "Start collecting in Transition: %s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/TransitionController.java"
		},
		"-1750384749": {
		"message": "Launch on display check: allow launch on public display",
		"level": "DEBUG",
		@@ -2791,6 +2797,12 @@
		"group": "WM_DEBUG_APP_TRANSITIONS",
		"at": "com\/android\/server\/wm\/AppTransitionController.java"
		},
		"800698875": {
		"message": "SyncGroup %d: Started when there is other active SyncGroup",
		"level": "WARN",
		"group": "WM_DEBUG_SYNC_ENGINE",
		"at": "com\/android\/server\/wm\/BLASTSyncEngine.java"
		},
		"806891543": {
		"message": "Setting mOrientationChangeComplete=true because wtoken %s numInteresting=%d numDrawn=%d",
		"level": "INFO",
		@@ -3205,6 +3217,12 @@
		"group": "WM_ERROR",
		"at": "com\/android\/server\/wm\/WindowManagerService.java"
		},
		"1333520287": {
		"message": "Creating PendingTransition: %s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/TransitionController.java"
		},
		"1337596507": {
		"message": "Sending to proc %s new compat %s",
		"level": "VERBOSE",
		@@ -3823,6 +3841,12 @@
		"group": "WM_DEBUG_BOOT",
		"at": "com\/android\/server\/wm\/WindowManagerService.java"
		},
		"2034988903": {
		"message": "PendingStartTransaction found",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/WindowOrganizerController.java"
		},
		"2039056415": {
		"message": "Found matching affinity candidate!",
		"level": "DEBUG",

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

+57 −9

Original line number	Diff line number	Diff line
		@@ -64,6 +64,11 @@ class BLASTSyncEngine {
		void onTransactionReady(int mSyncId, SurfaceControl.Transaction transaction);
		}

		interface SyncEngineListener {
		/** Called when there is no more active sync set. */
		void onSyncEngineFree();
		}

		/**
		* Holds state associated with a single synchronous set of operations.
		*/
		@@ -137,6 +142,9 @@ class BLASTSyncEngine {
		Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
		mActiveSyncs.remove(mSyncId);
		mWm.mH.removeCallbacks(mOnTimeout);
		if (mSyncEngineListener != null && mActiveSyncs.size() == 0) {
		mSyncEngineListener.onSyncEngineFree();
		}
		}

		private void setReady(boolean ready) {
		@@ -175,22 +183,54 @@ class BLASTSyncEngine {
		private final WindowManagerService mWm;
		private int mNextSyncId = 0;
		private final SparseArray<SyncGroup> mActiveSyncs = new SparseArray<>();
		private SyncEngineListener mSyncEngineListener;

		BLASTSyncEngine(WindowManagerService wms) {
		mWm = wms;
		}

		/** Sets listener listening to whether the sync engine is free. */
		void setSyncEngineListener(SyncEngineListener listener) {
		mSyncEngineListener = listener;
		}

		/**
		* Prepares a {@link SyncGroup} that is not active yet. Caller must call {@link #startSyncSet}
		* before calling {@link #addToSyncSet(int, WindowContainer)} on any {@link WindowContainer}.
		*/
		SyncGroup prepareSyncSet(TransactionReadyListener listener, String name) {
		return new SyncGroup(listener, mNextSyncId++, name);
		}

		int startSyncSet(TransactionReadyListener listener) {
		return startSyncSet(listener, WindowState.BLAST_TIMEOUT_DURATION, "");
		}

		int startSyncSet(TransactionReadyListener listener, long timeoutMs, String name) {
		final int id = mNextSyncId++;
		final SyncGroup s = new SyncGroup(listener, id, name);
		mActiveSyncs.put(id, s);
		ProtoLog.v(WM_DEBUG_SYNC_ENGINE, "SyncGroup %d: Started for listener: %s", id, listener);
		final SyncGroup s = prepareSyncSet(listener, name);
		startSyncSet(s, timeoutMs);
		return s.mSyncId;
		}

		void startSyncSet(SyncGroup s) {
		startSyncSet(s, WindowState.BLAST_TIMEOUT_DURATION);
		}

		void startSyncSet(SyncGroup s, long timeoutMs) {
		if (mActiveSyncs.size() != 0) {
		// We currently only support one sync at a time, so start a new SyncGroup when there is
		// another may cause issue.
		ProtoLog.w(WM_DEBUG_SYNC_ENGINE,
		"SyncGroup %d: Started when there is other active SyncGroup", s.mSyncId);
		}
		mActiveSyncs.put(s.mSyncId, s);
		ProtoLog.v(WM_DEBUG_SYNC_ENGINE, "SyncGroup %d: Started for listener: %s",
		s.mSyncId, s.mListener);
		scheduleTimeout(s, timeoutMs);
		return id;
		}

		boolean hasActiveSync() {
		return mActiveSyncs.size() != 0;
		}

		@VisibleForTesting
		@@ -199,11 +239,11 @@ class BLASTSyncEngine {
		}

		void addToSyncSet(int id, WindowContainer wc) {
		mActiveSyncs.get(id).addToSync(wc);
		getSyncGroup(id).addToSync(wc);
		}

		void setReady(int id, boolean ready) {
		mActiveSyncs.get(id).setReady(ready);
		getSyncGroup(id).setReady(ready);
		}

		void setReady(int id) {
		@@ -211,14 +251,22 @@ class BLASTSyncEngine {
		}

		boolean isReady(int id) {
		return mActiveSyncs.get(id).mReady;
		return getSyncGroup(id).mReady;
		}

		/**
		* Aborts the sync (ie. it doesn't wait for ready or anything to finish)
		*/
		void abort(int id) {
		mActiveSyncs.get(id).finishNow();
		getSyncGroup(id).finishNow();
		}

		private SyncGroup getSyncGroup(int id) {
		final SyncGroup syncGroup = mActiveSyncs.get(id);
		if (syncGroup == null) {
		throw new IllegalStateException("SyncGroup is not started yet id=" + id);
		}
		return syncGroup;
		}

		void onSurfacePlacement() {

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

+22 −5

Original line number	Diff line number	Diff line
		@@ -101,6 +101,9 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
		/** The default package for resources */
		private static final String DEFAULT_PACKAGE = "android";

		/** The transition has been created but isn't collecting yet. */
		private static final int STATE_PENDING = -1;

		/** The transition has been created and is collecting, but hasn't formally started. */
		private static final int STATE_COLLECTING = 0;

		@@ -122,6 +125,7 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
		private static final int STATE_ABORT = 3;

		@IntDef(prefix = { "STATE_" }, value = {
		STATE_PENDING,
		STATE_COLLECTING,
		STATE_STARTED,
		STATE_PLAYING,
		@@ -131,7 +135,7 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
		@interface TransitionState {}

		final @TransitionType int mType;
		private int mSyncId;
		private int mSyncId = -1;
		private @TransitionFlags int mFlags;
		private final TransitionController mController;
		private final BLASTSyncEngine mSyncEngine;
		@@ -171,7 +175,7 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
		private IRemoteCallback mClientAnimationStartCallback = null;
		private IRemoteCallback mClientAnimationFinishCallback = null;

		private @TransitionState int mState = STATE_COLLECTING;
		private @TransitionState int mState = STATE_PENDING;
		private final ReadyTracker mReadyTracker = new ReadyTracker();

		// TODO(b/188595497): remove when not needed.
		@@ -179,13 +183,12 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
		private boolean mNavBarAttachedToApp = false;
		private int mRecentsDisplayId = INVALID_DISPLAY;

		Transition(@TransitionType int type, @TransitionFlags int flags, long timeoutMs,
		Transition(@TransitionType int type, @TransitionFlags int flags,
		TransitionController controller, BLASTSyncEngine syncEngine) {
		mType = type;
		mFlags = flags;
		mController = controller;
		mSyncEngine = syncEngine;
		mSyncId = mSyncEngine.startSyncSet(this, timeoutMs, TAG);
		}

		void addFlag(int flag) {
		@@ -216,13 +219,24 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
		return mFlags;
		}

		/** Starts collecting phase. Once this starts, all relevant surface operations are sync. */
		void startCollecting(long timeoutMs) {
		if (mState != STATE_PENDING) {
		throw new IllegalStateException("Attempting to re-use a transition");
		}
		mState = STATE_COLLECTING;
		mSyncId = mSyncEngine.startSyncSet(this, timeoutMs, TAG);
		}

		/**
		* Formally starts the transition. Participants can be collected before this is started,
		* but this won't consider itself ready until started -- even if all the participants have
		* drawn.
		*/
		void start() {
		if (mState >= STATE_STARTED) {
		if (mState < STATE_COLLECTING) {
		throw new IllegalStateException("Can't start Transition which isn't collecting.");
		} else if (mState >= STATE_STARTED) {
		Slog.w(TAG, "Transition already started: " + mSyncId);
		}
		mState = STATE_STARTED;
		@@ -235,6 +249,9 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
		* Adds wc to set of WindowContainers participating in this transition.
		*/
		void collect(@NonNull WindowContainer wc) {
		if (mState < STATE_COLLECTING) {
		throw new IllegalStateException("Transition hasn't started collecting.");
		}
		if (mSyncId < 0) return;
		ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Collecting in transition %d: %s",
		mSyncId, wc);

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

+45 −6

Original line number	Diff line number	Diff line
		@@ -128,16 +128,46 @@ class TransitionController {
		throw new IllegalStateException("Shell Transitions not enabled");
		}
		if (mCollectingTransition != null) {
		throw new IllegalStateException("Simultaneous transitions not supported yet.");
		throw new IllegalStateException("Simultaneous transition collection not supported"
		+ " yet. Use {@link #createPendingTransition} for explicit queueing.");
		}
		Transition transit = new Transition(type, flags, this, mAtm.mWindowManager.mSyncEngine);
		ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Creating Transition: %s", transit);
		moveToCollecting(transit);
		return transit;
		}

		/** Starts Collecting */
		private void moveToCollecting(@NonNull Transition transition) {
		if (mCollectingTransition != null) {
		throw new IllegalStateException("Simultaneous transition collection not supported.");
		}
		mCollectingTransition = transition;
		// Distinguish change type because the response time is usually expected to be not too long.
		final long timeoutMs = type == TRANSIT_CHANGE ? CHANGE_TIMEOUT_MS : DEFAULT_TIMEOUT_MS;
		mCollectingTransition = new Transition(type, flags, timeoutMs, this,
		mAtm.mWindowManager.mSyncEngine);
		ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Creating Transition: %s",
		final long timeoutMs =
		transition.mType == TRANSIT_CHANGE ? CHANGE_TIMEOUT_MS : DEFAULT_TIMEOUT_MS;
		mCollectingTransition.startCollecting(timeoutMs);
		ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Start collecting in Transition: %s",
		mCollectingTransition);
		dispatchLegacyAppTransitionPending();
		return mCollectingTransition;
		}

		/** Creates a transition representation but doesn't start collecting. */
		@NonNull
		PendingStartTransition createPendingTransition(@WindowManager.TransitionType int type) {
		if (mTransitionPlayer == null) {
		throw new IllegalStateException("Shell Transitions not enabled");
		}
		final PendingStartTransition out = new PendingStartTransition(new Transition(type,
		0 /* flags */, this, mAtm.mWindowManager.mSyncEngine));
		// We want to start collecting immediately when the engine is free, otherwise it may
		// be busy again.
		out.setStartSync(() -> {
		moveToCollecting(out.mTransition);
		});
		ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Creating PendingTransition: %s",
		out.mTransition);
		return out;
		}

		void registerTransitionPlayer(@Nullable ITransitionPlayer player,
		@@ -507,6 +537,15 @@ class TransitionController {
		proto.end(token);
		}

		/** Represents a startTransition call made while there is other active BLAST SyncGroup. */
		class PendingStartTransition extends WindowOrganizerController.PendingTransaction {
		final Transition mTransition;

		PendingStartTransition(Transition transition) {
		mTransition = transition;
		}
		}

		static class TransitionMetricsReporter extends ITransitionMetricsReporter.Stub {
		private final ArrayMap<IBinder, LongConsumer> mMetricConsumers = new ArrayMap<>();

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -85,8 +85,8 @@ import android.view.MagnificationSpec;
		import android.view.RemoteAnimationDefinition;
		import android.view.RemoteAnimationTarget;
		import android.view.SurfaceControl;
		import android.view.SurfaceControlViewHost;
		import android.view.SurfaceControl.Builder;
		import android.view.SurfaceControlViewHost;
		import android.view.SurfaceSession;
		import android.view.TaskTransitionSpec;
		import android.view.WindowManager;
		@@ -3331,7 +3331,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
		ProtoLog.v(WM_DEBUG_SYNC_ENGINE, "setSyncGroup #%d on %s", group.mSyncId, this);
		if (group != null) {
		if (mSyncGroup != null && mSyncGroup != group) {
		throw new IllegalStateException("Can't sync on 2 engines simultaneously");
		// This can still happen if WMCore starts a new transition when there is ongoing
		// sync transaction from Shell. Please file a bug if it happens.
		throw new IllegalStateException("Can't sync on 2 engines simultaneously"
		+ " currentSyncId=" + mSyncGroup.mSyncId + " newSyncId=" + group.mSyncId);
		}
		}
		mSyncGroup = group;