diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-11-19 09:12:54 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-11-19 09:12:54 -0800 |
| commit | ef524f102cc5f492fc0f43dc498a498a0779e0d0 (patch) | |
| tree | a325a6756730cc693285af058292961277de70a4 /src/com | |
| parent | 382de80f07dd092a5ed182f8614b730c86da9513 (diff) | |
| parent | 9097d0424607dc2ee4c3d0608f4fc7f70a902586 (diff) | |
| download | android_packages_apps_Snap-ef524f102cc5f492fc0f43dc498a498a0779e0d0.tar.gz android_packages_apps_Snap-ef524f102cc5f492fc0f43dc498a498a0779e0d0.tar.bz2 android_packages_apps_Snap-ef524f102cc5f492fc0f43dc498a498a0779e0d0.zip | |
Merge "Camera2:Fix crash on launch of camera after deleting camera folder."
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index d2695b5a4..9945952ee 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -1844,7 +1844,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { // Check the current one. ViewItem curr = mViewItem[mCurrentItem]; int dataId = curr.getId(); - if (reporter.isDataRemoved(dataId)) { + if (reporter.isDataRemoved(dataId) || mDataAdapter.getTotalNumber() == 1) { reload(); return; } @@ -1920,7 +1920,9 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { if (v != mCameraView) { removeView(v); } - mDataAdapter.getImageData(mViewItem[i].getId()).recycle(); + if (mDataAdapter.getImageData(mViewItem[i].getId()) != null) { + mDataAdapter.getImageData(mViewItem[i].getId()).recycle(); + } } // Clear out the mViewItems and rebuild with camera in the center. |