Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Finishing the visible requested activity vs. destroying it" into tm-qpr-dev am: ff91f4ef55

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

Change-Id: I1be9ae1457ae5d4c4e3177aae746382a94e5b2b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Louis Chang
2022-12-17 09:21:04 +00:00
committed by Automerger Merge Worker
parent 53f5867fec ff91f4ef55
commit 9f0f96a6fd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/WindowOrganizerController.java
View File

@@ -1062,7 +1062,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
if (activity == null || activity.finishing) { if (activity == null || activity.finishing) {
break; break;
} }
if (activity.isVisible()) { if (activity.isVisible() || activity.isVisibleRequested()) {
// Prevent the transition from being executed too early if the activity is // Prevent the transition from being executed too early if the activity is
// visible. // visible.
activity.finishIfPossible("finish-activity-op", false /* oomAdj */); activity.finishIfPossible("finish-activity-op", false /* oomAdj */);