From ed12cd22aebbb4844c607414366fd043e3ee16ca Mon Sep 17 00:00:00 2001
From: Hongguang <hgchen@google.com>
Date: Mon, 23 Aug 2021 19:53:40 -0700
Subject: [PATCH] Deprecate tuner filter 32 bit ID getter API.

The filter Id will be 64 on both 32-bit and 64-bit systems.

Bug: 197114423
Fix: 197114423
Test: atest android.media.tv.tuner.cts
Change-Id: I285e6008e0447138a48c971ce9ee7a1172f83116
---
 core/api/system-current.txt                          | 2 +-
 media/java/android/media/tv/tuner/filter/Filter.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 6727031f7a1c4..368fed335e396 100755
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -6197,7 +6197,7 @@ package android.media.tv.tuner.filter {
     method public void close();
     method public int configure(@NonNull android.media.tv.tuner.filter.FilterConfiguration);
     method public int flush();
-    method public int getId();
+    method @Deprecated public int getId();
     method public long getIdLong();
     method public int read(@NonNull byte[], long, long);
     method public int setDataSource(@Nullable android.media.tv.tuner.filter.Filter);
diff --git a/media/java/android/media/tv/tuner/filter/Filter.java b/media/java/android/media/tv/tuner/filter/Filter.java
index e7612bc08e50e..bd860d9e3492e 100644
--- a/media/java/android/media/tv/tuner/filter/Filter.java
+++ b/media/java/android/media/tv/tuner/filter/Filter.java
@@ -333,6 +333,7 @@ public class Filter implements AutoCloseable {
     /**
      * Gets the filter Id in 32-bit. For any Tuner SoC that supports 64-bit filter architecture,
      * use {@link #getIdLong()}.
+     * @deprecated Use {@link #getIdLong()} for both 32-bit and 64-bit filter architectures.
      */
     public int getId() {
         synchronized (mLock) {
@@ -342,8 +343,7 @@ public class Filter implements AutoCloseable {
     }
 
     /**
-     * Gets the 64-bit filter Id. For any Tuner SoC that supports 32-bit filter architecture,
-     * use {@link #getId()}.
+     * Gets the filter Id.
      */
     public long getIdLong() {
         synchronized (mLock) {