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

Commit 9f0f96a6 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I1be9ae1457ae5d4c4e3177aae746382a94e5b2b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53f5867f ff91f4ef

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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 */);