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

Commit 0efeed6c authored by Adam Bookatz's avatar Adam Bookatz Committed by Automerger Merge Worker
Browse files

Merge "Default isUserSwitcherEnabled showEvenIfNotActionable" into rvc-dev am:... 

Merge "Default isUserSwitcherEnabled showEvenIfNotActionable" into rvc-dev am: a677e1c6 am: 58352e4e

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

Change-Id: Ie641939bcdafe6d829b9a64bc0064d8b4058cb9d
parents c7984698 58352e4e

core/java/android/os/UserManager.java

+4 −4
Original line number Diff line number Diff line
@@ -4095,14 +4095,14 @@ public class UserManager { 
    }



    /**

     * Returns true if the user switcher should be shown.

     * I.e., returns whether the user switcher is enabled and there is something actionable to show.

     * Returns true if the user switcher is enabled (regardless of whether there is anything

     * interesting for it to show).

     *

     * @return true if user switcher should be shown.

     * @return true if user switcher is enabled

     * @hide

     */

    public boolean isUserSwitcherEnabled() {

        return isUserSwitcherEnabled(false);

        return isUserSwitcherEnabled(true);

    }



    /**