From bc69af7c6e8683594bb74c5211d086d3a3f17797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fries?= <fries@oern.de>
Date: Sat, 9 Jan 2016 23:03:09 +0100
Subject: Snap: Fix NPE if mCameraDevice == null

Change-Id: I27ee6f3b6b6bec95661741a0907708e6ebd79752
---
 src/com/android/camera/PhotoModule.java | 3 +--
 1 file changed, 1 insertion(+), 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;
-- 
cgit v1.2.3