Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a55a6626 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Fix ordering of notifying dismiss callback" into oc-dev 

am: e85f8eb0

Change-Id: Ia851bbedb5fc429ea05eb0b1eaa5cbcddec7b961
parents d2eb85f5 e85f8eb0

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

+1 −1
Original line number Diff line number Diff line
@@ -1827,11 +1827,11 @@ public class KeyguardViewMediator extends SystemUI { 


            mWakeAndUnlocking = false;

            setShowingLocked(false);

            mDismissCallbackRegistry.notifyDismissSucceeded();

            mStatusBarKeyguardViewManager.hide(startTime, fadeoutDuration);

            resetKeyguardDonePendingLocked();

            mHideAnimationRun = false;

            adjustStatusBarLocked();

            mDismissCallbackRegistry.notifyDismissSucceeded();

            sendUserPresentBroadcast();

            mUpdateMonitor.setKeyguardGoingAway(false /* goingAway */);

        }

services/core/java/com/android/server/trust/TrustManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -795,6 +795,10 @@ public class TrustManagerService extends SystemService { 
            // coalesce refresh messages.

            mHandler.removeMessages(MSG_KEYGUARD_SHOWING_CHANGED);

            mHandler.sendEmptyMessage(MSG_KEYGUARD_SHOWING_CHANGED);



            // Make sure handler processes the message before returning, such that isDeviceLocked

            // after this call will retrieve the correct value.

            mHandler.runWithScissors(() -> {}, 0);

        }



        @Override