diff options
| author | Erin Dahlgren <edahlgren@google.com> | 2013-10-01 13:42:51 -0700 |
|---|---|---|
| committer | Erin Dahlgren <edahlgren@google.com> | 2013-10-01 14:13:29 -0700 |
| commit | d4f69ed6fa6e302955ce8d0b2a21f47794ce7d64 (patch) | |
| tree | a7f413389c3a71390052d01990293b9511b1791b /src | |
| parent | 7fc104e4e75ac881269fd4a093513da01565e5d6 (diff) | |
| download | android_packages_apps_Snap-d4f69ed6fa6e302955ce8d0b2a21f47794ce7d64.tar.gz android_packages_apps_Snap-d4f69ed6fa6e302955ce8d0b2a21f47794ce7d64.tar.bz2 android_packages_apps_Snap-d4f69ed6fa6e302955ce8d0b2a21f47794ce7d64.zip | |
Fix FilmStrip crash by checking if photos are present before updating action bar
Bug: 11027838
Change-Id: I770f8d0187b4f92f5395b27496620acb099eeb6a
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index bcc536c24..fcb24b5e7 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -552,6 +552,9 @@ public class CameraActivity extends Activity */ private void updateActionBarMenu(int dataID) { LocalData currentData = mDataAdapter.getLocalData(dataID); + if (currentData == null) { + return; + } int type = currentData.getLocalDataType(); if (mActionBarMenu == null) { @@ -716,7 +719,7 @@ public class CameraActivity extends Activity private void removeData(int dataID) { mDataAdapter.removeData(CameraActivity.this, dataID); - updateActionBarMenu(dataID); + updateActionBarMenu(mFilmStripView.getCurrentId()); if (mDataAdapter.getTotalNumber() > 1) { showUndoDeletionBar(); } else { |