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

Commit febbdf17 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... 

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

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



Change-Id: I7ee6b98ae9a87c552114dee49144782a3bee0793
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89109077 9f0f96a6

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

+1 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                if (activity == null || activity.finishing) {

                    break;

                }

                if (activity.isVisible()) {

                if (activity.isVisible() || activity.isVisibleRequested()) {

                    // Prevent the transition from being executed too early if the activity is

                    // visible.

                    activity.finishIfPossible("finish-activity-op", false /* oomAdj */);