diff options
| author | 2025-03-14 03:27:47 -0700 | |
|---|---|---|
| committer | 2025-03-14 03:27:47 -0700 | |
| commit | 61d489325be76f9d05f7732e06bbd34e571b0ce8 (patch) | |
| tree | a9aacd9714edae6e9a0ffef89a8cf335b3ad70e8 /libs | |
| parent | c630ba8319367937637ae5b964782b20aeb1cf2c (diff) | |
| parent | ffad14c9638381fb8611c0657bdfd7882acda5cf (diff) | |
Merge "Fix BackAnimationController race condition" into main
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java index 7f8cfaeb9c03..5e36a102a438 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java @@ -332,7 +332,11 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont @Override public void onThresholdCrossed() { - BackAnimationController.this.onThresholdCrossed(); + if (predictiveBackDelayWmTransition()) { + mShellExecutor.execute(BackAnimationController.this::onThresholdCrossed); + } else { + BackAnimationController.this.onThresholdCrossed(); + } } @Override |