From edbe2652f99195687f461a7a651cf147ea17cf5a Mon Sep 17 00:00:00 2001
From: Dongwon Kang <dwkang@google.com>
Date: Fri, 12 Feb 2016 11:07:25 -0800
Subject: [PATCH] TIF: Unhide TvInputInfo.isHidden/loadCustomLabel

Needed to load input preferences set by user in settings.

Bug: 26850395
Change-Id: I5cd4e2474724c247c765cafa829fc9d7f363da45
---
 api/current.txt                              | 2 ++
 api/test-current.txt                         | 2 ++
 media/java/android/media/tv/TvInputInfo.java | 4 ----
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index ab52161268faf..73a5817209da4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22910,7 +22910,9 @@ package android.media.tv {
     method public android.content.pm.ServiceInfo getServiceInfo();
     method public int getTunerCount();
     method public int getType();
+    method public boolean isHidden(android.content.Context);
     method public boolean isPassthroughInput();
+    method public java.lang.CharSequence loadCustomLabel(android.content.Context);
     method public android.graphics.drawable.Drawable loadIcon(android.content.Context);
     method public java.lang.CharSequence loadLabel(android.content.Context);
     method public void writeToParcel(android.os.Parcel, int);
diff --git a/api/test-current.txt b/api/test-current.txt
index e716292be4dac..3b8561fad3d6c 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -22919,7 +22919,9 @@ package android.media.tv {
     method public android.content.pm.ServiceInfo getServiceInfo();
     method public int getTunerCount();
     method public int getType();
+    method public boolean isHidden(android.content.Context);
     method public boolean isPassthroughInput();
+    method public java.lang.CharSequence loadCustomLabel(android.content.Context);
     method public android.graphics.drawable.Drawable loadIcon(android.content.Context);
     method public java.lang.CharSequence loadLabel(android.content.Context);
     method public void writeToParcel(android.os.Parcel, int);
diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java
index c6dece454de37..f0a94268d5333 100644
--- a/media/java/android/media/tv/TvInputInfo.java
+++ b/media/java/android/media/tv/TvInputInfo.java
@@ -421,9 +421,7 @@ public final class TvInputInfo implements Parcelable {
      * @param context Supplies a {@link Context} used to check if this TV input is hidden.
      * @return {@code true} if the user marked this TV input hidden in settings. {@code false}
      *         otherwise.
-     * @hide
      */
-    @SystemApi
     public boolean isHidden(Context context) {
         return TvInputSettings.isHidden(context, mId, UserHandle.myUserId());
     }
@@ -451,9 +449,7 @@ public final class TvInputInfo implements Parcelable {
      * @param context Supplies a {@link Context} used to load the custom label.
      * @return a CharSequence containing the TV input's custom label. {@code null} if there is no
      *         custom label.
-     * @hide
      */
-    @SystemApi
     public CharSequence loadCustomLabel(Context context) {
         return TvInputSettings.getCustomLabel(context, mId, UserHandle.myUserId());
     }