Merge "sys user split: fix user settings user list"

2015-07-16 17:46:07 +00:00
parent 2a9b911a85 148ef7795d
commit 33b17beb9d
1 changed files with 3 additions and 2 deletions
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -706,8 +706,9 @@ public class UserSettings extends SettingsPreferenceFragment
        userPreferences.add(mMePreference);

        for (UserInfo user : users) {
-            if (user.isManagedProfile()) {
-                // Managed profiles appear under Accounts Settings instead
+            if (!user.supportsSwitchToByUser()) {
+                // Only users that can be switched to should show up here.
+                // e.g. Managed profiles appear under Accounts Settings instead
                continue;
            }
            UserPreference pref;