commit f7a18c7feaeef3c8398376aaeea22e39dc1bbf5d
author Alan Newberger <alann@google.com> Wed Oct 22 18:53:21 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 22 18:53:21 2014 +0000
tree a2eb1f8e40fa2a6dab2735f6d4c061257b546a42
parent f4084e35eac8a8b86e807573647d4a7b43852a59
parent 61c5f9f86b5fd8937fac3d082398086bac0d8db6

Merge "Null check for buildItemFromData" into ub-camera-glacier

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) {