| commit | 4678503a57241e9ae80533d930403d2e83575fa0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Apr 05 18:48:57 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 05 18:48:57 2023 +0000 |
| tree | d3cb69be8cc8de2896fb01695c1bf6a28e050a66 | |
| parent | d5ee6341a0c2b010542017e45394eb1bb18af96d [diff] | |
| parent | 810ef4f9c52c8391ca7fcc790843a6a97c4c8316 [diff] |
Merge "Allow android.hardware.tv.tuner V2 to be used" into udc-dev am: 810ef4f9c5 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22463440 Change-Id: I6cd012d0b60120528a15b0c19355ad651c3f3c63 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/compatibility_matrices/compatibility_matrix.8.xml b/compatibility_matrices/compatibility_matrix.8.xml index 875af95..4ac95f5 100644 --- a/compatibility_matrices/compatibility_matrix.8.xml +++ b/compatibility_matrices/compatibility_matrix.8.xml
@@ -623,7 +623,7 @@ </hal> <hal format="aidl" optional="true"> <name>android.hardware.tv.tuner</name> - <version>1</version> + <version>1-2</version> <interface> <name>ITuner</name> <instance>default</instance>
diff --git a/tv/tuner/aidl/default/tuner-default.xml b/tv/tuner/aidl/default/tuner-default.xml index f0d03ad..bff8ff0 100644 --- a/tv/tuner/aidl/default/tuner-default.xml +++ b/tv/tuner/aidl/default/tuner-default.xml
@@ -2,5 +2,6 @@ <hal format="aidl"> <name>android.hardware.tv.tuner</name> <fqname>ITuner/default</fqname> + <version>2</version> </hal> </manifest>