Merge "TIF: Unhide TvInputInfo.isHidden/loadCustomLabel" into nyc-dev
diff --git a/api/current.txt b/api/current.txt
index 0337e11..7fdd5db 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22914,7 +22914,9 @@
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 15b1e78..e940378 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -22923,7 +22923,9 @@
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 c6dece4..f0a9426 100644
--- a/media/java/android/media/tv/TvInputInfo.java
+++ b/media/java/android/media/tv/TvInputInfo.java
@@ -421,9 +421,7 @@
* @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 @@
* @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());
}