diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-12-02 19:13:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-02 19:13:43 +0000 |
| commit | 866dbc9a73eb18bc47fe2f45c40bbb753b26d27e (patch) | |
| tree | 3d9ed34fa39e357736c9fcc63c628bc21dd0d4d4 /media/java/android | |
| parent | 99e50023abe6fcfe1e25803c1a68678b3863e036 (diff) | |
| parent | a4b06fd111185f4f245d816c09074107fef960bb (diff) | |
| download | frameworks_base-866dbc9a73eb18bc47fe2f45c40bbb753b26d27e.zip frameworks_base-866dbc9a73eb18bc47fe2f45c40bbb753b26d27e.tar.gz frameworks_base-866dbc9a73eb18bc47fe2f45c40bbb753b26d27e.tar.bz2 | |
Merge "Fix typo nbChannels -> channelMask"
Diffstat (limited to 'media/java/android')
| -rw-r--r-- | media/java/android/media/AudioRecord.java | 2 | ||||
| -rw-r--r-- | media/java/android/media/AudioTrack.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java index f49ef2e..34169e2 100644 --- a/media/java/android/media/AudioRecord.java +++ b/media/java/android/media/AudioRecord.java @@ -800,7 +800,7 @@ public class AudioRecord //-------------------- private native final int native_setup(Object audiorecord_this, - int recordSource, int sampleRate, int nbChannels, int audioFormat, + int recordSource, int sampleRate, int channelMask, int audioFormat, int buffSizeInBytes, int[] sessionId); private native final void native_finalize(); diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java index 78a37c5..8756806 100644 --- a/media/java/android/media/AudioTrack.java +++ b/media/java/android/media/AudioTrack.java @@ -1319,7 +1319,7 @@ public class AudioTrack //-------------------- private native final int native_setup(Object audiotrack_this, - int streamType, int sampleRate, int nbChannels, int audioFormat, + int streamType, int sampleRate, int channelMask, int audioFormat, int buffSizeInBytes, int mode, int[] sessionId); private native final void native_finalize(); |