commit eb83d9c0cc7933737950f96e187936e430d43079
author Adrian Roos <roosa@google.com> Tue Aug 08 12:02:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 08 12:02:27 2017 +0000
tree 32c4939110e09844773e6e97b71470ec8823521d
parent 8f0351d3e99a541a7684dd1967076b1fac20f9f4
parent 956491b867fbe76c1516d68e6d43ef8657b6addb

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

Change-Id: Ib8dd7a7a1805f9a2b00525ae9bd6ebcbc572f2fa

core/java/com/android/internal/widget/LockPatternUtils.java

diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index 9462a06..e6c49f1 100644
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -67,8 +67,7 @@
 
     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.