From b7282d2e023cd1c599b701f637b24aec7e65576d Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Tue, 10 Nov 2020 01:52:54 +0000 Subject: [PATCH] Revert "Don't no-op on resuming top activity if display is in freeform." This reverts commit 13a4b762034de659af5e70ec42d39c7b4820e918. Reason for revert: Going with ag/12741236 for the better approach Change-Id: Ib8e30277d58a495327767a00bf01f666249c6348 --- services/core/java/com/android/server/wm/Task.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 79c0ada8700b2..a236699209a0b 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -5870,11 +5870,7 @@ class Task extends WindowContainer { final TaskDisplayArea taskDisplayArea = getDisplayArea(); // If the top activity is the resumed one, nothing to do. - // For devices that are not in fullscreen mode (e.g. freeform windows), it's possible - // we still want to proceed if the visibility of other windows have changed (e.g. bringing - // a fullscreen window forward to cover another freeform activity.) if (mResumedActivity == next && next.isState(RESUMED) - && taskDisplayArea.getWindowingMode() != WINDOWING_MODE_FREEFORM && taskDisplayArea.allResumedActivitiesComplete()) { // Make sure we have executed any pending transitions, since there // should be nothing left to do at this point.