summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/wm/Task.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 931c2580fa3f..b7c29bf071d8 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -5170,6 +5170,12 @@ class Task extends TaskFragment {
// task.
r.setVisibility(true);
ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);
+ // If launching behind, the app will start regardless of what's above it, so mark it
+ // as unknown even before prior `pause`. This also prevents a race between set-ready
+ // and activityPause. Launch-behind is basically only used for dream now.
+ if (!r.isVisibleRequested()) {
+ r.notifyUnknownVisibilityLaunchedForKeyguardTransition();
+ }
// Go ahead to execute app transition for this activity since the app transition
// will not be triggered through the resume channel.
mDisplayContent.executeAppTransition();