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

Commit ec1a918f authored by Erik Wolsheimer's avatar Erik Wolsheimer
Browse files

Prevent NPE via use of uninitialized mUserManager 

BUG: 27718356
BUG: 27336841
Change-Id: Id603835b0463ca32f6a27ec255df7077f2427b06
parent ce71deef

services/core/java/com/android/server/accounts/AccountManagerService.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -597,7 +597,7 @@ public class AccountManagerService 
        if (sharedAccounts == null || sharedAccounts.length == 0) return;

        if (sharedAccounts == null || sharedAccounts.length == 0) return;

        Account[] accounts = getAccountsAsUser(null, userId, mContext.getOpPackageName());

        Account[] accounts = getAccountsAsUser(null, userId, mContext.getOpPackageName());

        int parentUserId = UserManager.isSplitSystemUser()

        int parentUserId = UserManager.isSplitSystemUser()

                ? mUserManager.getUserInfo(userId).restrictedProfileParentId

                ? getUserManager().getUserInfo(userId).restrictedProfileParentId

                : UserHandle.USER_SYSTEM;

                : UserHandle.USER_SYSTEM;

        if (parentUserId < 0) {

        if (parentUserId < 0) {

            Log.w(TAG, "User " + userId + " has shared accounts, but no parent user");

            Log.w(TAG, "User " + userId + " has shared accounts, but no parent user");
@@ -1061,7 +1061,7 @@ public class AccountManagerService 
        for (UserInfo user : users) {

        for (UserInfo user : users) {

            if (user.isRestricted() && (parentUserId == user.restrictedProfileParentId)) {

            if (user.isRestricted() && (parentUserId == user.restrictedProfileParentId)) {

                addSharedAccountAsUser(account, user.id);

                addSharedAccountAsUser(account, user.id);

                if (mUserManager.isUserUnlocked(user.id)) {

                if (getUserManager().isUserUnlocked(user.id)) {

                    mMessageHandler.sendMessage(mMessageHandler.obtainMessage(

                    mMessageHandler.sendMessage(mMessageHandler.obtainMessage(

                            MESSAGE_COPY_SHARED_ACCOUNT, parentUserId, user.id, account));

                            MESSAGE_COPY_SHARED_ACCOUNT, parentUserId, user.id, account));

                }

                }
@@ -1270,7 +1270,7 @@ public class AccountManagerService 
                         * Owner or system user account was renamed, rename the account for

                         * Owner or system user account was renamed, rename the account for

                         * those users with which the account was shared.

                         * those users with which the account was shared.

                         */

                         */

                        List<UserInfo> users = mUserManager.getUsers(true);

                        List<UserInfo> users = getUserManager().getUsers(true);

                        for (UserInfo user : users) {

                        for (UserInfo user : users) {

                            if (user.isRestricted()

                            if (user.isRestricted()

                                    && (user.restrictedProfileParentId == parentUserId)) {

                                    && (user.restrictedProfileParentId == parentUserId)) {
@@ -1286,7 +1286,7 @@ public class AccountManagerService 
    }

    }





    private boolean canHaveProfile(final int parentUserId) {

    private boolean canHaveProfile(final int parentUserId) {

        final UserInfo userInfo = mUserManager.getUserInfo(parentUserId);

        final UserInfo userInfo = getUserManager().getUserInfo(parentUserId);

        return userInfo != null && userInfo.canHaveProfile();

        return userInfo != null && userInfo.canHaveProfile();

    }

    }
@@ -1477,7 +1477,7 @@ public class AccountManagerService 
            int parentUserId = accounts.userId;

            int parentUserId = accounts.userId;

            if (canHaveProfile(parentUserId)) {

            if (canHaveProfile(parentUserId)) {

                // Remove from any restricted profiles that are sharing this account.

                // Remove from any restricted profiles that are sharing this account.

                List<UserInfo> users = mUserManager.getUsers(true);

                List<UserInfo> users = getUserManager().getUsers(true);

                for (UserInfo user : users) {

                for (UserInfo user : users) {

                    if (user.isRestricted() && parentUserId == (user.restrictedProfileParentId)) {

                    if (user.isRestricted() && parentUserId == (user.restrictedProfileParentId)) {

                        removeSharedAccountAsUser(account, user.id, callingUid);

                        removeSharedAccountAsUser(account, user.id, callingUid);
@@ -4730,7 +4730,7 @@ public class AccountManagerService 
                || callingUid == Process.myUid()) {

                || callingUid == Process.myUid()) {

            return unfiltered;

            return unfiltered;

        }

        }

        UserInfo user = mUserManager.getUserInfo(userAccounts.userId);

        UserInfo user = getUserManager().getUserInfo(userAccounts.userId);

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

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

            String[] packages = mPackageManager.getPackagesForUid(callingUid);

            String[] packages = mPackageManager.getPackagesForUid(callingUid);

            // If any of the packages is a white listed package, return the full set,

            // If any of the packages is a white listed package, return the full set,