From cb9d32c0b632334fd959a310130ee5609ba98c24 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Wed, 27 Sep 2017 16:39:41 -0700
Subject: [PATCH] fwk compat mat: add health@2.0

framework & storaged talks to health@2.0 HAL prior to healthd.

If the vendor service for health@2.0 is missing, framework / storaged
falls back and talks to healthd. Hence health@2.0 HAL is optional.

A follow-up change is needed to require launch devices to launch
with health@2.0 (i.e. current.xml says optional=false).

Bug: 62229583
Test: builds (assemble_vintf passes)

Change-Id: I49caca2b683e928f25e6f3cac2e2a8396b50f46a
---
 compatibility_matrix.26.xml      | 8 ++++++++
 compatibility_matrix.27.xml      | 8 ++++++++
 compatibility_matrix.current.xml | 8 ++++++++
 compatibility_matrix.legacy.xml  | 8 ++++++++
 4 files changed, 32 insertions(+)

diff --git a/compatibility_matrix.26.xml b/compatibility_matrix.26.xml
index 6692de0dd0..940588f932 100644
--- a/compatibility_matrix.26.xml
+++ b/compatibility_matrix.26.xml
@@ -163,6 +163,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>android.hardware.health</name>
+        <version>2.0</version>
+        <interface>
+            <name>IHealth</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.ir</name>
         <version>1.0</version>
diff --git a/compatibility_matrix.27.xml b/compatibility_matrix.27.xml
index 5c81f26616..80001f75e8 100644
--- a/compatibility_matrix.27.xml
+++ b/compatibility_matrix.27.xml
@@ -163,6 +163,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>android.hardware.health</name>
+        <version>2.0</version>
+        <interface>
+            <name>IHealth</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.ir</name>
         <version>1.0</version>
diff --git a/compatibility_matrix.current.xml b/compatibility_matrix.current.xml
index 6692de0dd0..940588f932 100644
--- a/compatibility_matrix.current.xml
+++ b/compatibility_matrix.current.xml
@@ -163,6 +163,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>android.hardware.health</name>
+        <version>2.0</version>
+        <interface>
+            <name>IHealth</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.ir</name>
         <version>1.0</version>
diff --git a/compatibility_matrix.legacy.xml b/compatibility_matrix.legacy.xml
index 5f06a8e76e..d562fd048a 100644
--- a/compatibility_matrix.legacy.xml
+++ b/compatibility_matrix.legacy.xml
@@ -163,6 +163,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>android.hardware.health</name>
+        <version>2.0</version>
+        <interface>
+            <name>IHealth</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.ir</name>
         <version>1.0</version>