Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dismiss UserSwitchingDialog on UiHandler thread." into udc-qpr-dev am: a4391c26a2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23816983

Change-Id: Ib5c7311b58e15362dc4dba377690cf8dae1b8097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yasin Kilicdere
2023-06-30 10:03:07 +00:00
committed by Automerger Merge Worker
parent 500fcd28ab a4391c26a2
commit c30c72f372
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/UserController.java
View File

@@ -1972,7 +1972,7 @@ class UserController implements Handler.Callback {
} }
private void dismissUserSwitchDialog(Runnable onDismissed) { private void dismissUserSwitchDialog(Runnable onDismissed) {
mInjector.dismissUserSwitchingDialog(onDismissed); mUiHandler.post(() -> mInjector.dismissUserSwitchingDialog(onDismissed));
} }
private void showUserSwitchDialog(Pair<UserInfo, UserInfo> fromToUserPair) { private void showUserSwitchDialog(Pair<UserInfo, UserInfo> fromToUserPair) {

4
services/tests/servicestests/src/com/android/server/am/UserControllerTest.java
View File

@@ -1342,6 +1342,10 @@ public class UserControllerTest {
Message copy = new Message(); Message copy = new Message();
copy.copyFrom(msg); copy.copyFrom(msg);
mMessages.add(copy); mMessages.add(copy);
if (msg.getCallback() != null) {
msg.getCallback().run();
msg.setCallback(null);
}
return super.sendMessageAtTime(msg, uptimeMillis); return super.sendMessageAtTime(msg, uptimeMillis);
} }
} }