drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-30 23:20:51 +00:00
committed by Android (Google) Code Review
parent e577a840a1 c871434468
commit 32e45042c9
4 changed files with 158 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
api/current.txt
View File

@ -24507,26 +24507,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";

44
api/system-current.txt
View File

@ -26437,28 +26437,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";

40
api/test-current.txt
View File

@ -24620,26 +24620,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";