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

Commit bd6247d9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Demote SecurityException in DPMS.reportPasswordChanged" into main

parents 15451dcd 0dbe03a2

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+5 −2
Original line number Diff line number Diff line
@@ -8288,8 +8288,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        Preconditions.checkCallAuthorization(isSystemUid(caller));

        // Managed Profile password can only be changed when it has a separate challenge.

        if (!isSeparateProfileChallengeEnabled(userId)) {

            Preconditions.checkCallAuthorization(!isManagedProfile(userId), "You can "

                    + "not set the active password for a managed profile, userId = %d", userId);

            if (isManagedProfile(userId)) {

                Slogf.i(LOG_TAG, "You can not set the active password for a managed profile,"

                        + " userId = %d", userId);

                return;

            }

        }















        DevicePolicyData policy = getUserData(userId);