diff options
| author | Arne Coucheron <arco68@gmail.com> | 2017-06-30 07:08:24 +0200 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2017-07-02 19:42:08 +0000 |
| commit | c45b89be6bfdcc25befa674a05c52ea5a98e8256 (patch) | |
| tree | 98f2410d06b47ba2e21e0419ed27a8a89aba5e5c | |
| parent | a66d49f786d5d28d38a438498d3c921bccd97803 (diff) | |
| download | android_packages_apps_Gallery2-c45b89be6bfdcc25befa674a05c52ea5a98e8256.tar.gz android_packages_apps_Gallery2-c45b89be6bfdcc25befa674a05c52ea5a98e8256.tar.bz2 android_packages_apps_Gallery2-c45b89be6bfdcc25befa674a05c52ea5a98e8256.zip | |
Gallery2: Fix crash after returning from albums in wallpaper picker
Change-Id: Ie504e8fdfcad5110a0f6377c8f7f1c01f8b05c59
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index 7f947d8f3..5a86a8aa8 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -285,7 +285,10 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster if (mInCameraApp) { GalleryUtils.startGalleryActivity(mActivity); } else if (mActivity.getStateManager().getStateCount() > 1) { - ((GalleryActivity) mActivity).toggleNavBar(true); + Toolbar toolbar = mActivity.getToolbar(); + if (toolbar != null) { + ((GalleryActivity) mActivity).toggleNavBar(true); + } super.onBackPressed(); } else if (mParentMediaSetString != null) { Bundle data = new Bundle(getData()); |