Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev

Browse Source 
am: e45e09fcee

Change-Id: I678920b9b4884ee648dc98e2777f313182df6ddd
This commit is contained in:
Jovana Knezevic
2019-06-04 18:15:17 -07:00
committed by android-build-merger
parent d562e7511b e45e09fcee
commit 7e80654f56
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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);