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

Commit c6d033ed authored by Nicolas Prevot's avatar Nicolas Prevot
Browse files

Correcting a deadlock in CreateRelatedUser 

A deadlock sometimes happened in CreateRelatedUser of UserManagerService.
A lock was kept when it should have been released.

Change-Id: I15444c0b5d0d5d1e14e7bf29c2115aa954b7dfc0
parent 4495c86d

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

+9 −10
Original line number Diff line number Diff line
@@ -984,27 +984,26 @@ public class UserManagerService extends IUserManager.Stub { 
            Slog.w(LOG_TAG, "Only user owner can have related users");

            return null;

        }

        synchronized (mPackagesLock) {

            UserInfo relatedUser = getUserInfoLocked(relatedUserId);

            if (relatedUser == null) {

                return null;

            }

            return createUserInternal(name, flags, relatedUser);

        }

        return createUserInternal(name, flags, relatedUserId);

    }



    @Override

    public UserInfo createUser(String name, int flags) {

        checkManageUsersPermission("Only the system can create users");

        return createUserInternal(name, flags, null);

        return createUserInternal(name, flags, UserHandle.USER_NULL);

    }



    private UserInfo createUserInternal(String name, int flags, UserInfo relatedUser) {

    private UserInfo createUserInternal(String name, int flags, int relatedUserId) {

        final long ident = Binder.clearCallingIdentity();

        final UserInfo userInfo;

        UserInfo userInfo = null;

        try {

            synchronized (mInstallLock) {

                synchronized (mPackagesLock) {

                    UserInfo relatedUser = null;

                    if (relatedUserId != UserHandle.USER_NULL) {

                        relatedUser = getUserInfoLocked(relatedUserId);

                        if (relatedUser == null) return null;

                    }

                    if (isUserLimitReachedLocked()) return null;

                    int userId = getNextAvailableIdLocked();

                    userInfo = new UserInfo(userId, name, null, flags);