Merge "Update TvMessageEvent to include a deviceId field" into main

compatibility_matrices/compatibility_matrix.9.xml

@@ -601,7 +601,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>android.hardware.tv.input</name>
-        <version>1</version>
+        <version>1-2</version>
         <interface>
             <name>ITvInput</name>
             <instance>default</instance>

tv/input/aidl/Android.bp

@@ -35,6 +35,5 @@ aidl_interface {
             ],
         },
     ],
-    frozen: true,
-
+    frozen: false,
 }

tv/input/aidl/aidl_api/android.hardware.tv.input/current/android/hardware/tv/input/TvMessageEvent.aidl

@@ -37,4 +37,5 @@ parcelable TvMessageEvent {
   android.hardware.tv.input.TvMessageEventType type;
   int streamId;
   android.hardware.tv.input.TvMessage[] messages;
+  int deviceId;
 }

tv/input/aidl/android/hardware/tv/input/ITvInputCallback.aidl

@@ -32,17 +32,20 @@ interface ITvInputCallback {
      * Notifies the client that an TV message event has occurred. For possible event types,
      * check {@link android.hardware.tv.input.TvMessageEventType}.
      *
-     * The first message in a list of messages contained in a
+     * <p> For implementations of version 1, The first message in a list of messages contained in a
      * {@link android.hardware.tv.input.TvMessageEvent} should always have a
      * {@link android.hardware.tv.input.TvMessage#subType} of "device_id",
      * otherwise the event is discarded. When the subType of a message is "device_id", the ID of
      * the device that sent the message should be contained in
-     * {@link android.hardware.tv.input.TvMessage#groupId}
+     * {@link android.hardware.tv.input.TvMessage#groupId}.
      *
-     * Invoking this callback for the first time immediately triggers
+     * <p> For version 2 and beyond, the device ID should be contained in
+     * {@link android.hardware.tv.input.TvMessageEvent#deviceId}.
+     *
+     * <p> Invoking this callback for the first time immediately triggers
      * {@link android.hardware.tv.input.ITvInput#getTvMessageQueueDesc}. It is
-     * expected for the queue to be ready with
-     * the relevant messages for the event before this callback is called.
+     * expected for the queue to be ready with the relevant messages for the event before this
+     * callback is called.
      *
      * @param event Event passed to the client.
      */

tv/input/aidl/android/hardware/tv/input/TvMessageEvent.aidl

@@ -25,4 +25,5 @@ parcelable TvMessageEvent {
 
     int streamId;
     TvMessage[] messages;
+    int deviceId;
 }

tv/input/aidl/vts/functional/Android.bp

@@ -32,7 +32,7 @@ cc_test {
         "libvndksupport",
         "libfmq",
         "android.hardware.common.fmq-V1-ndk",
-        "android.hardware.tv.input-V1-ndk",
+        "android.hardware.tv.input-V2-ndk",
     ],
     require_root: true,
 }