summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/PhotoPage.java
diff options
context:
space:
mode:
authorRay Chen <raychen@google.com>2012-03-16 14:38:04 +0800
committerRay Chen <raychen@google.com>2012-03-19 15:31:39 +0800
commitd8d04a85419c75b91348d3baeba416a14c5132f7 (patch)
tree5e332a152fe98dda169ac8b4c581090f83858ba6 /src/com/android/gallery3d/app/PhotoPage.java
parent01449be9b1b89e72bcbcce9901421fc9c9cf713a (diff)
downloadandroid_packages_apps_Snap-d8d04a85419c75b91348d3baeba416a14c5132f7.tar.gz
android_packages_apps_Snap-d8d04a85419c75b91348d3baeba416a14c5132f7.tar.bz2
android_packages_apps_Snap-d8d04a85419c75b91348d3baeba416a14c5132f7.zip
Revert "bug #6176711: guard against null GalleryActionBar." and
fix DialogPicker's NPE issue while setting wallpaper. Change-Id: I833ebfb04907d3a1378df98db51c96b490796a00
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index a8c69b567..8040a2fc6 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -630,10 +630,8 @@ public class PhotoPage extends ActivityState
if (mMenuVisibilityListener == null) {
mMenuVisibilityListener = new MyMenuVisibilityListener();
}
- GalleryActionBar galleryActionBar = mActivity.getGalleryActionBar();
- if (galleryActionBar != null) {
- galleryActionBar.setDisplayOptions(mSetPathString != null, true);
- }
+ mActivity.getGalleryActionBar().setDisplayOptions(mSetPathString != null, true);
+
mActionBar.addOnMenuVisibilityListener(mMenuVisibilityListener);
onUserInteraction();
}