diff options
| author | 2023-09-28 15:15:49 +0000 | |
|---|---|---|
| committer | 2023-09-28 15:15:49 +0000 | |
| commit | 24fa4027b521f0692f70c5d0c09d4cc830982c6a (patch) | |
| tree | 5a3ee46bd9c3e8df33cf1197939818130751178a | |
| parent | b4c85e1a929b2d01f48624ad047d82945c2939ce (diff) | |
| parent | f6905f1cf9ca4f0d8b481a27daf1969cc56f29b5 (diff) | |
Merge "Run TaskDisplayArea recovery during sleep tokens" into udc-qpr-dev am: f6905f1cf9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24866332
Change-Id: I809e306c26c4035ea9b5f64b6aad401c3dd587cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 1531b995086d..cd0a4efad77e 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -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)); |