bug #6176711: guard against null GalleryActionBar.

When entering Gallery app from WallPaper picker, the activity is DialogPicker, which doesn't initialize GalleryActionbar so getGalleryActionbar() returns null. Guard against using the null object.

I fixed the obvious NPE here, but Ray or Yuli should take a closer look, to see why this is broken.

Change-Id: Ic6923c388ea7b72ab402131fc3b039546509e340

1 files changed, 4 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java
index 443e2bd29..384ae734b 100644
--- a/src/com/android/gallery3d/app/ActivityState.java
+++ b/src/com/android/gallery3d/app/ActivityState.java
@@ -141,7 +141,10 @@ abstract public class ActivityState {
                 actionBar.show();
             }
             int stateCount = mActivity.getStateManager().getStateCount();
-            mActivity.getGalleryActionBar().setDisplayOptions(stateCount > 1, true);
+            GalleryActionBar galleryActionbar = mActivity.getGalleryActionBar();
+            if (galleryActionbar != null) {
+                galleryActionbar.setDisplayOptions(stateCount > 1, true);
+            }
             // Default behavior, this can be overridden in ActivityState's onResume.
             actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
         }