diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-01-18 14:16:36 -0800 |
|---|---|---|
| committer | Camera Software Integration <camswint@localhost> | 2016-01-20 23:33:27 -0700 |
| commit | 6abacf68ab4e8d7646afcb225f787ad3c243f20e (patch) | |
| tree | 89d7d0a8a63dce5b4856726087803fd38dd4263b /src/com/android/camera/PhotoModule.java | |
| parent | d1849430a108413ed1aacbe2fc1cccb5653b8575 (diff) | |
| download | android_packages_apps_Snap-6abacf68ab4e8d7646afcb225f787ad3c243f20e.tar.gz android_packages_apps_Snap-6abacf68ab4e8d7646afcb225f787ad3c243f20e.tar.bz2 android_packages_apps_Snap-6abacf68ab4e8d7646afcb225f787ad3c243f20e.zip | |
SnapdragonCamera: Fix NULL pointer exception
There is a corner case that onShutterButtonClick() is called before
camera device is configured. The change will make sure the camera
device exists before continuing the operation.
Change-Id: I2212572ea5c6073c3f62bdd38e83716b2427c87d
CRs-Fixed: 962579
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 9414a116a..df2bb7a5f 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2170,7 +2170,8 @@ public class PhotoModule @Override public synchronized void onShutterButtonClick() { - if (mPaused || mUI.collapseCameraControls() + if ((mCameraDevice == null) + || mPaused || mUI.collapseCameraControls() || (mCameraState == SWITCHING_CAMERA) || (mCameraState == PREVIEW_STOPPED) || (null == mFocusManager)) return; |