diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-07-28 12:46:37 -0700 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-07-28 12:54:43 -0700 |
| commit | 79e96aeca1ba6cc11b2af4412b01c58ee786fbe0 (patch) | |
| tree | 742b7e6ecf32e175b1bd90541457be58041fb062 /src/com/android/camera/PhotoModule.java | |
| parent | 9f65ee95c61d70d6f7c34cd8bedea61ff1cdf2d1 (diff) | |
| download | android_packages_apps_Snap-79e96aeca1ba6cc11b2af4412b01c58ee786fbe0.tar.gz android_packages_apps_Snap-79e96aeca1ba6cc11b2af4412b01c58ee786fbe0.tar.bz2 android_packages_apps_Snap-79e96aeca1ba6cc11b2af4412b01c58ee786fbe0.zip | |
SnapdragonCamera: Fixed NPE when triggering snapshot from key button
When user triggers snapshot from key button, it is possible that
the camera control menu is not initialized and causes NPE.
To resolve issue, only process the snapshot request after control
menu is initialized.
Change-Id: I14f8739e48406d6008ae6e1d5463dffe997b0bd9
CRs-Fixed: 1045625
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 0b8cee802..3a7e41976 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2231,6 +2231,7 @@ public class PhotoModule public synchronized void onShutterButtonClick() { if ((mCameraDevice == null) || mPaused || mUI.collapseCameraControls() + || !mUI.mMenuInitialized || (mCameraState == SWITCHING_CAMERA) || (mCameraState == PREVIEW_STOPPED) || (mCameraState == LONGSHOT) |