commit | ce2c6d611d31319f4d823e607d4dfa854298c211 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Dec 13 22:05:53 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 13 22:05:53 2021 +0000 |
tree | d8d41f5a309b70040d1f2f02b7756824229d3c9c | |
parent | 4df4387267ec816d06f275731fd13faec60370de [diff] | |
parent | 41aaa16fcaf6d97c7867ec01e52dff40fff34d10 [diff] |
Merge "Revert^2 "health: require AIDL HAL and deprecate HIDL HAL."" am: ac7e154391 am: 41aaa16fca Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918954 Change-Id: I235300ecfc7cc1c8e2294d8ad476bfac31cc1ba4
diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml index c39db36..f0311c7 100644 --- a/compatibility_matrices/compatibility_matrix.current.xml +++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -267,16 +267,7 @@ <instance>default</instance> </interface> </hal> - <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"> + <hal format="aidl" optional="false"> <name>android.hardware.health</name> <version>1</version> <interface>