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

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

Merge "TIF: Unhide TvInputInfo.isHidden/loadCustomLabel" into nyc-dev am: 8da2bf49 

am: 2a94f9b7

* commit '2a94f9b7':
  TIF: Unhide TvInputInfo.isHidden/loadCustomLabel
parents 09133f1d 2a94f9b7

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -22917,7 +22917,9 @@ package android.media.tv { 
    method public android.content.pm.ServiceInfo getServiceInfo();

    method public int getTunerCount();

    method public int getType();

    method public boolean isHidden(android.content.Context);

    method public boolean isPassthroughInput();

    method public java.lang.CharSequence loadCustomLabel(android.content.Context);

    method public android.graphics.drawable.Drawable loadIcon(android.content.Context);

    method public java.lang.CharSequence loadLabel(android.content.Context);

    method public void writeToParcel(android.os.Parcel, int);

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -22926,7 +22926,9 @@ package android.media.tv { 
    method public android.content.pm.ServiceInfo getServiceInfo();

    method public int getTunerCount();

    method public int getType();

    method public boolean isHidden(android.content.Context);

    method public boolean isPassthroughInput();

    method public java.lang.CharSequence loadCustomLabel(android.content.Context);

    method public android.graphics.drawable.Drawable loadIcon(android.content.Context);

    method public java.lang.CharSequence loadLabel(android.content.Context);

    method public void writeToParcel(android.os.Parcel, int);

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

+0 −4
Original line number Diff line number Diff line
@@ -421,9 +421,7 @@ public final class TvInputInfo implements Parcelable { 
     * @param context Supplies a {@link Context} used to check if this TV input is hidden.

     * @return {@code true} if the user marked this TV input hidden in settings. {@code false}

     *         otherwise.

     * @hide

     */

    @SystemApi

    public boolean isHidden(Context context) {

        return TvInputSettings.isHidden(context, mId, UserHandle.myUserId());

    }
@@ -451,9 +449,7 @@ public final class TvInputInfo implements Parcelable { 
     * @param context Supplies a {@link Context} used to load the custom label.

     * @return a CharSequence containing the TV input's custom label. {@code null} if there is no

     *         custom label.

     * @hide

     */

    @SystemApi

    public CharSequence loadCustomLabel(Context context) {

        return TvInputSettings.getCustomLabel(context, mId, UserHandle.myUserId());

    }