Merge "TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()"... (5e3c6801) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -22970,6 +22970,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();
		@@ -22999,6 +23000,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);
		}

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -24627,6 +24627,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();
		@@ -24660,6 +24661,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);

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -23038,6 +23038,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();
		@@ -23067,6 +23068,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);
		}

media/java/android/media/tv/TvInputInfo.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -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 <em>must</em> 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;