summaryrefslogtreecommitdiffstats
path: root/api/system-current.txt
diff options
context:
space:
mode:
authorJae Seo <jaeseo@google.com>2015-05-18 18:05:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-18 18:05:34 +0000
commit194118f913cc6b018291cff4b1779a3bb24af5c0 (patch)
treee9bb627ec885e0b81c9a10aafbf0bb07068920f8 /api/system-current.txt
parentbeda8613ad7bc01affa17857faed04d9589db34c (diff)
parent76c4fc297723aceea9d4021b26b39c26768b54c3 (diff)
downloadframeworks_base-194118f913cc6b018291cff4b1779a3bb24af5c0.zip
frameworks_base-194118f913cc6b018291cff4b1779a3bb24af5c0.tar.gz
frameworks_base-194118f913cc6b018291cff4b1779a3bb24af5c0.tar.bz2
Merge "Make PlaybackParams parcelable" into mnc-dev
Diffstat (limited to 'api/system-current.txt')
-rw-r--r--api/system-current.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 351ec8e..263d17a 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -17703,18 +17703,21 @@ package android.media {
ctor public NotProvisionedException(java.lang.String);
}
- public final class PlaybackParams {
+ public final class PlaybackParams implements android.os.Parcelable {
ctor public PlaybackParams();
method public android.media.PlaybackParams allowDefaults();
+ method public int describeContents();
method public int getAudioFallbackMode();
method public float getPitch();
method public float getSpeed();
method public android.media.PlaybackParams setAudioFallbackMode(int);
method public android.media.PlaybackParams setPitch(float);
method public android.media.PlaybackParams setSpeed(float);
+ method public void writeToParcel(android.os.Parcel, int);
field public static final int AUDIO_FALLBACK_MODE_DEFAULT = 0; // 0x0
field public static final int AUDIO_FALLBACK_MODE_FAIL = 2; // 0x2
field public static final int AUDIO_FALLBACK_MODE_MUTE = 1; // 0x1
+ field public static final android.os.Parcelable.Creator<android.media.PlaybackParams> CREATOR;
}
public final class Rating implements android.os.Parcelable {