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

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

Merge "Hacks to fix lockdown"

parents bea3b60e e45e45e3

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

+8 −0
Original line number Diff line number Diff line
@@ -547,6 +547,11 @@ public class UserManagerService extends IUserManager.Stub { 
                UserInfo.FLAG_ADMIN | UserInfo.FLAG_PRIMARY | UserInfo.FLAG_INITIALIZED);

        mUsers.put(0, primary);

        mNextSerialNumber = MIN_USER_ID;

        

        Bundle restrictions = new Bundle();

        initRestrictionsToDefaults(restrictions);

        mUserRestrictions.append(0, restrictions);

        

        updateUserIdsLocked();



        writeUserListLocked();
@@ -805,6 +810,9 @@ public class UserManagerService extends IUserManager.Stub { 
                    userInfo.partial = false;

                    writeUserLocked(userInfo);

                    updateUserIdsLocked();

                    Bundle restrictions = new Bundle();

                    initRestrictionsToDefaults(restrictions);

                    mUserRestrictions.append(userId, restrictions);

                }

            }

            if (userInfo != null) {