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

am c2a716aa: am 918c23bd: Merge "Don\'t allow creating guest when can\'t create user" into lmp-dev

Browse Source 
* commit 'c2a716aaca10ec3469573e13616dcccf70c1e088':
  Don't allow creating guest when can't create user
This commit is contained in:
Jason Monk
2014-08-11 17:19:49 +00:00
committed by Android Git Automerger
parent 90a5bffe67 c2a716aaca
commit b86fef6e22
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -803,7 +803,19 @@ public class UserSettings extends SettingsPreferenceFragment
mUserListCategory.addPreference(pref);
}
if (!mIsGuest) {
boolean showGuestPreference = !mIsGuest;
// If user has DISALLOW_ADD_USER don't allow creating a guest either.
if (showGuestPreference && mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER)) {
showGuestPreference = false;
// If guest already exists, no user creation needed.
for (UserInfo user : users) {
if (user.isGuest()) {
showGuestPreference = true;
break;
}
}
}
if (showGuestPreference) {
// Add a virtual Guest user for guest defaults
Preference pref = new UserPreference(getActivity(), null,
UserPreference.USERID_GUEST_DEFAULTS,
@@ -930,6 +942,10 @@ public class UserSettings extends SettingsPreferenceFragment
}
}
// No guest user. Create one.
if (mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER)) {
Log.i(TAG, "Blocking guest creation because it is restricted");
return;
}
UserInfo guestUser = mUserManager.createGuest(getActivity(),
getResources().getString(R.string.user_guest));
if (guestUser != null) {