diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-17 17:53:09 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-17 17:53:09 -0700 |
| commit | 50239ed5af53406430b11ad3effc5a955aaeed48 (patch) | |
| tree | 92749961b64a419dcd22b7618c0f7b7a851e7f1c /src | |
| parent | d2d85e03dbad97293aa101183c6ff12d98efba55 (diff) | |
| parent | 904cafc8eddc9deea82f26f15b0d2a8af09dd044 (diff) | |
| download | android_packages_apps_Snap-50239ed5af53406430b11ad3effc5a955aaeed48.tar.gz android_packages_apps_Snap-50239ed5af53406430b11ad3effc5a955aaeed48.tar.bz2 android_packages_apps_Snap-50239ed5af53406430b11ad3effc5a955aaeed48.zip | |
Merge "Snapdragon Camera: Avoid null pointer exception during shutter focus"
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 887982156..2330122a6 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1994,7 +1994,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; @@ -2036,7 +2037,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) { |