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

2017-05-10 13:13:22 +00:00
parent f37b271894 4726ae362b
commit 56b747fbac
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();