diff options
| author | Alan Newberger <alann@google.com> | 2014-10-22 18:53:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-22 18:53:21 +0000 |
| commit | f7a18c7feaeef3c8398376aaeea22e39dc1bbf5d (patch) | |
| tree | a2eb1f8e40fa2a6dab2735f6d4c061257b546a42 | |
| parent | f4084e35eac8a8b86e807573647d4a7b43852a59 (diff) | |
| parent | 61c5f9f86b5fd8937fac3d082398086bac0d8db6 (diff) | |
| download | Camera2-f7a18c7feaeef3c8398376aaeea22e39dc1bbf5d.tar.gz | |
Merge "Null check for buildItemFromData" into ub-camera-glacier
| -rw-r--r-- | src/com/android/camera/widget/FilmstripView.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/widget/FilmstripView.java b/src/com/android/camera/widget/FilmstripView.java index fbd0d035d..809881d71 100644 --- a/src/com/android/camera/widget/FilmstripView.java +++ b/src/com/android/camera/widget/FilmstripView.java @@ -1484,6 +1484,10 @@ public class FilmstripView extends ViewGroup { 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) { |