From f4344ef78e5bbb52f25ad57898854d4f55347c7c Mon Sep 17 00:00:00 2001
From: Matthew Ng <ngmatthew@google.com>
Date: Thu, 20 Apr 2017 15:19:58 -0700
Subject: [PATCH] Dismiss docked stack when ShowWhenLocked activity is over
 keyguard (1/2)

Activities with ShowWhenLocked flag when docked should dismiss the
docked stack and appear after screen turns back on. This incorporates
missing code from ag/1013634 that was missed during refactoring.

Fixes: 36166079
Test: run-test CtsServicesHostTestCases
android.server.cts.KeyguardTests#testShowWhenLockedActivityWhileSplit
Change-Id: I003cdd0be46fe6b9640e2bfbfca582150f2723b7
---
 services/core/java/com/android/server/am/KeyguardController.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/am/KeyguardController.java b/services/core/java/com/android/server/am/KeyguardController.java
index 2bd119ec177da..4d3a66dfeeb45 100644
--- a/services/core/java/com/android/server/am/KeyguardController.java
+++ b/services/core/java/com/android/server/am/KeyguardController.java
@@ -95,6 +95,7 @@ class KeyguardController {
             return;
         }
         mKeyguardShowing = showing;
+        dismissDockedStackIfNeeded();
         if (showing) {
             mKeyguardGoingAway = false;
             mDismissalRequested = false;