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

Commit 24fa4027 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Run TaskDisplayArea recovery during sleep tokens" into udc-qpr-dev am: f6905f1c 

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



Change-Id: I809e306c26c4035ea9b5f64b6aad401c3dd587cb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b4c85e1a f6905f1c

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

+1 −1
Original line number Diff line number Diff line
@@ -5345,7 +5345,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                // Finish should only ever commit visibility=false, so we can check full containment

                // rather than just direct membership.

                inFinishingTransition = mTransitionController.inFinishingTransition(this);

                if (!inFinishingTransition && !mDisplayContent.isSleeping()) {

                if (!inFinishingTransition && (visible || !mDisplayContent.isSleeping())) {

                    Slog.e(TAG, "setVisibility=" + visible

                            + " while transition is not collecting or finishing "

                            + this + " caller=" + Debug.getCallers(8));