diff options
| author | Emilian Peev <epeevs@codeaurora.org> | 2014-12-08 17:09:42 +0200 |
|---|---|---|
| committer | Emilian Peev <epeevs@codeaurora.org> | 2015-03-05 18:17:22 +0200 |
| commit | 904cafc8eddc9deea82f26f15b0d2a8af09dd044 (patch) | |
| tree | 56c68170fb3304db10b9188df7ad489f549e004d /src | |
| parent | 38779f3d24bd9ec3f3b44db587a97b7aecdea281 (diff) | |
| download | android_packages_apps_Snap-904cafc8eddc9deea82f26f15b0d2a8af09dd044.tar.gz android_packages_apps_Snap-904cafc8eddc9deea82f26f15b0d2a8af09dd044.tar.bz2 android_packages_apps_Snap-904cafc8eddc9deea82f26f15b0d2a8af09dd044.zip | |
Snapdragon Camera: Avoid null pointer exception during shutter focus
An additional check needs to be added for the
focus manager initialization during handling
of the shutter button focus event.
Change-Id: Ie43a2376f42644ec493ffe1af53c9c5a1c279ec4
CRs-Fixed: 766843
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index a915d0845..0e7ba0906 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1989,7 +1989,8 @@ public class PhotoModule if (mCameraDevice == null || mPaused || mUI.collapseCameraControls() || (mCameraState == SNAPSHOT_IN_PROGRESS) - || (mCameraState == PREVIEW_STOPPED)) { + || (mCameraState == PREVIEW_STOPPED) + || (null == mFocusManager)) { Log.v(TAG, "onShutterButtonFocus error case mCameraState = " + mCameraState + "mCameraDevice = " + mCameraDevice + "mPaused =" + mPaused); return; @@ -2031,7 +2032,8 @@ public class PhotoModule public void onShutterButtonClick() { if (mPaused || mUI.collapseCameraControls() || (mCameraState == SWITCHING_CAMERA) - || (mCameraState == PREVIEW_STOPPED)) return; + || (mCameraState == PREVIEW_STOPPED) + || (null == mFocusManager)) return; // Do not take the picture if there is not enough storage. if (mActivity.getStorageSpaceBytes() <= Storage.LOW_STORAGE_THRESHOLD_BYTES) { |