summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSai Kumar Sanagavarapu <ssanagav@codeaurora.org>2015-06-08 17:40:04 +0530
committerSai Kumar Sanagavarapu <ssanagav@codeaurora.org>2015-06-08 17:40:04 +0530
commit09330cf92c1f5e09d7c71dc41b2f1858a299638c (patch)
treece04d63f47be2c1ce8cb2935cc15d2bfc4d0aa48
parentfaa6d875d926672fe078101cf67cd9d3ec334445 (diff)
downloadandroid_packages_apps_Snap-09330cf92c1f5e09d7c71dc41b2f1858a299638c.tar.gz
android_packages_apps_Snap-09330cf92c1f5e09d7c71dc41b2f1858a299638c.tar.bz2
android_packages_apps_Snap-09330cf92c1f5e09d7c71dc41b2f1858a299638c.zip
SnapdragonCamera: Synchronize shutter button click.
In monkey usecases, shutter button can be clicked really fast even before app's state is set properly. This can lead to multiple takepicture calls to lower layers. Since HAL maintains state machine and doesnt allow such operations, error will be thrown. To avoid such situations, make onShutterButtonClick() a synchronized method so that only one thread can access it at a time. Change-Id: Icbb052966dc671521bafb3404f4ced58d723bc71
-rw-r--r--src/com/android/camera/PhotoModule.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 79ae073b6..f6cd60ba5 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2064,7 +2064,7 @@ public class PhotoModule
}
@Override
- public void onShutterButtonClick() {
+ public synchronized void onShutterButtonClick() {
if (mPaused || mShutterPressing
|| mUI.collapseCameraControls()
|| (mCameraState == SWITCHING_CAMERA)