From 64950a0cce85dfafef52f1702e0f68e5e0c79b24 Mon Sep 17 00:00:00 2001
From: Devin Moore <devinmoore@google.com>
Date: Tue, 4 Apr 2023 21:25:22 +0000
Subject: [PATCH] Allow android.hardware.tv.tuner V2 to be used

Add V2 to the Android 14 framework compatibility matrix.
Also update the tuner-default device manifest fragment to reflect the
version of android.hardware.tv.tuner that it serves.

Test: lunch aosp_cf_x86_64_tv-userdebug && atest hal_implementation_test
Bug: 266868403
Change-Id: I14264dc156d086bc2e25ff41cb71aef37f629e95
---
 compatibility_matrices/compatibility_matrix.8.xml | 2 +-
 tv/tuner/aidl/default/tuner-default.xml           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/compatibility_matrices/compatibility_matrix.8.xml b/compatibility_matrices/compatibility_matrix.8.xml
index 310eaa153a..3940a0ff63 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 f0d03adcea..bff8ff01ed 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>