diff options
| author | Lajos Molnar <lajos@google.com> | 2015-05-14 21:17:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 21:17:31 +0000 |
| commit | 51bf5d9c078a57b52da786979103674588c2116c (patch) | |
| tree | 8d3310cf13fb05572872b0c3f837072abe7b0309 /api/system-current.txt | |
| parent | af0479446bf2bfaa252bfe4bc924346632013f40 (diff) | |
| parent | dbc908fba85ab610737eeb6170c0808ffdd44741 (diff) | |
| download | frameworks_base-51bf5d9c078a57b52da786979103674588c2116c.zip frameworks_base-51bf5d9c078a57b52da786979103674588c2116c.tar.gz frameworks_base-51bf5d9c078a57b52da786979103674588c2116c.tar.bz2 | |
Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev
Diffstat (limited to 'api/system-current.txt')
| -rw-r--r-- | api/system-current.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 72c2f56..91d4d25 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -17337,7 +17337,6 @@ package android.media { method public void setOnTimedTextListener(android.media.MediaPlayer.OnTimedTextListener); method public void setOnVideoSizeChangedListener(android.media.MediaPlayer.OnVideoSizeChangedListener); method public void setPlaybackParams(android.media.PlaybackParams); - method public void setPlaybackRate(float, int); method public void setScreenOnWhilePlaying(boolean); method public void setSurface(android.view.Surface); method public void setSyncParams(android.media.SyncParams); @@ -17364,9 +17363,6 @@ package android.media { field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3 field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip"; - field public static final int PLAYBACK_RATE_AUDIO_MODE_DEFAULT = 0; // 0x0 - field public static final int PLAYBACK_RATE_AUDIO_MODE_RESAMPLE = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_STRETCH = 1; // 0x1 field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1; // 0x1 field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2; // 0x2 } @@ -17670,14 +17666,10 @@ package android.media { method public void setCallback(android.media.MediaSync.Callback, android.os.Handler); method public void setOnErrorListener(android.media.MediaSync.OnErrorListener, android.os.Handler); method public void setPlaybackParams(android.media.PlaybackParams); - method public void setPlaybackRate(float, int); method public void setSurface(android.view.Surface); method public void setSyncParams(android.media.SyncParams); field public static final int MEDIASYNC_ERROR_AUDIOTRACK_FAIL = 1; // 0x1 field public static final int MEDIASYNC_ERROR_SURFACE_FAIL = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_DEFAULT = 0; // 0x0 - field public static final int PLAYBACK_RATE_AUDIO_MODE_RESAMPLE = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_STRETCH = 1; // 0x1 } public static abstract class MediaSync.Callback { |