Merge cherrypicks of ['googleplex-android-review.googlesource.com/32944241'] into 25Q2-release.

Change-Id: I6fdec5ceb471d794cb8525dfde12865839f62a56

2 files changed, 5 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java
index 40a9bbec3598..10c81531f02c 100644
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -203,6 +203,7 @@ class UserController implements Handler.Callback {
     static final int COMPLETE_USER_SWITCH_MSG = 130;
     static final int USER_COMPLETED_EVENT_MSG = 140;
     static final int SCHEDULED_STOP_BACKGROUND_USER_MSG = 150;
+    static final int USER_SWITCHING_DIALOG_ANIMATION_TIMEOUT_MSG = 160;
 
     private static final int NO_ARG2 = 0;
 
diff --git a/services/core/java/com/android/server/am/UserSwitchingDialog.java b/services/core/java/com/android/server/am/UserSwitchingDialog.java
index f4e733a0c99f..a1cc9dca092d 100644
--- a/services/core/java/com/android/server/am/UserSwitchingDialog.java
+++ b/services/core/java/com/android/server/am/UserSwitchingDialog.java
@@ -16,6 +16,8 @@
 
 package com.android.server.am;
 
+import static com.android.server.am.UserController.USER_SWITCHING_DIALOG_ANIMATION_TIMEOUT_MSG;
+
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.UserIdInt;
@@ -302,14 +304,14 @@ class UserSwitchingDialog extends Dialog {
         final AtomicBoolean isFirst = new AtomicBoolean(true);
         final Runnable onAnimationEndOrTimeout = () -> {
             if (isFirst.getAndSet(false)) {
-                mHandler.removeCallbacksAndMessages(null);
+                mHandler.removeMessages(USER_SWITCHING_DIALOG_ANIMATION_TIMEOUT_MSG);
                 onAnimationEnd.run();
             }
         };
         mHandler.postDelayed(() -> {
             Slog.w(TAG, name + " animation not completed in " + ANIMATION_TIMEOUT_MS + " ms");
             onAnimationEndOrTimeout.run();
-        }, ANIMATION_TIMEOUT_MS);
+        }, USER_SWITCHING_DIALOG_ANIMATION_TIMEOUT_MSG, ANIMATION_TIMEOUT_MS);
 
         return onAnimationEndOrTimeout;
     }