From 1c640b9548ec2d69db5d84e24e9a7e2a6a921255 Mon Sep 17 00:00:00 2001
From: David Zhao <qingxun@google.com>
Date: Wed, 25 Jan 2023 15:21:11 -0800
Subject: [PATCH] Unhide sendTvRecordingInfo

Also contains minor updates to javadoc.

Bug: 261648703
Test: atest android.media.tv.interactive
Change-Id: If23d09283cf3fec5472a9d11d1b157565d2b2d13
---
 core/api/current.txt                                        | 2 ++
 .../media/tv/interactive/TvInteractiveAppService.java       | 6 +++---
 .../android/media/tv/interactive/TvInteractiveAppView.java  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index bca9913ff94ec..4ea70fea192e2 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -27414,6 +27414,7 @@ package android.media.tv.interactive {
     method public boolean onTrackballEvent(@NonNull android.view.MotionEvent);
     method public void onTracksChanged(@NonNull java.util.List<android.media.tv.TvTrackInfo>);
     method public void onTuned(@NonNull android.net.Uri);
+    method public void onTvRecordingInfo(@Nullable android.media.tv.TvRecordingInfo);
     method public void onVideoAvailable();
     method public void onVideoUnavailable(int);
     method @CallSuper public void removeBroadcastInfo(int);
@@ -27476,6 +27477,7 @@ package android.media.tv.interactive {
     method public void sendSigningResult(@NonNull String, @NonNull byte[]);
     method public void sendStreamVolume(float);
     method public void sendTrackInfoList(@Nullable java.util.List<android.media.tv.TvTrackInfo>);
+    method public void sendTvRecordingInfo(@Nullable android.media.tv.TvRecordingInfo);
     method public void setCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.interactive.TvInteractiveAppView.TvInteractiveAppCallback);
     method public void setOnUnhandledInputEventListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.interactive.TvInteractiveAppView.OnUnhandledInputEventListener);
     method public void setTeletextAppEnabled(boolean);
diff --git a/media/java/android/media/tv/interactive/TvInteractiveAppService.java b/media/java/android/media/tv/interactive/TvInteractiveAppService.java
index 360073d1486f4..b7141d19a528f 100755
--- a/media/java/android/media/tv/interactive/TvInteractiveAppService.java
+++ b/media/java/android/media/tv/interactive/TvInteractiveAppService.java
@@ -606,10 +606,10 @@ public abstract class TvInteractiveAppService extends Service {
         }
 
         /**
-         * Receives requested recording info.
+         * Receives the requested {@link android.media.tv.TvRecordingInfo}.
          *
-         * @param recordingInfo The requested recording info. Null if recording not found.
-         * @hide
+         * @see #requestTvRecordingInfo(String)
+         * @param recordingInfo The requested recording info. {@code null} if no recording found.
          */
         public void onTvRecordingInfo(@Nullable TvRecordingInfo recordingInfo) {
         }
diff --git a/media/java/android/media/tv/interactive/TvInteractiveAppView.java b/media/java/android/media/tv/interactive/TvInteractiveAppView.java
index 78c6bcf4455f3..ae04ce80aa2d6 100755
--- a/media/java/android/media/tv/interactive/TvInteractiveAppView.java
+++ b/media/java/android/media/tv/interactive/TvInteractiveAppView.java
@@ -635,8 +635,8 @@ public class TvInteractiveAppView extends ViewGroup {
     /**
      * Sends the requested {@link android.media.tv.TvRecordingInfo}.
      *
-     * @param recordingInfo The recording info requested {@code null} if no recording found.
-     * @hide
+     * @see TvInteractiveAppService.Session#requestTvRecordingInfo(String)
+     * @param recordingInfo The recording info requested. {@code null} if no recording found.
      */
     public void sendTvRecordingInfo(@Nullable TvRecordingInfo recordingInfo) {
         if (DEBUG) {