diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-01-31 23:41:50 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-01-31 23:41:50 -0800 |
| commit | e798f46a24e92ecedb07fe85940fe161307b7421 (patch) | |
| tree | a6b9fd7c4e8d72d095fee028cb3ba8aa19569c00 /src | |
| parent | 8aff95f022ef9cfa8cfd33f36084ca9e1e929747 (diff) | |
| parent | 157df6f8e45a243878c6be39c22ef88fd82cc59d (diff) | |
| download | android_packages_apps_Gallery2-e798f46a24e92ecedb07fe85940fe161307b7421.tar.gz android_packages_apps_Gallery2-e798f46a24e92ecedb07fe85940fe161307b7421.tar.bz2 android_packages_apps_Gallery2-e798f46a24e92ecedb07fe85940fe161307b7421.zip | |
Merge "Gallery2: fix a NullPointerException"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index 2f628a978..5fc16aa50 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -288,10 +288,13 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster if (mInCameraApp) { GalleryUtils.startGalleryActivity(mActivity); } else if (mActivity.getStateManager().getStateCount() > 1) { - mActivity.getToolbar().setNavigationContentDescription(mActivity.getResources(). - getString(R.string.drawer_desc)); - mActivity.getToolbar().setNavigationIcon(R.drawable.drawer); - ((GalleryActivity)mActivity).toggleNavDrawer(true); + Toolbar toolbar = mActivity.getToolbar(); + if (toolbar != null) { + toolbar.setNavigationContentDescription( + mActivity.getResources().getString(R.string.drawer_desc)); + toolbar.setNavigationIcon(R.drawable.drawer); + ((GalleryActivity) mActivity).toggleNavDrawer(true); + } super.onBackPressed(); } else if (mParentMediaSetString != null) { Bundle data = new Bundle(getData()); |