Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TIF: fix documentation in TvContract" into oc-dev

Browse Source 
am: e1a795379d

Change-Id: Ibe63e4397fac8c1a5d0190ae10dcf4598e1fd1ca
This commit is contained in:
Dongwon Kang
2017-04-26 16:27:39 +00:00
committed by android-build-merger
parent ecbe5f0305 e1a795379d
commit edf3936f17
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/java/android/media/tv/TvContract.java
View File

@@ -1488,8 +1488,7 @@ public final class TvContract {
/**
* The URI for the preview video.
*
* <p>This is only relevant to {@link Channels#TYPE_PREVIEW}. The data in the column must be
* a URL, or a URI in one of the following formats:
* <p>The data in the column must be a URL, or a URI in one of the following formats:
*
* <ul>
* <li>content ({@link android.content.ContentResolver#SCHEME_CONTENT})</li>
@@ -1505,9 +1504,8 @@ public final class TvContract {
String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri";
/**
* The last playback position (in milliseconds) of the preview video.
*
* <p>This is only relevant to {@link Channels#TYPE_PREVIEW}.
* The last playback position (in milliseconds) of the original content of this preview
* program.
*
* <p>Can be empty.
*
@@ -1517,9 +1515,7 @@ public final class TvContract {
"last_playback_position_millis";
/**
* The duration (in milliseconds) of the preview video.
*
* <p>This is only relevant to {@link Channels#TYPE_PREVIEW}.
* The duration (in milliseconds) of the original content of this preview program.
*
* <p>Can be empty.
*