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

am: 56b747fbac Change-Id: I2aed0df46a1c1c13f6c1f5acb1a415c261643953
2017-05-10 13:46:37 +00:00
parent e0262f787d 56b747fbac
commit 4f621cc386
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/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();