From 532497bda601ebd761144d53fb4c7dd47c4fbdfd Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Sat, 9 Jan 2016 13:08:19 +0100
Subject: CameraActivity: Handle NPE when film strip view is null

Change-Id: I0de4ec0f2cb4653822249ea97e8a07c890fc7231
---
 src/com/android/camera/CameraActivity.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 24535a6ac..fe9f8cf32 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1751,7 +1751,9 @@ public class CameraActivity extends Activity
     }
 
     public void setPreviewGestures(PreviewGestures previewGestures) {
-        mFilmStripView.setPreviewGestures(previewGestures);
+        if(mFilmStripView != null) {
+            mFilmStripView.setPreviewGestures(previewGestures);
+        }
     }
 
     protected void updateStorageSpace() {
-- 
cgit v1.2.3