From 6a42c3ae157c4495db56541ef87f6ee56b5d10b3 Mon Sep 17 00:00:00 2001
From: ztenghui <ztenghui@google.com>
Date: Fri, 8 Nov 2013 17:17:52 -0800
Subject: Add a null check to fix NPE

bug: 11594111
Change-Id: Ica2ffe315c4e4eaa818aa609d9600d5e67e54b3b
---
 src/com/android/camera/ui/FilmStripView.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/com/android/camera/ui/FilmStripView.java')

diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 60c9322db..6b2b7f5e0 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -1937,7 +1937,10 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
             if (v != mCameraView) {
                 removeView(v);
             }
-            mDataAdapter.getImageData(mViewItem[i].getId()).recycle();
+            ImageData imageData = mDataAdapter.getImageData(mViewItem[i].getId());
+            if (imageData != null) {
+                imageData.recycle();
+            }
         }
 
         // Clear out the mViewItems and rebuild with camera in the center.
-- 
cgit v1.2.3