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

Commit 897a2a24 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Android (Google) Code Review
Browse files

Revert "Make sure userSwitchComplete is dispatched after screen is unfrozen." 

This reverts commit 7fb0d1dc.

Reason for revert: broken test com.android.server.am.UserControllerTest#testContinueUserSwitchUIDisabled

Change-Id: I13a3858029c11fbbf8289e602f9eacceaf5ae575
parent 7fb0d1dc

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

+11 −9
Original line number Diff line number Diff line
@@ -2116,6 +2116,8 @@ class UserController implements Handler.Callback { 
        mHandler.sendMessage(mHandler.obtainMessage(COMPLETE_USER_SWITCH_MSG, newUserId, 0));



        uss.switching = false;

        mHandler.removeMessages(REPORT_USER_SWITCH_COMPLETE_MSG);

        mHandler.sendMessage(mHandler.obtainMessage(REPORT_USER_SWITCH_COMPLETE_MSG, newUserId, 0));

        stopGuestOrEphemeralUserIfBackground(oldUserId);

        stopUserOnSwitchIfEnforced(oldUserId);
@@ -2124,20 +2126,20 @@ class UserController implements Handler.Callback { 


    @VisibleForTesting

    void completeUserSwitch(int newUserId) {

        final Runnable runnable = () -> {

            unfreezeScreen();

            mHandler.removeMessages(REPORT_USER_SWITCH_COMPLETE_MSG);

            mHandler.sendMessage(mHandler.obtainMessage(

                    REPORT_USER_SWITCH_COMPLETE_MSG, newUserId, 0));

        };



        if (isUserSwitchUiEnabled()) {

            // If there is no challenge set, dismiss the keyguard right away

            if (!mInjector.getKeyguardManager().isDeviceSecure(newUserId)) {

                // Wait until the keyguard is dismissed to unfreeze

                mInjector.dismissKeyguard(runnable, "User Switch");

                mInjector.dismissKeyguard(

                        new Runnable() {

                            public void run() {

                                unfreezeScreen();

                            }

                        },

                        "User Switch");

                return;

            } else {

                runnable.run();

                unfreezeScreen();

            }

        }

    }