From 6cc8da91383818ade2b3c0ff28484ed487f0dae2 Mon Sep 17 00:00:00 2001
From: Henry Fang <quxiangfang@google.com>
Date: Tue, 21 Jan 2020 15:21:18 -0800
Subject: [PATCH] Add Media Format key for Tuner

Test: manual
bug: 133525759
Change-Id: I083fa5f210b02c56299ef4625491a157131e897e
---
 api/current.txt                           | 1 +
 media/java/android/media/MediaFormat.java | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index 6f957523e3e14..9b052c36eaeda 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25814,6 +25814,7 @@ package android.media {
     field public static final String KEY_GRID_COLUMNS = "grid-cols";
     field public static final String KEY_GRID_ROWS = "grid-rows";
     field public static final String KEY_HAPTIC_CHANNEL_COUNT = "haptic-channel-count";
+    field public static final String KEY_HARDWARE_AV_SYNC_ID = "hw-av-sync-id";
     field public static final String KEY_HDR10_PLUS_INFO = "hdr10-plus-info";
     field public static final String KEY_HDR_STATIC_INFO = "hdr-static-info";
     field public static final String KEY_HEIGHT = "height";
diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java
index 1a0f13943694b..f408ac344d7cf 100644
--- a/media/java/android/media/MediaFormat.java
+++ b/media/java/android/media/MediaFormat.java
@@ -293,6 +293,14 @@ public final class MediaFormat {
      */
     public static final String KEY_BIT_RATE = "bitrate";
 
+    /**
+     * A key describing the hardware AV sync id.
+     * The associated value is an integer
+     *
+     * @see android.media.tv.tuner.Tuner#getAvSyncHwId
+     */
+    public static final String KEY_HARDWARE_AV_SYNC_ID = "hw-av-sync-id";
+
     /**
      * A key describing the max bitrate in bits/sec.
      * This is usually over a one-second sliding window (e.g. over any window of one second).