Gallery2: Fix null pointer exception from customer monkey test.

The reference is not instantiated before invoking it.

Determine whether the reference is instantiated before invoking it.

Change-Id: Ib77984dea144540463818ae7af926fc4ea8e900d
CRs-Fixed: 951752

1 files changed, 6 insertions, 3 deletions

diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 3181d2daf..fffa136d3 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -38,6 +38,7 @@ import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.widget.Toolbar;
 
 import com.android.gallery3d.R;
 import com.android.gallery3d.common.Utils;
@@ -512,9 +513,11 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
                 mParentMediaSetString != null;
         //GalleryActionBar actionBar = mActivity.getGalleryActionBar();
         mActionBar.setDisplayOptions(enableHomeButton, true);
-        if (enableHomeButton) {
-            mActivity.getToolbar().setNavigationContentDescription("back");
-            mActivity.getToolbar().setNavigationIcon(R.drawable.back);
+
+        Toolbar toolBar = mActivity.getToolbar();
+        if (enableHomeButton && toolBar != null) {
+            toolBar.setNavigationContentDescription("back");
+            toolBar.setNavigationIcon(R.drawable.back);
         }
         // Set the reload bit here to prevent it exit this page in clearLoadingBit().
         setLoadingBit(BIT_LOADING_RELOAD);