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

Merge "Don't allow user creation on phones via Settings search"

Browse Source
This commit is contained in:
Amith Yamasani
2014-03-26 23:27:09 +00:00
committed by Android (Google) Code Review
parent 8ce107effa cfb8d7f3c8
commit c96ccc8585
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,6 +128,7 @@ public class UserSettings extends RestrictedSettingsFragment
private int mAddedUserId = 0; private int mAddedUserId = 0;
private boolean mAddingUser; private boolean mAddingUser;
private boolean mProfileExists; private boolean mProfileExists;
private boolean mEnabled = true;
private final Object mUserLock = new Object(); private final Object mUserLock = new Object();
private UserManager mUserManager; private UserManager mUserManager;
@@ -184,6 +185,10 @@ public class UserSettings extends RestrictedSettingsFragment
} }
mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE); mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
if (!mUserManager.supportsMultipleUsers() || Utils.isMonkeyRunning()) {
mEnabled = false;
return;
}
addPreferencesFromResource(R.xml.user_settings); addPreferencesFromResource(R.xml.user_settings);
mUserListCategory = (PreferenceGroup) findPreference(KEY_USER_LIST); mUserListCategory = (PreferenceGroup) findPreference(KEY_USER_LIST);
mMePreference = new UserPreference(getActivity(), null, UserHandle.myUserId(), mMePreference = new UserPreference(getActivity(), null, UserHandle.myUserId(),
@@ -209,6 +214,9 @@ public class UserSettings extends RestrictedSettingsFragment
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
if (!mEnabled) return;
loadProfile(); loadProfile();
updateUserList(); updateUserList();
} }
@@ -216,6 +224,9 @@ public class UserSettings extends RestrictedSettingsFragment
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
if (!mEnabled) return;
getActivity().unregisterReceiver(mUserChangeReceiver); getActivity().unregisterReceiver(mUserChangeReceiver);
} }