diff options
| author | John Reck <jreck@google.com> | 2012-09-27 16:04:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-27 16:04:57 -0700 |
| commit | 98d17b863a5c8dc194496422459e73d7d38a2b9e (patch) | |
| tree | 054f8597fd48ca39cd86637ad93f5ad574b8c83e /src | |
| parent | 02f778af1f8a2250d91da450f82c30572de96062 (diff) | |
| parent | 53fe9f72433f2fdae30e1708c5933390202cbcf5 (diff) | |
| download | android_packages_apps_Gallery2-98d17b863a5c8dc194496422459e73d7d38a2b9e.tar.gz android_packages_apps_Gallery2-98d17b863a5c8dc194496422459e73d7d38a2b9e.tar.bz2 android_packages_apps_Gallery2-98d17b863a5c8dc194496422459e73d7d38a2b9e.zip | |
Merge "Fix Monkey NPE" into gb-ub-photos-arches
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 86e62a318..49d1e6ee7 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -553,7 +553,9 @@ public class PhotoPage extends ActivityState implements setGridButtonVisibility(mPhotoView.getFilmMode()); MenuItem item = menu.findItem(R.id.action_slideshow); - item.setVisible((mSecureAlbum == null) && canDoSlideShow()); + if (item != null) { + item.setVisible((mSecureAlbum == null) && canDoSlideShow()); + } if (mCurrentPhoto == null) return; int supportedOperations = mCurrentPhoto.getSupportedOperations(); |