| commit | 54a25b2d7cd8eabc00ec0b6fdf7524c268ff3f6d | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Oct 26 23:15:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 26 23:15:22 2021 +0000 |
| tree | f0d7a6ca3641bf0e9a64a430506946fcbe80d2a6 | |
| parent | 5aa275fce8bc6d19bb0b102cfb2b52a39bd96afa [diff] | |
| parent | f8024383614819374fce1c4ceea64b5db59a9ef6 [diff] |
Merge changes from topic "health-aidl" am: 713d22e0f1 am: f802438361 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1861824 Change-Id: I7d247c28a9d6270a0d187a326b43bc60e3f5dfa3
diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml index 0c7e58e..b2c0ccd 100644 --- a/compatibility_matrices/compatibility_matrix.current.xml +++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -276,6 +276,15 @@ <instance>default</instance> </interface> </hal> + <!-- TODO(b/177269435): require health AIDL HAL and deprecate HIDL HAL --> + <hal format="aidl" optional="true"> + <name>android.hardware.health</name> + <version>1</version> + <interface> + <name>IHealth</name> + <instance>default</instance> + </interface> + </hal> <hal format="aidl" optional="true"> <name>android.hardware.health.storage</name> <version>1</version>