Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d2d25f1 authored by Yasin Kilicdere's avatar Yasin Kilicdere Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I0d11c194a7cc8ebc4e2a5d8d99c04ad5ca46ff01
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a52bac9 c30c72f3

services/core/java/com/android/server/am/UserController.java

+1 −1
Original line number Diff line number Diff line
@@ -1994,7 +1994,7 @@ class UserController implements Handler.Callback { 
    }



    private void dismissUserSwitchDialog(Runnable onDismissed) {

        mInjector.dismissUserSwitchingDialog(onDismissed);

        mUiHandler.post(() -> mInjector.dismissUserSwitchingDialog(onDismissed));

    }



    private void showUserSwitchDialog(Pair<UserInfo, UserInfo> fromToUserPair) {

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

+4 −0
Original line number Diff line number Diff line
@@ -1342,6 +1342,10 @@ public class UserControllerTest { 
            Message copy = new Message();

            copy.copyFrom(msg);

            mMessages.add(copy);

            if (msg.getCallback() != null) {

                msg.getCallback().run();

                msg.setCallback(null);

            }

            return super.sendMessageAtTime(msg, uptimeMillis);

        }

    }