From 4c499be0edc24eb2e2b9705dba52a2059823e4aa Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Wed, 27 Aug 2014 15:31:31 +0200
Subject: Fix that Keyguard didn't always get onActivityDrawn call

Bug: 16481924
Change-Id: I299645c940c71820aa7dc70985e41da869f1368a
---
 services/core/java/com/android/server/am/ActivityStack.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index be0afbb85d75..d066940fd756 100755
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1492,6 +1492,9 @@ final class ActivityStack {
             ActivityOptions.abort(options);
             if (DEBUG_STATES) Slog.d(TAG, "resumeTopActivityLocked: Top activity resumed " + next);
             if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();
+
+            // Make sure to notify Keyguard as well if it is waiting for an activity to be drawn.
+            mStackSupervisor.notifyActivityDrawnForKeyguard();
             return false;
         }
 
-- 
cgit v1.2.3-59-g8ed1b