diff options
| author | John Reck <jreck@google.com> | 2012-09-27 16:06:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-27 16:06:04 -0700 |
| commit | 664382a33a62086b5590576acb54bd373ea60a32 (patch) | |
| tree | 186d4f52a11d0fa7959e7ec8039acf212502a596 | |
| parent | 48d45b0d42d7daa1c824b5ef84850802d27dad54 (diff) | |
| parent | 98d17b863a5c8dc194496422459e73d7d38a2b9e (diff) | |
| download | android_packages_apps_Gallery2-664382a33a62086b5590576acb54bd373ea60a32.tar.gz android_packages_apps_Gallery2-664382a33a62086b5590576acb54bd373ea60a32.tar.bz2 android_packages_apps_Gallery2-664382a33a62086b5590576acb54bd373ea60a32.zip | |
am 98d17b86: Merge "Fix Monkey NPE" into gb-ub-photos-arches
* commit '98d17b863a5c8dc194496422459e73d7d38a2b9e':
Fix Monkey NPE
| -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(); |