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

Commit cf86c068 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Allow SMS and calling for demo users" into oc-dr1-dev am:... 

Merge "Merge "Allow SMS and calling for demo users" into oc-dr1-dev am: 4387d3a5 am: 966f37ae" into oc-mr1-dev-plus-aosp
parents 1f04d491 8d343915

core/java/android/os/UserManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1460,7 +1460,7 @@ public class UserManager { 
            user = mService.createUser(name, flags);

            // TODO: Keep this in sync with

            // UserManagerService.LocalService.createUserEvenWhenDisallowed

            if (user != null && !user.isAdmin()) {

            if (user != null && !user.isAdmin() && !user.isDemo()) {

                mService.setUserRestriction(DISALLOW_SMS, true, user.id);

                mService.setUserRestriction(DISALLOW_OUTGOING_CALLS, true, user.id);

            }

services/core/java/com/android/server/pm/UserManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -3652,7 +3652,7 @@ public class UserManagerService extends IUserManager.Stub { 
        public UserInfo createUserEvenWhenDisallowed(String name, int flags) {

            UserInfo user = createUserInternalUnchecked(name, flags, UserHandle.USER_NULL, null);

            // Keep this in sync with UserManager.createUser

            if (user != null && !user.isAdmin()) {

            if (user != null && !user.isAdmin() && !user.isDemo()) {

                setUserRestriction(UserManager.DISALLOW_SMS, true, user.id);

                setUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS, true, user.id);

            }