diff options
| author | Dongwon Kang <dwkang@google.com> | 2015-04-28 15:16:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-28 15:16:45 +0000 |
| commit | c64ec04a9aae848835cf7bdbe8e175a623deccf5 (patch) | |
| tree | a8b3e52ddd3e90f61a2ef439d20cfd2447863bec | |
| parent | 9a44aab239cc7b6427aeb7d22582f98df6b9575a (diff) | |
| parent | 664660686a410b09e2126408119cd7088cd03911 (diff) | |
| download | frameworks_base-c64ec04a9aae848835cf7bdbe8e175a623deccf5.zip frameworks_base-c64ec04a9aae848835cf7bdbe8e175a623deccf5.tar.gz frameworks_base-c64ec04a9aae848835cf7bdbe8e175a623deccf5.tar.bz2 | |
am 66466068: am 2be6622b: am 99f6c2a0: Merge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." into mnc-dev
* commit '664660686a410b09e2126408119cd7088cd03911':
TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.
| -rw-r--r-- | media/java/android/media/tv/TvInputManager.java | 2 | ||||
| -rw-r--r-- | media/java/android/media/tv/TvInputService.java | 2 | ||||
| -rw-r--r-- | media/java/android/media/tv/TvView.java | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java index 601fa45..3272a23 100644 --- a/media/java/android/media/tv/TvInputManager.java +++ b/media/java/android/media/tv/TvInputManager.java @@ -1696,6 +1696,8 @@ public final class TvInputManager { * @param rate The ratio between desired playback rate and normal one. * @param audioMode Audio playback mode. Must be one of the supported audio modes: * <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} * </ul> */ diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java index 5156ae8..34c36c3 100644 --- a/media/java/android/media/tv/TvInputService.java +++ b/media/java/android/media/tv/TvInputService.java @@ -891,6 +891,8 @@ public abstract class TvInputService extends Service { * @param rate The ratio between desired playback rate and normal one. * @param audioMode Audio playback mode. Must be one of the supported audio modes: * <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} * </ul> * @see #onTimeShiftResume diff --git a/media/java/android/media/tv/TvView.java b/media/java/android/media/tv/TvView.java index d248b12..7e64b17 100644 --- a/media/java/android/media/tv/TvView.java +++ b/media/java/android/media/tv/TvView.java @@ -457,6 +457,8 @@ public class TvView extends ViewGroup { * @param rate The ratio between desired playback rate and normal one. * @param audioMode Audio playback mode. Must be one of the supported audio modes: * <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} * </ul> */ |