commit a8ecf45398987f783222dbdcc11bf67897914d2c
author Jim Miller <jaggies@google.com> Fri Sep 05 15:57:15 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 05 15:57:16 2014 +0000
tree 239dd64d72912e90f793515a4f02e2653fe95a73
parent 19b210c98c728dd27ad47ec114b85063b96002c4
parent 705004bebf919b2d851fa86a31f17fc21b0dca34

Merge "Send USER_PRESENT broadcast after keyguard animation finishes" into lmp-dev

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index f8d0d9e..8d35eb0 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -1142,7 +1142,6 @@
         }
 
         handleHide();
-        sendUserPresentBroadcast();
     }
 
     private void sendUserPresentBroadcast() {
@@ -1313,6 +1312,7 @@
             mHideAnimationRun = false;
             updateActivityLockScreenState();
             adjustStatusBarLocked();
+            sendUserPresentBroadcast();
         }
     }