commit 61c5f9f86b5fd8937fac3d082398086bac0d8db6
author Alan Newberger <alann@google.com> Wed Oct 22 11:46:02 2014 -0700
committer Alan Newberger <alann@google.com> Wed Oct 22 11:46:02 2014 -0700
tree 33dcb084291cc52ef71e0838ac95e7c0ee701446
parent 05edd2eec40d2a3ce7a76dc9f4d7dfe65e576ab7

Null check for buildItemFromData

This can return null in some scenarios and other invocations do
null checks, one was missing here.

Bug: 18005946
Change-Id: I14c4b31569ace7e84886228a638757ab1cd4710f

src/com/android/camera/widget/FilmstripView.java

diff --git a/src/com/android/camera/widget/FilmstripView.java b/src/com/android/camera/widget/FilmstripView.java
index fbd0d03..809881d 100644
--- a/src/com/android/camera/widget/FilmstripView.java
+++ b/src/com/android/camera/widget/FilmstripView.java
@@ -1484,6 +1484,10 @@
                         getMeasuredWidth(), getMeasuredHeight());
         final int offsetX = dim.x + mViewGapInPixel;
         ViewItem viewItem = buildItemFromData(dataID);
+        if (viewItem == null) {
+            Log.w(TAG, "unable to build inserted item from data");
+            return;
+        }
 
         if (insertedItemId >= mCurrentItem) {
             if (insertedItemId == mCurrentItem) {