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

am: 56b747fbac

Change-Id: I9ab62dbe811757f8638e31296c61f09da0fd82a6
This commit is contained in:
Jorim Jaggi
2017-05-10 13:23:40 +00:00
committed by android-build-merger

View File

@@ -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();