Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()" into nyc-dev

Browse Source
This commit is contained in:
Dongwon Kang
2016-04-13 00:36:33 +00:00
committed by Android (Google) Code Review
parent 03abaa5df9 e9db0e1ed1
commit 4c3dcc0a16
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -22967,6 +22967,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();
@@ -22996,6 +22997,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);
}

2
api/system-current.txt
View File

@@ -24624,6 +24624,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();
@@ -24657,6 +24658,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);

2
api/test-current.txt
View File

@@ -23035,6 +23035,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();
@@ -23064,6 +23065,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);
}

10
media/java/android/media/tv/TvInputInfo.java
View File

@@ -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;