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

Commit ddb6e750 authored by Yvonne Jiang's avatar Yvonne Jiang Committed by Android (Google) Code Review
Browse files

Merge "Fix user id check in createConfirmSupervisionCredentialsIntent." into main

parents d0ba6c88 903dd899

services/supervision/java/com/android/server/supervision/SupervisionService.java

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ public class SupervisionService extends ISupervisionManager.Stub { 
    @Nullable

    public Intent createConfirmSupervisionCredentialsIntent() {

        enforceAnyPermission(QUERY_USERS, MANAGE_USERS);

        if (!isSupervisionEnabledForUser(mContext.getUserId())) {

        if (!isSupervisionEnabledForUser(UserHandle.getCallingUserId())) {

            return null;

        }

        // Verify the supervising user profile exists and has a secure credential set.