Merge "Finishing the visible requested activity vs. destroying it" into tm-qpr-dev (ff91f4ef) · Commits · e / os / android_frameworks_base

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 */);