From a42938e803b149665f3745574c6c82622b70c0d2 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Tue, 22 Nov 2016 14:31:38 +0100
Subject: [PATCH] Execute app transition when start locking task

This issue always existed but now only became visible because
occluding/unoccluding Keyguard relies on activity transitions.

Test: Have pattern, lock task, unlock without 5 seconds, make sure
activity is not lingering around.
Bug: 32771855

Change-Id: Ib75bf904dd69db64bd64d13d518897ce9cf44394
---
 .../core/java/com/android/server/am/ActivityStackSupervisor.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 5d8d79fd52c2c..2d92f00ff0278 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -3779,6 +3779,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer
             findTaskToMoveToFrontLocked(task, 0, null, reason,
                     lockTaskModeState != LOCK_TASK_MODE_NONE);
             resumeFocusedStackTopActivityLocked();
+            mWindowManager.executeAppTransition();
         } else if (lockTaskModeState != LOCK_TASK_MODE_NONE) {
             handleNonResizableTaskIfNeeded(task, INVALID_STACK_ID, task.getStackId(),
                     true /* forceNonResizable */);