| commit | 64edb6146866c7241f7052fdeeefeae3425ab5ce | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Jul 26 10:40:00 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 26 10:40:00 2024 +0000 |
| tree | 5b3afbb9456a39e510140db749faba9720505b60 | |
| parent | 2a81c10aff2602636b90806ecc1acbd3d9db4b1c [diff] | |
| parent | 93b8756b96f00078c058757b6ffc25876dbc874f [diff] |
Merge "Do not set window crop of task until display is enabled" into main am: 93b8756b96 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3182559 Change-Id: I01c4785c18f1c2663c0ae065b894140f4ec3d03f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 787c5d6..ecf4f73 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java
@@ -2290,7 +2290,7 @@ // Apply crop to root tasks only and clear the crops of the descendant tasks. int width = 0; int height = 0; - if (isRootTask()) { + if (isRootTask() && !mTransitionController.mIsWaitingForDisplayEnabled) { final Rect taskBounds = getBounds(); width = taskBounds.width(); height = taskBounds.height();