diff options
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | api/system-removed.txt | 7 | ||||
| -rw-r--r-- | media/java/android/media/tv/TvInputInfo.java | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 45372362f627..e249a213b646 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -27045,6 +27045,10 @@ package android.media.tv { method public boolean canRecord(); method public deprecated android.content.Intent createSettingsIntent(); method public android.content.Intent createSetupIntent(); + method public static deprecated android.media.tv.TvInputInfo createTvInputInfo(android.content.Context, android.content.pm.ResolveInfo, android.hardware.hdmi.HdmiDeviceInfo, java.lang.String, 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.hardware.hdmi.HdmiDeviceInfo, java.lang.String, int, android.graphics.drawable.Icon) 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, 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(); diff --git a/api/system-removed.txt b/api/system-removed.txt index 53794d1e4c47..4f78176e8c51 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -271,13 +271,6 @@ package android.media { package android.media.tv { - public final class TvInputInfo implements android.os.Parcelable { - method public static deprecated android.media.tv.TvInputInfo createTvInputInfo(android.content.Context, android.content.pm.ResolveInfo, android.hardware.hdmi.HdmiDeviceInfo, java.lang.String, 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.hardware.hdmi.HdmiDeviceInfo, java.lang.String, int, android.graphics.drawable.Icon) 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, 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; - } - public final class TvInputManager { method public android.media.tv.TvInputManager.Hardware acquireTvInputHardware(int, android.media.tv.TvInputManager.HardwareCallback, android.media.tv.TvInputInfo); } diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java index 8eba39404d17..74085d39162c 100644 --- a/media/java/android/media/tv/TvInputInfo.java +++ b/media/java/android/media/tv/TvInputInfo.java @@ -161,7 +161,6 @@ public final class TvInputInfo implements Parcelable { * {@link android.content.ContentResolver#openInputStream}. If it is {@code null}, * the application icon of {@code service} will be loaded. * @hide - * @removed * @deprecated Use {@link Builder} instead. */ @Deprecated @@ -190,7 +189,6 @@ public final class TvInputInfo implements Parcelable { * @param icon The {@link android.graphics.drawable.Icon} to load the icon image. If it is * {@code null}, the application icon of {@code service} will be loaded. * @hide - * @removed * @deprecated Use {@link Builder} instead. */ @Deprecated @@ -218,7 +216,6 @@ public final class TvInputInfo implements Parcelable { * {@link android.content.ContentResolver#openInputStream}. If it is {@code null}, * the application icon of {@code service} will be loaded. * @hide - * @removed * @deprecated Use {@link Builder} instead. */ @Deprecated @@ -245,7 +242,6 @@ public final class TvInputInfo implements Parcelable { * @param icon The {@link android.graphics.drawable.Icon} to load the icon image. If it is * {@code null}, the application icon of {@code service} will be loaded. * @hide - * @removed * @deprecated Use {@link Builder} instead. */ @Deprecated |