DO NOT MERGE - Merge ab/7272582

Bug: 190855093
Merged-In: I910b59ef87bb833dd7d46a615dd073a35db710a3
Change-Id: I632162c432d02911b151498f5d9f64bade6651e6
diff --git a/audio/cs35l41/B5mmW/R-cs35l41-mmW-dsp1-spk-cali.bin b/audio/cs35l41/B5mmW/R-cs35l41-mmW-dsp1-spk-cali.bin
index a624d50..38cd441 100644
--- a/audio/cs35l41/B5mmW/R-cs35l41-mmW-dsp1-spk-cali.bin
+++ b/audio/cs35l41/B5mmW/R-cs35l41-mmW-dsp1-spk-cali.bin
Binary files differ
diff --git a/audio/cs35l41/B5mmW/R-cs35l41-mmW-dsp1-spk-diag.bin b/audio/cs35l41/B5mmW/R-cs35l41-mmW-dsp1-spk-diag.bin
index 2887e93..df0deb5 100644
--- a/audio/cs35l41/B5mmW/R-cs35l41-mmW-dsp1-spk-diag.bin
+++ b/audio/cs35l41/B5mmW/R-cs35l41-mmW-dsp1-spk-diag.bin
Binary files differ
diff --git a/audio/cs35l41/B5mmW/R-cs35l41-mmW-dsp1-spk-prot.bin b/audio/cs35l41/B5mmW/R-cs35l41-mmW-dsp1-spk-prot.bin
index d41d2ba..f63d7a1 100644
--- a/audio/cs35l41/B5mmW/R-cs35l41-mmW-dsp1-spk-prot.bin
+++ b/audio/cs35l41/B5mmW/R-cs35l41-mmW-dsp1-spk-prot.bin
Binary files differ
diff --git a/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-cali.bin b/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-cali.bin
index 8baf28b..7893bf2 100644
--- a/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-cali.bin
+++ b/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-cali.bin
Binary files differ
diff --git a/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-cali.wmfw b/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-cali.wmfw
index 83dbe7e..07a10ad 100644
--- a/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-cali.wmfw
+++ b/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-cali.wmfw
Binary files differ
diff --git a/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-diag.bin b/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-diag.bin
index 4638b9c..6d0517e 100644
--- a/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-diag.bin
+++ b/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-diag.bin
Binary files differ
diff --git a/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-diag.wmfw b/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-diag.wmfw
index b708cde..81f3a37 100644
--- a/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-diag.wmfw
+++ b/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-diag.wmfw
Binary files differ
diff --git a/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-prot.bin b/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-prot.bin
index e6f2448..cbad80f 100644
--- a/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-prot.bin
+++ b/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-prot.bin
Binary files differ
diff --git a/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-prot.wmfw b/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-prot.wmfw
index 83dbe7e..07a10ad 100644
--- a/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-prot.wmfw
+++ b/audio/cs35l41/B5mmW/cs35l41-mmW-dsp1-spk-prot.wmfw
Binary files differ
diff --git a/audio/cs35l41/R-cs35l41-dsp1-spk-cali.bin b/audio/cs35l41/R-cs35l41-dsp1-spk-cali.bin
index a624d50..38cd441 100644
--- a/audio/cs35l41/R-cs35l41-dsp1-spk-cali.bin
+++ b/audio/cs35l41/R-cs35l41-dsp1-spk-cali.bin
Binary files differ
diff --git a/audio/cs35l41/R-cs35l41-dsp1-spk-diag.bin b/audio/cs35l41/R-cs35l41-dsp1-spk-diag.bin
index 2887e93..df0deb5 100644
--- a/audio/cs35l41/R-cs35l41-dsp1-spk-diag.bin
+++ b/audio/cs35l41/R-cs35l41-dsp1-spk-diag.bin
Binary files differ
diff --git a/audio/cs35l41/R-cs35l41-dsp1-spk-prot.bin b/audio/cs35l41/R-cs35l41-dsp1-spk-prot.bin
index d41d2ba..f63d7a1 100644
--- a/audio/cs35l41/R-cs35l41-dsp1-spk-prot.bin
+++ b/audio/cs35l41/R-cs35l41-dsp1-spk-prot.bin
Binary files differ
diff --git a/audio/cs35l41/cs35l41-dsp1-spk-cali.bin b/audio/cs35l41/cs35l41-dsp1-spk-cali.bin
index 8baf28b..7893bf2 100644
--- a/audio/cs35l41/cs35l41-dsp1-spk-cali.bin
+++ b/audio/cs35l41/cs35l41-dsp1-spk-cali.bin
Binary files differ
diff --git a/audio/cs35l41/cs35l41-dsp1-spk-cali.wmfw b/audio/cs35l41/cs35l41-dsp1-spk-cali.wmfw
index 83dbe7e..07a10ad 100644
--- a/audio/cs35l41/cs35l41-dsp1-spk-cali.wmfw
+++ b/audio/cs35l41/cs35l41-dsp1-spk-cali.wmfw
Binary files differ
diff --git a/audio/cs35l41/cs35l41-dsp1-spk-diag.bin b/audio/cs35l41/cs35l41-dsp1-spk-diag.bin
index 4638b9c..6d0517e 100644
--- a/audio/cs35l41/cs35l41-dsp1-spk-diag.bin
+++ b/audio/cs35l41/cs35l41-dsp1-spk-diag.bin
Binary files differ
diff --git a/audio/cs35l41/cs35l41-dsp1-spk-diag.wmfw b/audio/cs35l41/cs35l41-dsp1-spk-diag.wmfw
index b708cde..81f3a37 100644
--- a/audio/cs35l41/cs35l41-dsp1-spk-diag.wmfw
+++ b/audio/cs35l41/cs35l41-dsp1-spk-diag.wmfw
Binary files differ
diff --git a/audio/cs35l41/cs35l41-dsp1-spk-prot.bin b/audio/cs35l41/cs35l41-dsp1-spk-prot.bin
index e6f2448..cbad80f 100644
--- a/audio/cs35l41/cs35l41-dsp1-spk-prot.bin
+++ b/audio/cs35l41/cs35l41-dsp1-spk-prot.bin
Binary files differ
diff --git a/audio/cs35l41/cs35l41-dsp1-spk-prot.wmfw b/audio/cs35l41/cs35l41-dsp1-spk-prot.wmfw
index 83dbe7e..07a10ad 100644
--- a/audio/cs35l41/cs35l41-dsp1-spk-prot.wmfw
+++ b/audio/cs35l41/cs35l41-dsp1-spk-prot.wmfw
Binary files differ
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 += \