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

Commit 8394a7b5 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: dcb4951f
am: a6fe6698

Change-Id: Ic6946bb361537dde5183345050f87a583f4ea5ff
parents 173b7ce7 a6fe6698

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

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

     */

    @Override

    @Override

    public void setActivePasswordState(PasswordMetrics metrics, int userHandle) {

    public void setActivePasswordState(PasswordMetrics metrics, int userHandle) {

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

        if (!mLockPatternUtils.hasSecureLockScreen()) {

            return;

            return;

        }

        }

        enforceFullCrossUsersPermission(userHandle);

        enforceFullCrossUsersPermission(userHandle);