diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 12 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java | 9 |
2 files changed, 18 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index f568b6624f22..8f3702ac1a5e 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -6619,9 +6619,15 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A @Override void onCancelFixedRotationTransform(int originalDisplayRotation) { - if (this != mDisplayContent.getLastOrientationSource() - || getRequestedConfigurationOrientation() != ORIENTATION_UNDEFINED) { - // Only need to handle the activity that should be rotated with display. + if (this != mDisplayContent.getLastOrientationSource()) { + // This activity doesn't affect display rotation. + return; + } + final int requestedOrientation = getRequestedConfigurationOrientation(); + if (requestedOrientation != ORIENTATION_UNDEFINED + && requestedOrientation != mDisplayContent.getConfiguration().orientation) { + // Only need to handle the activity that can be rotated with display or the activity + // has requested the same orientation. return; } diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java index fdeb7a6eb71a..4bbea94060c4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java @@ -1723,6 +1723,15 @@ public class ActivityRecordTests extends WindowTestsBase { assertFalse(display.hasTopFixedRotationLaunchingApp()); assertFalse(activity.hasFixedRotationTransform()); + + // Simulate that the activity requests the same orientation as display. + activity.setOrientation(display.getConfiguration().orientation); + // Skip the real freezing. + activity.mVisibleRequested = false; + clearInvocations(activity); + activity.onCancelFixedRotationTransform(originalRotation); + // The implementation of cancellation must be executed. + verify(activity).startFreezingScreen(originalRotation); } @Test |