From 8370e472cdf22d30e5485c8cdd884767ea482571 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Sun, 23 Jul 2017 14:35:59 +0200
Subject: [PATCH] FRP: Enable credential-based factory reset protection by
 default

Bug: 64436700
Change-Id: I3aed6313e3b6b7e6d6e65c9e822ff123b8cd52cd
Test: Set up PIN, add Google Account, adb shell reboot-bootloader; fastboot -w; verify credential-based unlocking is possible using the PIN from before factory reset
---
 core/java/com/android/internal/widget/LockPatternUtils.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index 53a965452df3e..0ae1c2992e0a3 100644
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -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.