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

Commit fcc7dbd7 authored by Jovana Knezevic's avatar Jovana Knezevic Committed by android-build-merger
Browse files

Merge "Removing requirement for FEATURE_DEVICE_ADMIN in... 

Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev am: e45e09fc
am: 7e80654f

Change-Id: Iefb155ae1727c10039f311675a60c03de2025e55
parents db30f313 7e80654f

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

+1 −1
Original line number Diff line number Diff line
@@ -6654,7 +6654,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
     */

    @Override

    public void setActivePasswordState(PasswordMetrics metrics, int userHandle) {

        if (!mHasFeature || !mLockPatternUtils.hasSecureLockScreen()) {

        if (!mLockPatternUtils.hasSecureLockScreen()) {

            return;

        }

        enforceFullCrossUsersPermission(userHandle);