Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
e45e09fcee
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user