diff options
| author | Erin Dahlgren <edahlgren@google.com> | 2013-10-01 23:35:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-01 23:35:13 +0000 |
| commit | 6416ba8a428025c669782a2d3226f06ad5a86921 (patch) | |
| tree | d7911dc6393f80b42c4d8b609b62857ee6c0c65a | |
| parent | 1f69e36bc45ccf0090cb1d8392d603cfe2a4e8bf (diff) | |
| parent | d4f69ed6fa6e302955ce8d0b2a21f47794ce7d64 (diff) | |
| download | android_packages_apps_Snap-6416ba8a428025c669782a2d3226f06ad5a86921.tar.gz android_packages_apps_Snap-6416ba8a428025c669782a2d3226f06ad5a86921.tar.bz2 android_packages_apps_Snap-6416ba8a428025c669782a2d3226f06ad5a86921.zip | |
Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad
| -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 { |