diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-06-04 00:00:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-06-04 00:00:57 -0700 |
| commit | 48e49264155ebb29d5769637f4930707e6bb893e (patch) | |
| tree | d9f721ad2603f7e0d2b4b6b3e0fedfeab8e95f7f /src/com/android | |
| parent | 3c316726646af20cb7c6f633ec3215f10286f3b4 (diff) | |
| parent | 171d2b253a752ca104ccf4a58f4e9d6d82bd7b28 (diff) | |
| download | android_packages_apps_Snap-48e49264155ebb29d5769637f4930707e6bb893e.tar.gz android_packages_apps_Snap-48e49264155ebb29d5769637f4930707e6bb893e.tar.bz2 android_packages_apps_Snap-48e49264155ebb29d5769637f4930707e6bb893e.zip | |
Merge "SnapdragonCamera: fix crash after photo deletion"
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index 3edb23d3c..01469baeb 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -2036,17 +2036,18 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { } // Remove all views from the mViewItem buffer, except the camera view. - for (int i = 0; i < mViewItem.length; i++) { - if (mViewItem[i] == null) { - continue; - } - View v = mViewItem[i].getView(); - if (v != mCameraView) { - removeView(v); - } - ImageData imageData = mDataAdapter.getImageData(mViewItem[i].getId()); - if (imageData != null) { - imageData.recycle(); + for (final ViewItem item : mViewItem) { + if (item != null) { + ImageData imageData = mDataAdapter.getImageData(item.getId()); + if (imageData != null) { + imageData.recycle(); + View v = item.getView(); + if (imageData.getViewType() != ImageData.VIEW_TYPE_STICKY) { + removeView(v); + } else { + mCameraView = v; + } + } } } |