| commit | e5f1c034142709bde7bcb0ba5a698a671154b75a | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Fri Dec 10 21:33:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 10 21:33:19 2021 +0000 |
| tree | 18d0e07424abdbc696fcddd482127a9c7db483a6 | |
| parent | 756676341a3e84cd1a36764bf00bfbd4a6acb3a1 [diff] | |
| parent | 5ad3bb1f87520b0ad1d592fb2f071793da5d92d5 [diff] |
Merge "Revert "health: require AIDL HAL and deprecate HIDL HAL."" am: 5ad3bb1f87 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918448 Change-Id: I0488ff4dc0e6d19c562ae6c771f7165886b3b683
diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml index f0311c7..c39db36 100644 --- a/compatibility_matrices/compatibility_matrix.current.xml +++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -267,7 +267,16 @@ <instance>default</instance> </interface> </hal> - <hal format="aidl" optional="false"> + <hal format="hidl" optional="false"> + <name>android.hardware.health</name> + <version>2.1</version> + <interface> + <name>IHealth</name> + <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>