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

Commit dd2e6151 authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge "UserManagerService: clear calling identity in getCredentialOwnerProfile()" into main

parents 3f885053 1163e15e

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

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

    public int getCredentialOwnerProfile(@UserIdInt int userId) {

        checkManageUsersPermission("get the credential owner");

        final long identity = Binder.clearCallingIdentity();

        try {

            if (!mLockPatternUtils.isSeparateProfileChallengeEnabled(userId)) {

                synchronized (mUsersLock) {

                    UserInfo profileParent = getProfileParentLU(userId);
@@ -1720,7 +1722,9 @@ public class UserManagerService extends IUserManager.Stub { 
                    }

                }

            }



        } finally {

            Binder.restoreCallingIdentity(identity);

        }

        return userId;

    }