PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove the check hasMultipleUsers in Settings."

Browse Source
This commit is contained in:
Fyodor Kupolov
2015-05-19 17:50:00 +00:00
committed by Gerrit Code Review
parent a1a2c91b7d ea5677e1a3
commit e84a5eac2c
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/SettingsActivity.java
View File

@@ -1189,8 +1189,7 @@ public class SettingsActivity extends Activity
((UserManager) getSystemService(Context.USER_SERVICE)) ((UserManager) getSystemService(Context.USER_SERVICE))
.getUserCount() > 1; .getUserCount() > 1;
if (!UserHandle.MU_ENABLED if (!UserHandle.MU_ENABLED
|| (!UserManager.supportsMultipleUsers() || !UserManager.supportsMultipleUsers()
&& !hasMultipleUsers)
|| Utils.isMonkeyRunning()) { || Utils.isMonkeyRunning()) {
removeTile = true; removeTile = true;
} }

2
src/com/android/settings/users/UserSettings.java
View File

@@ -192,7 +192,7 @@ public class UserSettings extends SettingsPreferenceFragment
final Context context = getActivity(); final Context context = getActivity();
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
boolean hasMultipleUsers = mUserManager.getUserCount() > 1; boolean hasMultipleUsers = mUserManager.getUserCount() > 1;
if ((!UserManager.supportsMultipleUsers() && !hasMultipleUsers) if ((!UserManager.supportsMultipleUsers())
|| Utils.isMonkeyRunning()) { || Utils.isMonkeyRunning()) {
mEnabled = false; mEnabled = false;
return; return;