diff options
| -rw-r--r-- | core/java/android/view/VelocityTracker.java | 3 | ||||
| -rw-r--r-- | include/media/Visualizer.h | 2 | ||||
| -rw-r--r-- | media/libmedia/Visualizer.cpp | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/core/java/android/view/VelocityTracker.java b/core/java/android/view/VelocityTracker.java index dfb2c3280215..1c35e31d4526 100644 --- a/core/java/android/view/VelocityTracker.java +++ b/core/java/android/view/VelocityTracker.java @@ -29,7 +29,7 @@ import android.util.PoolableManager; * to begin tracking. Put the motion events you receive into it with * {@link #addMovement(MotionEvent)}. When you want to determine the velocity call * {@link #computeCurrentVelocity(int)} and then call {@link #getXVelocity(int)} - * and {@link #getXVelocity(int)} to retrieve the velocity for each pointer id. + * and {@link #getYVelocity(int)} to retrieve the velocity for each pointer id. */ public final class VelocityTracker implements Poolable<VelocityTracker> { private static final Pool<VelocityTracker> sPool = Pools.synchronizedPool( @@ -39,6 +39,7 @@ public final class VelocityTracker implements Poolable<VelocityTracker> { } public void onAcquired(VelocityTracker element) { + // Intentionally empty } public void onReleased(VelocityTracker element) { diff --git a/include/media/Visualizer.h b/include/media/Visualizer.h index 5d2c8748435b..1a4cbca29490 100644 --- a/include/media/Visualizer.h +++ b/include/media/Visualizer.h @@ -143,7 +143,7 @@ private: void periodicCapture(); uint32_t initCaptureSize(); - Mutex mLock; + Mutex mCaptureLock; uint32_t mCaptureRate; uint32_t mCaptureSize; uint32_t mSampleRate; diff --git a/media/libmedia/Visualizer.cpp b/media/libmedia/Visualizer.cpp index 66758d24ba3b..dba257df89a6 100644 --- a/media/libmedia/Visualizer.cpp +++ b/media/libmedia/Visualizer.cpp @@ -54,7 +54,7 @@ Visualizer::~Visualizer() status_t Visualizer::setEnabled(bool enabled) { - Mutex::Autolock _l(mLock); + Mutex::Autolock _l(mCaptureLock); sp<CaptureThread> t = mCaptureThread; if (t != 0) { @@ -93,7 +93,7 @@ status_t Visualizer::setCaptureCallBack(capture_cbk_t cbk, void* user, uint32_t if (rate > CAPTURE_RATE_MAX) { return BAD_VALUE; } - Mutex::Autolock _l(mLock); + Mutex::Autolock _l(mCaptureLock); if (mEnabled) { return INVALID_OPERATION; @@ -129,7 +129,7 @@ status_t Visualizer::setCaptureSize(uint32_t size) return BAD_VALUE; } - Mutex::Autolock _l(mLock); + Mutex::Autolock _l(mCaptureLock); if (mEnabled) { return INVALID_OPERATION; } @@ -231,7 +231,7 @@ status_t Visualizer::doFft(uint8_t *fft, uint8_t *waveform) void Visualizer::periodicCapture() { - Mutex::Autolock _l(mLock); + Mutex::Autolock _l(mCaptureLock); ALOGV("periodicCapture() %p mCaptureCallBack %p mCaptureFlags 0x%08x", this, mCaptureCallBack, mCaptureFlags); if (mCaptureCallBack != NULL && |