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

Commit 4655cdd5 authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

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

am: 4c3dcc0a

* commit '4c3dcc0a':
  TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()

Change-Id: I3b259c63f6035630a6673e9d6059402c2a635eb1
parents ffc23a68 4c3dcc0a

api/current.txt

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

  }

























api/system-current.txt



+2
−0




























Original line number
Diff line number
Diff line








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

























api/test-current.txt



+2
−0




























Original line number
Diff line number
Diff line








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















  }







































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;