diff options
| author | ztenghui <ztenghui@google.com> | 2013-11-08 17:17:52 -0800 |
|---|---|---|
| committer | ztenghui <ztenghui@google.com> | 2013-11-08 17:17:52 -0800 |
| commit | 6a42c3ae157c4495db56541ef87f6ee56b5d10b3 (patch) | |
| tree | c7610f40e4b180403e0fc1ce27f2ca0f283f50e0 /src/com/android/camera/ui/FilmStripView.java | |
| parent | cbd8267ee99e457f72822e8d8187b5e6823104f8 (diff) | |
| download | android_packages_apps_Snap-6a42c3ae157c4495db56541ef87f6ee56b5d10b3.tar.gz android_packages_apps_Snap-6a42c3ae157c4495db56541ef87f6ee56b5d10b3.tar.bz2 android_packages_apps_Snap-6a42c3ae157c4495db56541ef87f6ee56b5d10b3.zip | |
Add a null check to fix NPE
bug: 11594111
Change-Id: Ica2ffe315c4e4eaa818aa609d9600d5e67e54b3b
Diffstat (limited to 'src/com/android/camera/ui/FilmStripView.java')
| -rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 5 |
1 files changed, 4 insertions, 1 deletions
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. |