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

Merge "Someone is still using these APIs." into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-12 19:51:30 +00:00
committed by Android (Google) Code Review
parent 62d746169f 50421b58e5
commit 9bb002ef79
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

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

7
api/system-removed.txt
View File

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

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

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