summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Fries <fries@oern.de>2016-01-09 23:03:09 +0100
committerMichael Bestas <mikeioannina@cyanogenmod.org>2016-01-11 03:28:02 +0200
commitbc69af7c6e8683594bb74c5211d086d3a3f17797 (patch)
treee1d386fc51f91923e4682a202292c2b2eb38ac72
parent4902670529234af776e7fc515f7ace83d62f8011 (diff)
downloadandroid_packages_apps_Snap-bc69af7c6e8683594bb74c5211d086d3a3f17797.tar.gz
android_packages_apps_Snap-bc69af7c6e8683594bb74c5211d086d3a3f17797.tar.bz2
android_packages_apps_Snap-bc69af7c6e8683594bb74c5211d086d3a3f17797.zip
Snap: Fix NPE if mCameraDevice == null
Change-Id: I27ee6f3b6b6bec95661741a0907708e6ebd79752
-rw-r--r--src/com/android/camera/PhotoModule.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 72286139d..f456e592e 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2741,8 +2741,7 @@ public class PhotoModule
@Override
public void stopPreview() {
- boolean isPreviewing = mCameraDevice.getCamera().previewEnabled();
- if (mCameraDevice != null && isPreviewing) {
+ if (mCameraDevice != null && mCameraDevice.getCamera().previewEnabled()) {
if (mCameraState == LONGSHOT) {
mCameraDevice.setLongshot(false);
mLongshotActive = false;