commit 7a52a58ffb1097348ba8da078f1cd223bacb2e49
author Jorim Jaggi <jjaggi@google.com> Thu May 18 22:47:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 18 22:47:12 2017 +0000
tree 7bfe7ec6b7e67ccb5a074f3b6120387b9e8ed5a5
parent f4876d18e7dcad12f70cd7866c56c3f226ba1172
parent a55a6626004cd22eb80aee99f8423d9980f547e0

Merge "Fix ordering of notifying dismiss callback" into oc-dev am: e85f8eb0ca
am: a55a662600

Change-Id: Ic24eaca241ddc2c84395a1d2bdaf6dd554b0e55b

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

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 2d7521d..b977dd4 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -1827,11 +1827,11 @@
 
             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

diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java
index 5bd485c..6801230 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -830,6 +830,10 @@
             // 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