| commit | b93d7f48d8f4de2738bb31e5628ed048ccf9f93c | [log] [tgz] |
|---|---|---|
| author | Ming-Shin Lu <lumark@google.com> | Mon May 30 12:39:42 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 30 12:39:42 2022 +0000 |
| tree | f0028d2a8725009fd627d20d37970b1b370bdf6a | |
| parent | cc009d01fca22ba774a9330e7f1b248b1844062b [diff] | |
| parent | c2a6a2efeb0ea1cfb8c6dc9e3fa8b2b82fb5bb53 [diff] |
Merge "Fix snapshot starting window isn't apply fixed-rotation with IME visible" into tm-dev am: c2a6a2efeb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659525 Change-Id: Ief88e870bcd57f7200a9f7e3bd89fbaab7137c82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/wm/StartingSurfaceController.java b/services/core/java/com/android/server/wm/StartingSurfaceController.java index ccd018f..e8445ab 100644 --- a/services/core/java/com/android/server/wm/StartingSurfaceController.java +++ b/services/core/java/com/android/server/wm/StartingSurfaceController.java
@@ -159,9 +159,7 @@ return null; } if (topFullscreenActivity.getWindowConfiguration().getRotation() - != taskSnapshot.getRotation() - // Use normal rotation to avoid flickering of IME window in old orientation. - && !taskSnapshot.hasImeSurface()) { + != taskSnapshot.getRotation()) { // The snapshot should have been checked by ActivityRecord#isSnapshotCompatible // that the activity will be updated to the same rotation as the snapshot. Since // the transition is not started yet, fixed rotation transform needs to be applied