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

Commit a4391c26 authored by Yasin Kilicdere's avatar Yasin Kilicdere Committed by Android (Google) Code Review
Browse files

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

parents 749bc757 19f13fe3

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

+1 −1
Original line number Diff line number Diff line
@@ -1972,7 +1972,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);

        }

    }