[automerger skipped] Merge RQ2A.210305.007 am: 36a18716db -s ours am: 032769f408 -s ours
am skip reason: Change-Id Ie5b6e5a83380a10bcd98812d232d378593f8b458 with SHA-1 dfbae81268 is in history
Original change: https://android-review.googlesource.com/c/device/google/bramble/+/1612527
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I38de8936b95055aba9c971d13692b38f80c27111
diff --git a/bramble/overlay/frameworks/base/core/res/res/values/config.xml b/bramble/overlay/frameworks/base/core/res/res/values/config.xml
index e35eeec..323feb7 100755
--- a/bramble/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/bramble/overlay/frameworks/base/core/res/res/values/config.xml
@@ -213,4 +213,12 @@
<dimen name="status_bar_height_landscape">28dp</dimen>
<!-- Height of area above QQS where battery/time go (equal to status bar) -->
<dimen name="quick_qs_offset_height">145px</dimen>
+
+ <!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
+ when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
+ where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
+ and Strength as defined in Authenticators.java -->
+ <string-array name="config_biometric_sensors" translatable="false" >
+ <item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
+ </string-array>
</resources>
diff --git a/device-bramble.mk b/device-bramble.mk
index f7f248c..4b0d96c 100644
--- a/device-bramble.mk
+++ b/device-bramble.mk
@@ -161,8 +161,8 @@
endif
# GPS ANTENNA_INFO configuration file
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf
+#PRODUCT_COPY_FILES += \
+# $(LOCAL_PATH)/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf
# Audio effects
PRODUCT_PACKAGES += \
