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

Commit ea5677e1 authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Fyodor Kupolov
Browse files

Remove the check hasMultipleUsers in Settings. 

When deciding to show the user section or not, Just rely
on supportsMultipleUsers. Don't check hasMultipleUsers.

BUG:21119929
Change-Id: Ifbddac10e2f6dc02b8e2e55b41ab9f5be018dfca
parent a1a2c91b

src/com/android/settings/SettingsActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -1189,8 +1189,7 @@ public class SettingsActivity extends Activity 
                            ((UserManager) getSystemService(Context.USER_SERVICE))

                                    .getUserCount() > 1;

                    if (!UserHandle.MU_ENABLED

                            || (!UserManager.supportsMultipleUsers()

                                    && !hasMultipleUsers)

                            || !UserManager.supportsMultipleUsers()

                            || Utils.isMonkeyRunning()) {

                        removeTile = true;

                    }

src/com/android/settings/users/UserSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ public class UserSettings extends SettingsPreferenceFragment 
        final Context context = getActivity();

        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);

        boolean hasMultipleUsers = mUserManager.getUserCount() > 1;

        if ((!UserManager.supportsMultipleUsers() && !hasMultipleUsers)

        if ((!UserManager.supportsMultipleUsers())

                || Utils.isMonkeyRunning()) {

            mEnabled = false;

            return;