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

am 2be6622b: am 99f6c2a0: Merge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." into mnc-dev

Browse Source 
* commit '2be6622b9655e5f7cba7107edbdfefd83be8fa3f':
  TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.
This commit is contained in:
Dongwon Kang
2015-04-28 14:55:00 +00:00
committed by Android Git Automerger
parent f4476e67df 2be6622b96
commit 664660686a
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/tv/TvInputManager.java
View File

@@ -1696,6 +1696,8 @@ public final class TvInputManager {
* @param rate The ratio between desired playback rate and normal one. * @param rate The ratio between desired playback rate and normal one.
* @param audioMode Audio playback mode. Must be one of the supported audio modes: * @param audioMode Audio playback mode. Must be one of the supported audio modes:
* <ul> * <ul>
* <li> {@link android.media.MediaPlayer#PLAYBACK_RATE_AUDIO_MODE_DEFAULT}
* <li> {@link android.media.MediaPlayer#PLAYBACK_RATE_AUDIO_MODE_STRETCH}
* <li> {@link android.media.MediaPlayer#PLAYBACK_RATE_AUDIO_MODE_RESAMPLE} * <li> {@link android.media.MediaPlayer#PLAYBACK_RATE_AUDIO_MODE_RESAMPLE}
* </ul> * </ul>
*/ */

2
media/java/android/media/tv/TvInputService.java
View File

@@ -891,6 +891,8 @@ public abstract class TvInputService extends Service {
* @param rate The ratio between desired playback rate and normal one. * @param rate The ratio between desired playback rate and normal one.
* @param audioMode Audio playback mode. Must be one of the supported audio modes: * @param audioMode Audio playback mode. Must be one of the supported audio modes:
* <ul> * <ul>
* <li> {@link android.media.MediaPlayer#PLAYBACK_RATE_AUDIO_MODE_DEFAULT}
* <li> {@link android.media.MediaPlayer#PLAYBACK_RATE_AUDIO_MODE_STRETCH}
* <li> {@link android.media.MediaPlayer#PLAYBACK_RATE_AUDIO_MODE_RESAMPLE} * <li> {@link android.media.MediaPlayer#PLAYBACK_RATE_AUDIO_MODE_RESAMPLE}
* </ul> * </ul>
* @see #onTimeShiftResume * @see #onTimeShiftResume

2
media/java/android/media/tv/TvView.java
View File

@@ -457,6 +457,8 @@ public class TvView extends ViewGroup {
* @param rate The ratio between desired playback rate and normal one. * @param rate The ratio between desired playback rate and normal one.
* @param audioMode Audio playback mode. Must be one of the supported audio modes: * @param audioMode Audio playback mode. Must be one of the supported audio modes:
* <ul> * <ul>
* <li> {@link android.media.MediaPlayer#PLAYBACK_RATE_AUDIO_MODE_DEFAULT}
* <li> {@link android.media.MediaPlayer#PLAYBACK_RATE_AUDIO_MODE_STRETCH}
* <li> {@link android.media.MediaPlayer#PLAYBACK_RATE_AUDIO_MODE_RESAMPLE} * <li> {@link android.media.MediaPlayer#PLAYBACK_RATE_AUDIO_MODE_RESAMPLE}
* </ul> * </ul>
*/ */