Merge "Adding extra protolog group to trace bubbles flow" into main (4285394b) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -277,7 +277,7 @@ public class BubbleExpandedView extends LinearLayout {
		// wrong with the intent, we can't really recover / try to populate
		// the bubble again so we'll just remove it.
		Log.w(TAG, "Exception while displaying bubble: " + getBubbleKey()
		+ ", " + e.getMessage() + "; removing bubble");
		+ "; removing bubble", e);
		mManager.removeBubble(getBubbleKey(), Bubbles.DISMISS_INVALID_INTENT);
		}
		});

+1 −1

Original line number	Diff line number	Diff line
		@@ -171,7 +171,7 @@ public class BubbleTaskViewListener implements TaskView.Listener {
		// wrong with the intent, we can't really recover / try to populate
		// the bubble again so we'll just remove it.
		Log.w(TAG, "Exception while displaying bubble: " + getBubbleKey()
		+ ", " + e.getMessage() + "; removing bubble");
		+ "; removing bubble", e);
		mExpandedViewManager.removeBubble(
		getBubbleKey(), Bubbles.DISMISS_INVALID_INTENT);
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,8 @@ public enum ShellProtoLogGroup implements IProtoLogGroup {
		Consts.TAG_WM_SHELL),
		WM_SHELL_FOLDABLE(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
		Consts.TAG_WM_SHELL),
		WM_SHELL_BUBBLES_NOISY(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
		"Bubbles"),
		WM_SHELL_BUBBLES(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
		"Bubbles"),
		WM_SHELL_COMPAT_UI(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

+1 −2

Original line number	Diff line number	Diff line
		@@ -388,8 +388,7 @@ class SplitScreenTransitions {
		mPendingEnter = new EnterSession(
		transition, remoteTransition, extraTransitType, resizeAnim, snapPosition);

		ProtoLog.v(WM_SHELL_TRANSITIONS, " splitTransition "
		+ " deduced Enter split screen");
		ProtoLog.v(WM_SHELL_TRANSITIONS, " splitTransition deduced Enter split screen");
		ProtoLog.d(WM_SHELL_SPLIT_SCREEN, "setEnterTransition: transitType=%d resize=%b",
		extraTransitType, resizeAnim);
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -16,10 +16,14 @@

		package com.android.wm.shell.taskview;

		import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES_NOISY;

		import android.annotation.Nullable;
		import android.graphics.Rect;
		import android.window.WindowContainerToken;

		import com.android.internal.protolog.ProtoLog;

		import java.lang.ref.WeakReference;
		import java.util.ArrayList;

		@@ -71,12 +75,14 @@ public class TaskViewRepository {

		/** Start tracking {@param tv}. */
		public void add(TaskViewTaskController tv) {
		ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "Repo.add(): taskView=%d", tv.hashCode());
		if (contains(tv)) return;
		mTaskViews.add(new TaskViewState(tv));
		}

		/** Remove {@param tv} from tracking. */
		public void remove(TaskViewTaskController tv) {
		ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "Repo.remove(): taskView=%d", tv.hashCode());
		int idx = findAndPrune(tv);
		if (idx < 0) return;
		mTaskViews.remove(idx);