summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2017-09-25 18:38:30 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-25 18:38:30 +0000
commitbfcfec2075355bcdcb43abed4232a2bcc8bd60d9 (patch)
tree0c589796e1bec3ae7041ea559c5348657d55e0a3
parent3245d8df1cd390a5ec3d7f980de2eb237ba3be5a (diff)
parente27ca39f576aef4bc5334ff2f0d1a9268d985a05 (diff)
downloaddragon-bfcfec2075355bcdcb43abed4232a2bcc8bd60d9.tar.gz
Merge "FRP: disable credential FRP on dragon" into oc-mr1-dev
am: e27ca39f57 Change-Id: I9407b0b3eae282663ef88c15176a8e3206f17824
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 1b13f00..9766de6 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -51,6 +51,13 @@
<!-- Enable device idle mode -->
<bool name="config_enableAutoPowerModes">true</bool>
+ <!-- If true, enables verification of the lockscreen credential in the factory reset protection
+ flow. This should be true if gatekeeper / weaver credentials can still be checked after a
+ factory reset.
+
+ dragon's gatekeeper does not preserve credentials across factory resets. -->
+ <bool name="config_enableCredentialFactoryResetProtection">false</bool>
+
<!-- Flag indicating whether the we should enable the automatic brightness in Settings.
Software implementation will be used if config_hardware_auto_brightness_available is not set -->
<bool name="config_automatic_brightness_available">true</bool>