diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-06-18 14:53:49 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-06-18 14:53:49 -0700 |
| commit | a4c4a2ee416106e4690ed2b87d95d2a4a42c6f44 (patch) | |
| tree | 1f1029bb3d0932e621d3c0666541ba7f7abd49dc | |
| parent | 9081576c7a5bd0a8f2cceb9b54ebbd29e0548b19 (diff) | |
| parent | 09330cf92c1f5e09d7c71dc41b2f1858a299638c (diff) | |
| download | android_packages_apps_Snap-a4c4a2ee416106e4690ed2b87d95d2a4a42c6f44.tar.gz android_packages_apps_Snap-a4c4a2ee416106e4690ed2b87d95d2a4a42c6f44.tar.bz2 android_packages_apps_Snap-a4c4a2ee416106e4690ed2b87d95d2a4a42c6f44.zip | |
Merge "SnapdragonCamera: Synchronize shutter button click."
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 7ff552327..4d311bad3 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2067,7 +2067,7 @@ public class PhotoModule } @Override - public void onShutterButtonClick() { + public synchronized void onShutterButtonClick() { if (mPaused || mShutterPressing || mUI.collapseCameraControls() || (mCameraState == SWITCHING_CAMERA) |