commit 4c3ec15c18f9e15db830209fa754e6d48b8bbaf6
author Adrian Roos <roosa@google.com> Tue Aug 08 12:07:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 08 12:07:55 2017 +0000
tree 5076593c0ba125942d76c6d51a157f7932257201
parent 42d0c44a8fc84782d21e32e3bb69253cbba68d47
parent eb83d9c0cc7933737950f96e187936e430d43079

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

Change-Id: Ib8f23eb67e3af3626be3d075b512d3ad5e05ef3b

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.