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

Commit 20319280 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix UserManagerService.setUserIcon throwing expt."

parents 700db2a3 9a944532

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

+13 −8
Original line number Diff line number Diff line
@@ -394,6 +394,8 @@ public class UserManagerService extends IUserManager.Stub { 
    @Override

    public void setUserIcon(int userId, Bitmap bitmap) {

        checkManageUsersPermission("update users");

        long ident = Binder.clearCallingIdentity();

        try {

            synchronized (mPackagesLock) {

                UserInfo info = mUsers.get(userId);

                if (info == null || info.partial) {
@@ -404,6 +406,9 @@ public class UserManagerService extends IUserManager.Stub { 
                writeUserLocked(info);

            }

            sendUserInfoChangedBroadcast(userId);

        } finally {

            Binder.restoreCallingIdentity(ident);

        }

    }



    private void sendUserInfoChangedBroadcast(int userId) {