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

This commit is contained in:
TreeHugger Robot
2017-05-10 13:13:22 +00:00
committed by Android (Google) Code Review

View File

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