dfe1fc5554c21ec9d489c038dd1eae625dbc9213 - platform_frameworks_base

commit	dfe1fc5554c21ec9d489c038dd1eae625dbc9213	[log] [tgz]
author	Evan Rosky <erosky@google.com>	Thu Jun 10 15:02:21 2021 -0700
committer	Chris Li <lihongyu@google.com>	Mon Jul 05 20:32:07 2021 -0700
tree	e0a2bc8c10fb7b20cddb492806a9893054e01892
parent	feb8b66d2ade46ef625d5c5f04d9d40639199bfe [diff]

Hook up shell transit to metrics and interleave abort with merge

Hooks up shell transitions to the activitymetricslogger and proto
state for app-transitions.

Also fixes interleaving of transition abort and merge.

Bug: 183993924
Test: atest ActivityMetricsLoggerTests
Change-Id: I0ecee0cc23093d00a83e0c8b0ce2c0b9a8ce7aff

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java[diff]
services/core/java/com/android/server/wm/ActivityRecord.java[diff]
services/core/java/com/android/server/wm/BLASTSyncEngine.java[diff]
services/core/java/com/android/server/wm/DisplayContent.java[diff]
services/core/java/com/android/server/wm/Transition.java[diff]
services/core/java/com/android/server/wm/TransitionController.java[diff]
services/core/java/com/android/server/wm/WindowContainer.java[diff]
services/core/java/com/android/server/wm/WindowState.java[diff]

8 files changed