Merge "Enable some task-org logs to understand when bubble listeners are updated" into main (445981d2) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import static android.view.Display.DEFAULT_DISPLAY;
		import static com.android.wm.shell.compatui.impl.CompatUIEventsKt.SIZE_COMPAT_RESTART_BUTTON_APPEARED;
		import static com.android.wm.shell.compatui.impl.CompatUIEventsKt.SIZE_COMPAT_RESTART_BUTTON_CLICKED;
		import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_TASK_ORG;
		import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_TASK_ORG_NOISY;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		@@ -332,7 +333,7 @@ public class ShellTaskOrganizer extends TaskOrganizer {
		final List<TaskAppearedInfo> taskInfos = super.registerOrganizer();
		for (int i = 0; i < taskInfos.size(); i++) {
		final TaskAppearedInfo info = taskInfos.get(i);
		ProtoLog.v(WM_SHELL_TASK_ORG, "Existing task: id=%d component=%s",
		ProtoLog.v(WM_SHELL_TASK_ORG_NOISY, "Existing task: id=%d component=%s",
		info.getTaskInfo().taskId, info.getTaskInfo().baseIntent);
		onTaskAppeared(info);
		}
		@@ -351,7 +352,7 @@ public class ShellTaskOrganizer extends TaskOrganizer {
		@Override
		public void applyTransaction(@NonNull WindowContainerTransaction t) {
		if (!t.isEmpty()) {
		ProtoLog.v(WM_SHELL_TASK_ORG, "applyTransaction(): wct=%s caller=%s",
		ProtoLog.v(WM_SHELL_TASK_ORG_NOISY, "applyTransaction(): wct=%s caller=%s",
		t, Debug.getCallers(4));
		}
		super.applyTransaction(t);
		@@ -361,7 +362,7 @@ public class ShellTaskOrganizer extends TaskOrganizer {
		public int applySyncTransaction(@NonNull WindowContainerTransaction t,
		@NonNull WindowContainerTransactionCallback callback) {
		if (!t.isEmpty()) {
		ProtoLog.v(WM_SHELL_TASK_ORG, "applySyncTransaction(): wct=%s caller=%s",
		ProtoLog.v(WM_SHELL_TASK_ORG_NOISY, "applySyncTransaction(): wct=%s caller=%s",
		t, Debug.getCallers(4));
		}
		return super.applySyncTransaction(t, callback);
		@@ -755,7 +756,7 @@ public class ShellTaskOrganizer extends TaskOrganizer {
		@Override
		public void onTaskInfoChanged(RunningTaskInfo taskInfo) {
		synchronized (mLock) {
		ProtoLog.v(WM_SHELL_TASK_ORG, "Task info changed taskId=%d", taskInfo.taskId);
		ProtoLog.v(WM_SHELL_TASK_ORG_NOISY, "Task info changed taskId=%d", taskInfo.taskId);

		if (mUnfoldAnimationController != null) {
		mUnfoldAnimationController.onTaskInfoChanged(taskInfo);

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -493,6 +493,7 @@ public class BubbleController implements ConfigurationChangeListener,
		bubble.setPendingIntentCanceled();
		return;
		}
		ProtoLog.d(WM_SHELL_BUBBLES, "Removing bubble due to pending intent cancellation");
		mMainExecutor.execute(() -> removeBubble(bubble.getKey(), DISMISS_INVALID_INTENT));
		});

libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,9 @@ public enum ShellProtoLogGroup implements IProtoLogGroup {
		Consts.TAG_WM_SHELL),
		WM_SHELL_INIT(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,
		Consts.TAG_WM_SHELL),
		WM_SHELL_TASK_ORG(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
		WM_SHELL_TASK_ORG(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,
		"ShellTaskOrganizer"),
		WM_SHELL_TASK_ORG_NOISY(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
		"ShellTaskOrganizer"),
		WM_SHELL_TRANSITIONS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,
		Consts.TAG_WM_SHELL),

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedTransition.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -643,6 +643,8 @@ class DefaultMixedTransition extends DefaultMixedHandler.MixedTransition {
		final Transitions.TransitionHandler handler =
		mBubbleTransitions.getRunningEnterTransition(transition);
		if (handler != null) {
		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS,
		"Bubble transition consumed: aborted=%b", aborted);
		handler.onTransitionConsumed(transition, aborted, finishT);
		}
		break;

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -800,8 +800,7 @@ public class Transitions implements RemoteCallable<Transitions>,
		if (info.getRootCount() == 0 && !KeyguardTransitionHandler.handles(info)) {
		// No root-leashes implies that the transition is empty/no-op, so just do
		// housekeeping and return.
		ProtoLog.v(WM_SHELL_TRANSITIONS, "No transition roots in %s so"
		+ " abort", active);
		ProtoLog.v(WM_SHELL_TRANSITIONS, "No transition roots in %s so abort", active);
		onAbort(active);
		return true;
		}