Merge "Fixes rotation stuck in core without trigger transition."
This commit is contained in:
committed by
Android (Google) Code Review
commit
16138208b4
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user