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

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

Browse Source 
* commit 'db80e588c0f2c585e3dddb79fdd35b3f50ba8bb2':
  Remove the check hasMultipleUsers in Settings.
This commit is contained in:
Fyodor Kupolov
2015-05-19 21:31:19 +00:00
committed by Android Git Automerger
parent 148c327fb3 db80e588c0
commit f9756ec187
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

@@ -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;
}

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

@@ -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;