From 313bab56119627d5634f3e2d60d224bc4d3b94d0 Mon Sep 17 00:00:00 2001
From: Amy Zhang <amyjojo@google.com>
Date: Wed, 19 Aug 2020 12:57:53 -0700
Subject: [PATCH] Expose MediaEvent.release() as System API in Android S

Test: make
Bug: 165403626
Change-Id: Ibd3068ab8c68b0d6deed203f3d8878558bd1c479
---
 api/system-current.txt                                   | 1 +
 media/java/android/media/tv/tuner/filter/MediaEvent.java | 1 -
 non-updatable-api/system-current.txt                     | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index d6fc9af892db6..c81c1ef378e54 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5329,6 +5329,7 @@ package android.media.tv.tuner.filter {
     method public boolean isPrivateData();
     method public boolean isPtsPresent();
     method public boolean isSecureMemory();
+    method public void release();
   }
 
   public final class MmtpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {
diff --git a/media/java/android/media/tv/tuner/filter/MediaEvent.java b/media/java/android/media/tv/tuner/filter/MediaEvent.java
index 57a04fd70a0bf..91be5c38d6938 100644
--- a/media/java/android/media/tv/tuner/filter/MediaEvent.java
+++ b/media/java/android/media/tv/tuner/filter/MediaEvent.java
@@ -187,7 +187,6 @@ public class MediaEvent extends FilterEvent {
 
     /**
      * Releases the MediaEvent object.
-     * @hide
      */
     public void release() {
         synchronized (mLock) {
diff --git a/non-updatable-api/system-current.txt b/non-updatable-api/system-current.txt
index 2f0f4c3ab68e4..47c1493ea69c9 100644
--- a/non-updatable-api/system-current.txt
+++ b/non-updatable-api/system-current.txt
@@ -5269,6 +5269,7 @@ package android.media.tv.tuner.filter {
     method public boolean isPrivateData();
     method public boolean isPtsPresent();
     method public boolean isSecureMemory();
+    method public void release();
   }
 
   public final class MmtpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {