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

Commit 756984be authored by Jae Seo's avatar Jae Seo Committed by android-build-merger
Browse files

Merge "TIF: Unhide URI util methods" into nyc-dev am: eefb17ac 

am: 1300e14d

* commit '1300e14d':
  TIF: Unhide URI util methods
parents 478d16d6 1300e14d

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -22760,6 +22760,10 @@ package android.media.tv { 
    method public static final android.net.Uri buildProgramsUriForChannel(long, long, long);

    method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long);

    method public static final android.net.Uri buildRecordedProgramUri(long);

    method public static final boolean isChannelUri(android.net.Uri);

    method public static final boolean isChannelUriForPassthroughInput(android.net.Uri);

    method public static final boolean isChannelUriForTunerInput(android.net.Uri);

    method public static final boolean isProgramUri(android.net.Uri);

    field public static final java.lang.String AUTHORITY = "android.media.tv";

  }

























api/system-current.txt



+3
−0




























Original line number
Diff line number
Diff line








@@ -24390,7 +24390,10 @@ package android.media.tv {













    method public static final android.net.Uri buildProgramsUriForChannel(long, long, long);















    method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long);















    method public static final android.net.Uri buildRecordedProgramUri(long);













    method public static final boolean isChannelUri(android.net.Uri);















    method public static final boolean isChannelUriForPassthroughInput(android.net.Uri);













    method public static final boolean isChannelUriForTunerInput(android.net.Uri);













    method public static final boolean isProgramUri(android.net.Uri);















    field public static final java.lang.String AUTHORITY = "android.media.tv";















  }







































api/test-current.txt



+4
−0




























Original line number
Diff line number
Diff line








@@ -22769,6 +22769,10 @@ package android.media.tv {













    method public static final android.net.Uri buildProgramsUriForChannel(long, long, long);















    method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long);















    method public static final android.net.Uri buildRecordedProgramUri(long);













    method public static final boolean isChannelUri(android.net.Uri);













    method public static final boolean isChannelUriForPassthroughInput(android.net.Uri);













    method public static final boolean isChannelUriForTunerInput(android.net.Uri);













    method public static final boolean isProgramUri(android.net.Uri);















    field public static final java.lang.String AUTHORITY = "android.media.tv";















  }







































media/java/android/media/tv/TvContract.java



+4
−9




























Original line number
Diff line number
Diff line








@@ -312,33 +312,28 @@ public final class TvContract {













    }































    /**













     * Returns true, if {@code uri} is a channel URI.













     * @hide













     * Returns {@code true}, if {@code uri} is a channel URI.















     */















    public static final boolean isChannelUri(Uri uri) {















        return isChannelUriForTunerInput(uri) || isChannelUriForPassthroughInput(uri);















    }































    /**













     * Returns true, if {@code uri} is a channel URI for a tuner input.













     * @hide













     * Returns {@code true}, if {@code uri} is a channel URI for a tuner input.















     */















    public static final boolean isChannelUriForTunerInput(Uri uri) {















        return isTvUri(uri) && isTwoSegmentUriStartingWith(uri, PATH_CHANNEL);















    }































    /**













     * Returns true, if {@code uri} is a channel URI for a passthrough input.













     * @hide













     * Returns {@code true}, if {@code uri} is a channel URI for a pass-through input.















     */













    @SystemApi















    public static final boolean isChannelUriForPassthroughInput(Uri uri) {















        return isTvUri(uri) && isTwoSegmentUriStartingWith(uri, PATH_PASSTHROUGH);















    }































    /**













     * Returns true, if {@code uri} is a program URI.













     * @hide













     * Returns {@code true}, if {@code uri} is a program URI.















     */















    public static final boolean isProgramUri(Uri uri) {















        return isTvUri(uri) && isTwoSegmentUriStartingWith(uri, PATH_PROGRAM);