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

Commit e85f8eb0 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

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

parents a239ed1c 5277deaa

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

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




            mWakeAndUnlocking = false;

            mWakeAndUnlocking = false;

            setShowingLocked(false);

            setShowingLocked(false);

            mDismissCallbackRegistry.notifyDismissSucceeded();

            mStatusBarKeyguardViewManager.hide(startTime, fadeoutDuration);

            mStatusBarKeyguardViewManager.hide(startTime, fadeoutDuration);

            resetKeyguardDonePendingLocked();

            resetKeyguardDonePendingLocked();

            mHideAnimationRun = false;

            mHideAnimationRun = false;

            adjustStatusBarLocked();

            adjustStatusBarLocked();

            mDismissCallbackRegistry.notifyDismissSucceeded();

            sendUserPresentBroadcast();

            sendUserPresentBroadcast();

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

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

        }

        }

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

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

            // coalesce refresh messages.

            mHandler.removeMessages(MSG_KEYGUARD_SHOWING_CHANGED);

            mHandler.removeMessages(MSG_KEYGUARD_SHOWING_CHANGED);

            mHandler.sendEmptyMessage(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

        @Override