Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eff26a9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not set window crop of task until display is enabled" into main am:... 

Merge "Do not set window crop of task until display is enabled" into main am: 93b8756b am: 64edb614

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3182559



Change-Id: I7ef181e441dded507e16b2b727eeacae0c803067
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f0c2bbb 64edb614

services/core/java/com/android/server/wm/Task.java

+1 −1
Original line number Diff line number Diff line
@@ -2287,7 +2287,7 @@ class Task extends TaskFragment { 
        // 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();