Merge "Call onDismissed on dismiss even mUserSwitchingDialog is null." into udc-dev

2023-05-18 12:30:55 +00:00
parent 862d7365c9 3b40f836e5
commit 3cb2720640
1 changed files with 2 additions and 0 deletions
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -3567,6 +3567,8 @@ class UserController implements Handler.Callback {
                if (mUserSwitchingDialog != null) {
                    mUserSwitchingDialog.dismiss(onDismissed);
                    mUserSwitchingDialog = null;
+                } else if (onDismissed != null) {
+                    onDismissed.run();
                }
            }
        }