Merge "FRP: Enable credential-based factory reset protection by default" into oc-mr1-dev

am: 956491b867

Change-Id: Ib8dd7a7a1805f9a2b00525ae9bd6ebcbc572f2fa
This commit is contained in:
Adrian Roos
2017-08-08 12:02:27 +00:00
committed by android-build-merger

View File

@@ -67,8 +67,7 @@ public class LockPatternUtils {
private static final String TAG = "LockPatternUtils";
private static final boolean DEBUG = false;
private static final boolean FRP_CREDENTIAL_ENABLED =
Build.IS_DEBUGGABLE && SystemProperties.getBoolean("debug.frpcredential.enable", false);
private static final boolean FRP_CREDENTIAL_ENABLED = true;
/**
* The key to identify when the lock pattern enabled flag is being accessed for legacy reasons.