From e9db0e1ed1de9d4e5f5c26480c1a831a82e35883 Mon Sep 17 00:00:00 2001 From: Dongwon Kang Date: Mon, 11 Apr 2016 08:27:24 -0700 Subject: [PATCH] TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra() Bug: 28078300 Change-Id: I0546c80b50475b1f05d5c5229f6d3796c7372b60 --- api/current.txt | 2 ++ api/system-current.txt | 2 ++ api/test-current.txt | 2 ++ media/java/android/media/tv/TvInputInfo.java | 10 +++++----- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/api/current.txt b/api/current.txt index 5dfb0053983ec..f4f8c97e517bf 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22965,6 +22965,7 @@ package android.media.tv { method public android.content.Intent createSettingsIntent(); method public android.content.Intent createSetupIntent(); method public int describeContents(); + method public android.os.Bundle getExtras(); method public java.lang.String getId(); method public java.lang.String getParentId(); method public android.content.pm.ServiceInfo getServiceInfo(); @@ -22994,6 +22995,7 @@ package android.media.tv { ctor public TvInputInfo.Builder(android.content.Context, android.content.ComponentName); method public android.media.tv.TvInputInfo build() throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public android.media.tv.TvInputInfo.Builder setCanRecord(boolean); + method public android.media.tv.TvInputInfo.Builder setExtras(android.os.Bundle); method public android.media.tv.TvInputInfo.Builder setTunerCount(int); } diff --git a/api/system-current.txt b/api/system-current.txt index 3febd2915accd..a7bf3e652dda0 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -24622,6 +24622,7 @@ package android.media.tv { method public static deprecated android.media.tv.TvInputInfo createTvInputInfo(android.content.Context, android.content.pm.ResolveInfo, android.media.tv.TvInputHardwareInfo, java.lang.String, android.net.Uri) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public static deprecated android.media.tv.TvInputInfo createTvInputInfo(android.content.Context, android.content.pm.ResolveInfo, android.media.tv.TvInputHardwareInfo, int, android.graphics.drawable.Icon) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public int describeContents(); + method public android.os.Bundle getExtras(); method public android.hardware.hdmi.HdmiDeviceInfo getHdmiDeviceInfo(); method public java.lang.String getId(); method public java.lang.String getParentId(); @@ -24655,6 +24656,7 @@ package android.media.tv { ctor public TvInputInfo.Builder(android.content.Context, android.content.ComponentName); method public android.media.tv.TvInputInfo build() throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public android.media.tv.TvInputInfo.Builder setCanRecord(boolean); + method public android.media.tv.TvInputInfo.Builder setExtras(android.os.Bundle); method public android.media.tv.TvInputInfo.Builder setHdmiDeviceInfo(android.hardware.hdmi.HdmiDeviceInfo); method public android.media.tv.TvInputInfo.Builder setIcon(android.graphics.drawable.Icon); method public android.media.tv.TvInputInfo.Builder setIcon(android.graphics.drawable.Icon, int); diff --git a/api/test-current.txt b/api/test-current.txt index 7805613d291af..c78da1bbdcba8 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -23033,6 +23033,7 @@ package android.media.tv { method public android.content.Intent createSettingsIntent(); method public android.content.Intent createSetupIntent(); method public int describeContents(); + method public android.os.Bundle getExtras(); method public java.lang.String getId(); method public java.lang.String getParentId(); method public android.content.pm.ServiceInfo getServiceInfo(); @@ -23062,6 +23063,7 @@ package android.media.tv { ctor public TvInputInfo.Builder(android.content.Context, android.content.ComponentName); method public android.media.tv.TvInputInfo build() throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public android.media.tv.TvInputInfo.Builder setCanRecord(boolean); + method public android.media.tv.TvInputInfo.Builder setExtras(android.os.Bundle); method public android.media.tv.TvInputInfo.Builder setTunerCount(int); } diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java index 03dc6995c7985..0b648765cafac 100644 --- a/media/java/android/media/tv/TvInputInfo.java +++ b/media/java/android/media/tv/TvInputInfo.java @@ -369,8 +369,7 @@ public final class TvInputInfo implements Parcelable { } /** - * Returns the extras associated with this TV input. - * @hide + * Returns domain-specific extras associated with this TV input. */ public Bundle getExtras() { return mExtras; @@ -847,11 +846,12 @@ public final class TvInputInfo implements Parcelable { } /** - * Sets the extras associated with this TV input. + * Sets domain-specific extras associated with this TV input. * - * @param extras The extras associated with this TV input. + * @param extras Domain-specific extras associated with this TV input. Keys must be + * a scoped name, i.e. prefixed with a package name you own, so that different + * developers will not create conflicting keys. * @return This Builder object to allow for chaining of calls to builder methods. - * @hide */ public Builder setExtras(Bundle extras) { this.mExtras = extras;