diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-01-07 01:16:04 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-01-07 01:16:04 -0800 |
| commit | b6f034108ac17a4e5456df9620c0b520b99be7ec (patch) | |
| tree | ef14100a8741780957e520fda8ec88dd9278e7a2 /src/com/android | |
| parent | 701f6401729b727d84b16d58dd8fafb79b23d558 (diff) | |
| parent | 6bf3741e2ede1761115a9e3255275f04af857188 (diff) | |
| download | android_packages_apps_Gallery2-b6f034108ac17a4e5456df9620c0b520b99be7ec.tar.gz android_packages_apps_Gallery2-b6f034108ac17a4e5456df9620c0b520b99be7ec.tar.bz2 android_packages_apps_Gallery2-b6f034108ac17a4e5456df9620c0b520b99be7ec.zip | |
Merge "Gallery2: Fix null pointer exception from customer monkey test."
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 9 |
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 509286aab..e730c070c 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; @@ -501,9 +502,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); |