Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bb002ef authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 62d74616 50421b58

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -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();

api/system-removed.txt

+0 −7
Original line number Diff line number Diff line
@@ -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);

  }

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

+0 −4
Original line number Diff line number Diff line
@@ -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