diff options
| author | Andy Hung <hunga@google.com> | 2015-05-16 04:11:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-16 04:11:09 +0000 |
| commit | 921ded795f80e60fa5ba8430fc167e982f0725e2 (patch) | |
| tree | b12373e0cc27a07d7b70dc8446f613c975faced9 /media/jni | |
| parent | f6351ece2041a6b734f8eabebbd15ae452b33a12 (diff) | |
| parent | a6238ef3891bbbdb1c42d3e7954c4cd55527cef6 (diff) | |
| download | frameworks_base-921ded795f80e60fa5ba8430fc167e982f0725e2.zip frameworks_base-921ded795f80e60fa5ba8430fc167e982f0725e2.tar.gz frameworks_base-921ded795f80e60fa5ba8430fc167e982f0725e2.tar.bz2 | |
Merge "Fix SoundPool.unload() return value" into mnc-dev
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/soundpool/SoundPool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index 6c1bd97..8038cdf 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -229,7 +229,7 @@ bool SoundPool::unload(int sampleID) { ALOGV("unload: sampleID=%d", sampleID); Mutex::Autolock lock(&mLock); - return mSamples.removeItem(sampleID); + return mSamples.removeItem(sampleID) >= 0; // removeItem() returns index or BAD_VALUE } int SoundPool::play(int sampleID, float leftVolume, float rightVolume, |