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

am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev

Browse Source 
* commit 'c55c581a8a9c7fb777e80498852426a546b1504c':
  Set default restrictions for a newly created user
This commit is contained in:
Amith Yamasani
2014-10-07 20:03:26 +00:00
committed by Android Git Automerger
parent a6e09c12d4 c55c581a8a
commit 6b911d59eb
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/users/UserDetailsSettings.java
View File

@@ -30,6 +30,8 @@ import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils; import com.android.settings.Utils;
import java.util.List;
/** /**
* Settings screen for configuring a specific user. It can contain user restrictions * Settings screen for configuring a specific user. It can contain user restrictions
* and deletion controls. It is shown when you tap on the settings icon in the * and deletion controls. It is shown when you tap on the settings icon in the
@@ -122,6 +124,16 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
// SMS is always disabled for guest // SMS is always disabled for guest
mDefaultGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true); mDefaultGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true);
mUserManager.setDefaultGuestRestrictions(mDefaultGuestRestrictions); mUserManager.setDefaultGuestRestrictions(mDefaultGuestRestrictions);
// Update the guest's restrictions, if there is a guest
List<UserInfo> users = mUserManager.getUsers(true);
for (UserInfo user: users) {
if (user.isGuest()) {
UserHandle userHandle = new UserHandle(user.id);
Bundle userRestrictions = mUserManager.getUserRestrictions(userHandle);
userRestrictions.putAll(mDefaultGuestRestrictions);
mUserManager.setUserRestrictions(userRestrictions, userHandle);
}
}
} else { } else {
// TODO: Show confirmation dialog: b/15761405 // TODO: Show confirmation dialog: b/15761405
UserHandle userHandle = new UserHandle(mUserInfo.id); UserHandle userHandle = new UserHandle(mUserInfo.id);

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

@@ -397,7 +397,7 @@ public class UserSettings extends SettingsPreferenceFragment
} }
private UserInfo createLimitedUser() { private UserInfo createLimitedUser() {
UserInfo newUserInfo = mUserManager.createUser( UserInfo newUserInfo = mUserManager.createSecondaryUser(
getResources().getString(R.string.user_new_profile_name), getResources().getString(R.string.user_new_profile_name),
UserInfo.FLAG_RESTRICTED); UserInfo.FLAG_RESTRICTED);
int userId = newUserInfo.id; int userId = newUserInfo.id;
@@ -421,7 +421,7 @@ public class UserSettings extends SettingsPreferenceFragment
} }
private UserInfo createTrustedUser() { private UserInfo createTrustedUser() {
UserInfo newUserInfo = mUserManager.createUser( UserInfo newUserInfo = mUserManager.createSecondaryUser(
getResources().getString(R.string.user_new_user_name), 0); getResources().getString(R.string.user_new_user_name), 0);
if (newUserInfo != null) { if (newUserInfo != null) {
assignDefaultPhoto(newUserInfo); assignDefaultPhoto(newUserInfo);