Merge "Cancel unocclude animation on main thread" into tm-qpr-dev

2022-10-07 06:36:45 +00:00
parent 3750d8945c 7b04a06e42
commit ac8ef32b22
1 changed files with 5 additions and 3 deletions
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -983,9 +983,11 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,

                @Override
                public void onAnimationCancelled(boolean isKeyguardOccluded) {
-                    if (mUnoccludeAnimator != null) {
-                        mUnoccludeAnimator.cancel();
-                    }
+                    mContext.getMainExecutor().execute(() -> {
+                        if (mUnoccludeAnimator != null) {
+                            mUnoccludeAnimator.cancel();
+                        }
+                    });

                    setOccluded(isKeyguardOccluded /* isOccluded */, false /* animate */);
                    Log.d(TAG, "Unocclude animation cancelled. Occluded state is now: "