diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2011-07-26 09:27:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-26 09:27:53 -0700 |
| commit | af20eacc2170a0641749bad822926d86161431c7 (patch) | |
| tree | 0c140af4735c0d6942d8941b153e024b2d2c72c5 /media | |
| parent | 1bfe9a9b02f64cea13a07565e77c0ea006b49928 (diff) | |
| parent | d9ae1c573e37e245c7f4f0480a8fa925e57bd49d (diff) | |
| download | frameworks_base-af20eacc2170a0641749bad822926d86161431c7.zip frameworks_base-af20eacc2170a0641749bad822926d86161431c7.tar.gz frameworks_base-af20eacc2170a0641749bad822926d86161431c7.tar.bz2 | |
Merge "Fix bug 4319552 Java to native channel mask translation"
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioFormat.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index 82e8d77..8990fe5 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -54,8 +54,8 @@ public class AudioFormat { /** Default audio channel mask */ public static final int CHANNEL_OUT_DEFAULT = 1; - // Channel mask definitions must be kept in sync with native values - // in /system/core/include/system/audio.h + // Channel mask definitions below are translated to the native values defined in + // in /system/core/include/system/audio.h in the JNI code of AudioTrack public static final int CHANNEL_OUT_FRONT_LEFT = 0x4; public static final int CHANNEL_OUT_FRONT_RIGHT = 0x8; public static final int CHANNEL_OUT_FRONT_CENTER = 0x10; |