Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev am: 56b747fbac

am: 597ee67d61

Change-Id: I5e90c529a6d8f1dc353eb53be4b15e0a07bbd7f3

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

@@ -1585,7 +1585,6 @@ public class KeyguardViewMediator extends SystemUI {
             updateInputRestricted();
         }
 
-        mDismissCallbackRegistry.notifyDismissSucceeded();
         handleHide();
         Trace.endSection();
     }
@@ -1798,6 +1797,7 @@ public class KeyguardViewMediator extends SystemUI {
             resetKeyguardDonePendingLocked();
             mHideAnimationRun = false;
             adjustStatusBarLocked();
+            mDismissCallbackRegistry.notifyDismissSucceeded();
             sendUserPresentBroadcast();
         }
         Trace.endSection();