Merge "Default isUserSwitcherEnabled showEvenIfNotActionable" into rvc-dev

2020-06-12 00:47:47 +00:00
parent a0d33955fd 600210d7cb
commit a677e1c6f9
1 changed files with 4 additions and 4 deletions
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -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);
    }

    /**