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

Commit 99f6c2a0 authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." into mnc-dev

parents e48cca2a b73868dd

media/java/android/media/tv/TvInputManager.java

+2 −0
Original line number Diff line number Diff line
@@ -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>

         */

media/java/android/media/tv/TvInputService.java

+2 −0
Original line number Diff line number Diff line
@@ -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

media/java/android/media/tv/TvView.java

+2 −0
Original line number Diff line number Diff line
@@ -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>

     */