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

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

Merge "TIF: Remove redundant modifiers in TvContract" into oc-dev am: 32e45042 

am: bf9f8021

Change-Id: I36f91c211b1fe69ff887e207b15b165ae9e563a1
parents 1507baaf bf9f8021

api/current.txt

+20 −20
Original line number Diff line number Diff line
@@ -24476,26 +24476,26 @@ package android.media.tv { 
  }















  public final class TvContract {













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













    method public static final android.net.Uri buildChannelLogoUri(android.net.Uri);













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













    method public static final android.net.Uri buildChannelUriForPassthroughInput(java.lang.String);













    method public static final android.net.Uri buildChannelsUriForInput(java.lang.String);













    method public static final java.lang.String buildInputId(android.content.ComponentName);













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













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













    method public static final android.net.Uri buildPreviewProgramsUriForChannel(android.net.Uri);













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













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













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













    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 android.net.Uri buildWatchNextProgramUri(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);













    method public static android.net.Uri buildChannelLogoUri(long);













    method public static android.net.Uri buildChannelLogoUri(android.net.Uri);













    method public static android.net.Uri buildChannelUri(long);













    method public static android.net.Uri buildChannelUriForPassthroughInput(java.lang.String);













    method public static android.net.Uri buildChannelsUriForInput(java.lang.String);













    method public static java.lang.String buildInputId(android.content.ComponentName);













    method public static android.net.Uri buildPreviewProgramUri(long);













    method public static android.net.Uri buildPreviewProgramsUriForChannel(long);













    method public static android.net.Uri buildPreviewProgramsUriForChannel(android.net.Uri);













    method public static android.net.Uri buildProgramUri(long);













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













    method public static android.net.Uri buildProgramsUriForChannel(android.net.Uri);













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













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













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













    method public static android.net.Uri buildWatchNextProgramUri(long);













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













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













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













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















    field public static final java.lang.String ACTION_MAKE_CHANNEL_BROWSABLE = "android.media.tv.action.MAKE_CHANNEL_BROWSABLE";















    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT = "android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT";















    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED";

























api/system-current.txt



+22
−22




























Original line number
Diff line number
Diff line








@@ -26407,28 +26407,28 @@ package android.media.tv {













  }





























  public final class TvContract {













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













    method public static final android.net.Uri buildChannelLogoUri(android.net.Uri);













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













    method public static final android.net.Uri buildChannelUriForPassthroughInput(java.lang.String);













    method public static final android.net.Uri buildChannelsUriForInput(java.lang.String);













    method public static final android.net.Uri buildChannelsUriForInput(java.lang.String, boolean);













    method public static final android.net.Uri buildChannelsUriForInput(java.lang.String, java.lang.String, boolean);













    method public static final java.lang.String buildInputId(android.content.ComponentName);













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













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













    method public static final android.net.Uri buildPreviewProgramsUriForChannel(android.net.Uri);













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













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













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













    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 android.net.Uri buildWatchNextProgramUri(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);













    method public static android.net.Uri buildChannelLogoUri(long);













    method public static android.net.Uri buildChannelLogoUri(android.net.Uri);













    method public static android.net.Uri buildChannelUri(long);













    method public static android.net.Uri buildChannelUriForPassthroughInput(java.lang.String);













    method public static android.net.Uri buildChannelsUriForInput(java.lang.String);













    method public static android.net.Uri buildChannelsUriForInput(java.lang.String, boolean);













    method public static android.net.Uri buildChannelsUriForInput(java.lang.String, java.lang.String, boolean);













    method public static java.lang.String buildInputId(android.content.ComponentName);













    method public static android.net.Uri buildPreviewProgramUri(long);













    method public static android.net.Uri buildPreviewProgramsUriForChannel(long);













    method public static android.net.Uri buildPreviewProgramsUriForChannel(android.net.Uri);













    method public static android.net.Uri buildProgramUri(long);













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













    method public static android.net.Uri buildProgramsUriForChannel(android.net.Uri);













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













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













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













    method public static android.net.Uri buildWatchNextProgramUri(long);













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













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













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













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















    field public static final java.lang.String ACTION_MAKE_CHANNEL_BROWSABLE = "android.media.tv.action.MAKE_CHANNEL_BROWSABLE";















    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT = "android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT";















    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED";

























api/test-current.txt



+20
−20




























Original line number
Diff line number
Diff line








@@ -24589,26 +24589,26 @@ package android.media.tv {













  }





























  public final class TvContract {













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













    method public static final android.net.Uri buildChannelLogoUri(android.net.Uri);













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













    method public static final android.net.Uri buildChannelUriForPassthroughInput(java.lang.String);













    method public static final android.net.Uri buildChannelsUriForInput(java.lang.String);













    method public static final java.lang.String buildInputId(android.content.ComponentName);













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













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













    method public static final android.net.Uri buildPreviewProgramsUriForChannel(android.net.Uri);













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













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













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













    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 android.net.Uri buildWatchNextProgramUri(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);













    method public static android.net.Uri buildChannelLogoUri(long);













    method public static android.net.Uri buildChannelLogoUri(android.net.Uri);













    method public static android.net.Uri buildChannelUri(long);













    method public static android.net.Uri buildChannelUriForPassthroughInput(java.lang.String);













    method public static android.net.Uri buildChannelsUriForInput(java.lang.String);













    method public static java.lang.String buildInputId(android.content.ComponentName);













    method public static android.net.Uri buildPreviewProgramUri(long);













    method public static android.net.Uri buildPreviewProgramsUriForChannel(long);













    method public static android.net.Uri buildPreviewProgramsUriForChannel(android.net.Uri);













    method public static android.net.Uri buildProgramUri(long);













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













    method public static android.net.Uri buildProgramsUriForChannel(android.net.Uri);













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













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













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













    method public static android.net.Uri buildWatchNextProgramUri(long);













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













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













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













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















    field public static final java.lang.String ACTION_MAKE_CHANNEL_BROWSABLE = "android.media.tv.action.MAKE_CHANNEL_BROWSABLE";















    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT = "android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT";















    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED";

























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



+96
−96


























File changed.
Preview size limit exceeded, changes collapsed.