diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-22 13:20:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-22 13:20:05 -0700 |
| commit | c7bebd15378d98104e6cd32666665fd60eaa8043 (patch) | |
| tree | ede4510a5e9117a71560c438d8f14f4c7be47f3d /media/jni | |
| parent | 67f194f68c01d2dfcb2639bdd32f08e0a9516825 (diff) | |
| parent | 5f2b05ea3dfdaf63088ea3776af43b79c5698f09 (diff) | |
| download | frameworks_base-c7bebd15378d98104e6cd32666665fd60eaa8043.zip frameworks_base-c7bebd15378d98104e6cd32666665fd60eaa8043.tar.gz frameworks_base-c7bebd15378d98104e6cd32666665fd60eaa8043.tar.bz2 | |
am 5f2b05ea: Merge change 8220 into donut
Merge commit '5f2b05ea3dfdaf63088ea3776af43b79c5698f09'
* commit '5f2b05ea3dfdaf63088ea3776af43b79c5698f09':
Fix issue 1996218: Disable use of shared memory buffer by SoundPool.
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/soundpool/SoundPool.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index ce80f92..1fdecdd 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -18,8 +18,7 @@ #define LOG_TAG "SoundPool" #include <utils/Log.h> -// -#define USE_SHARED_MEM_BUFFER +//#define USE_SHARED_MEM_BUFFER // XXX needed for timing latency #include <utils/Timers.h> |