Merge "Fixes rotation stuck in core without trigger transition."

This commit is contained in:
Wei Sheng Shih
2021-12-03 06:20:16 +00:00
committed by Android (Google) Code Review

View File

@@ -508,10 +508,10 @@ public class DisplayRotation {
mDisplayContent.setLayoutNeeded();
if (useShellTransitions) {
final boolean wasInTransition = mDisplayContent.inTransition();
final boolean wasCollecting = mDisplayContent.mTransitionController.isCollecting();
mDisplayContent.requestChangeTransitionIfNeeded(
ActivityInfo.CONFIG_WINDOW_CONFIGURATION);
if (wasInTransition) {
if (wasCollecting) {
// Use remote-rotation infra since the transition has already been requested
// TODO(shell-transitions): Remove this once lifecycle management can cover all
// rotation cases.