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

Commit c09e4c1c authored by Fabian Kozynski's avatar Fabian Kozynski Committed by android-build-merger
Browse files

Merge "Mitigate IPC calls from MultiUserSwitcher" into qt-r1-dev am: fd47f70b am: 4876d43b 

am: ef4a6896

Change-Id: Ic1eff98e4c7c558cf869f9b164a42b39f341b1a9
parents 3db09a1a ef4a6896

packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java

+4 −3
Original line number Diff line number Diff line
@@ -103,10 +103,11 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener 
        final boolean userSwitcherEnabled = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.USER_SWITCHER_ENABLED, 0) != 0;



        if (!UserManager.supportsMultipleUsers()

                || mUserManager.hasUserRestriction(UserManager.DISALLOW_USER_SWITCH)

        // TODO(b/138661450) Move IPC calls to background

        if (!userSwitcherEnabled

                || !UserManager.supportsMultipleUsers()

                || UserManager.isDeviceInDemoMode(mContext)

                || !userSwitcherEnabled) {

                || mUserManager.hasUserRestriction(UserManager.DISALLOW_USER_SWITCH)) {

            return false;

        }