diff options
author | Erin Dahlgren <edahlgren@google.com> | 2013-10-14 17:35:23 -0700 |
---|---|---|
committer | Erin Dahlgren <edahlgren@google.com> | 2013-10-15 08:58:33 -0700 |
commit | f9ef1ae9d31977c106eefc7ab1a74158bcdcfd39 (patch) | |
tree | 4daa642536e9adb39460e916fcc0aeabe366dd55 /src/com/android/camera/ui/FilmStripView.java | |
parent | 831da6132122d9d9a35183ef832994be659c3740 (diff) | |
download | android_packages_apps_Snap-f9ef1ae9d31977c106eefc7ab1a74158bcdcfd39.tar.gz android_packages_apps_Snap-f9ef1ae9d31977c106eefc7ab1a74158bcdcfd39.tar.bz2 android_packages_apps_Snap-f9ef1ae9d31977c106eefc7ab1a74158bcdcfd39.zip |
Prevent crash after deleting album from Gallery by checking for more null pointers.
Bug: 10950130
Change-Id: I284e2016676e15c7f2ad23de71a965ab50c5d743
Diffstat (limited to 'src/com/android/camera/ui/FilmStripView.java')
-rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index d17567d52..ea0120706 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -784,6 +784,11 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { private void measureViewItem(ViewItem item, int boundWidth, int boundHeight) { int id = item.getId(); ImageData imageData = mDataAdapter.getImageData(id); + if (imageData == null) { + Log.e(TAG, "trying to measure a null item"); + return; + } + int[] dim = calculateChildDimension(imageData.getWidth(), imageData.getHeight(), imageData.getOrientation(), boundWidth, boundHeight); @@ -892,8 +897,11 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { if (itemID >= mViewItem.length || mViewItem[itemID] == null) { return; } - ImageData data = mDataAdapter.getImageData(mViewItem[itemID].getId()); + if (data == null) { + Log.e(TAG, "trying to remove a null item"); + return; + } checkForRemoval(data, mViewItem[itemID].getView()); mViewItem[itemID] = null; } @@ -1789,7 +1797,12 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { return; } removeView(item.getView()); + ImageData data = mDataAdapter.getImageData(item.getId()); + if (data == null) { + Log.e(TAG, "trying recycle a null item"); + return; + } data.recycle(); ViewItem newItem = buildItemFromData(item.getId()); |