commit ad607a4fbba25977ed64ad69bc0457efe3b46aaf
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 14 22:33:10 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 14 22:33:10 2019 +0000
tree 7f75da1d05dd112bc75e74808249d9ff7254ba7d
parent 9bffff9528c66562ed01e86b63c883cab98f654b
parent 4e4b072c3602934154e44144783d7f3b4875f633

Merge "Hide MultiUserSwitch when guestEnabled && no_add_users" into qt-dev

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
index 443cc43..c0a1b12 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
@@ -112,7 +112,9 @@
 
         final boolean guestEnabled = !mContext.getSystemService(DevicePolicyManager.class)
                 .getGuestUserDisabled(null);
-        return mUserSwitcherController.getSwitchableUserCount() > 1 || guestEnabled
+        return mUserSwitcherController.getSwitchableUserCount() > 1
+                // If we cannot add guests even if they are enabled, do not show
+                || (guestEnabled && !mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER))
                 || mContext.getResources().getBoolean(R.bool.qs_show_user_switcher_for_single_user);
     }