commit 8fb33ef5564b81f508d823725fe5690326eafeb9
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 12 10:32:41 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 12 10:32:41 2020 +0000
tree 2440a9ad428684d3c7e346498103a56aa994b61d
parent e5f057a83823299398229eeaf918da5da5a00d21
parent b83460e08b11d8a09c4270da144d73210dc00153

Merge "health: move health hal 2.1 to redbull" into rvc-dev

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 6e766d7..92c93f8 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -278,10 +278,6 @@
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.camera.googfd.enable=1
 
-# camera disable FaceSSD temporarily
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.camera.facessd.enable=0
-
 # camera hal buffer management
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.camera.managebuffer.enable=1

device_framework_matrix.xml

diff --git a/device_framework_matrix.xml b/device_framework_matrix.xml
index 724fb2d..fb0b32b 100644
--- a/device_framework_matrix.xml
+++ b/device_framework_matrix.xml
@@ -316,4 +316,17 @@
             <instance>slot2</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.qteeconnector</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IAppConnector</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IGPAppConnector</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </compatibility-matrix>

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index de16924..c59f481 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -570,4 +570,17 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.qteeconnector</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IAppConnector</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IGPAppConnector</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </manifest>