Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 742a6803 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Set default restrictions for a newly created user" into lmp-dev

parents 7096c2dd a766bfa3

src/com/android/settings/users/UserDetailsSettings.java

+12 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ import com.android.settings.R; 
import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.Utils;



import java.util.List;



/**

 * 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
@@ -122,6 +124,16 @@ public class UserDetailsSettings extends SettingsPreferenceFragment 
            // SMS is always disabled for guest

            mDefaultGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true);

            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 {

            // TODO: Show confirmation dialog: b/15761405

            UserHandle userHandle = new UserHandle(mUserInfo.id);

src/com/android/settings/users/UserSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ public class UserSettings extends SettingsPreferenceFragment 
    }



    private UserInfo createLimitedUser() {

        UserInfo newUserInfo = mUserManager.createUser(

        UserInfo newUserInfo = mUserManager.createSecondaryUser(

                getResources().getString(R.string.user_new_profile_name),

                UserInfo.FLAG_RESTRICTED);

        int userId = newUserInfo.id;
@@ -421,7 +421,7 @@ public class UserSettings extends SettingsPreferenceFragment 
    }



    private UserInfo createTrustedUser() {

        UserInfo newUserInfo = mUserManager.createUser(

        UserInfo newUserInfo = mUserManager.createSecondaryUser(

                getResources().getString(R.string.user_new_user_name), 0);

        if (newUserInfo != null) {

            assignDefaultPhoto(newUserInfo);