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

Commit f9756ec1 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android Git Automerger
Browse files

am db80e588: am e84a5eac: Merge "Remove the check hasMultipleUsers in Settings." 

* commit 'db80e588':
  Remove the check hasMultipleUsers in Settings.
parents 148c327f db80e588

src/com/android/settings/SettingsActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -1272,8 +1272,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
@@ -200,7 +200,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;