diff options
| author | Wei Huang <weih@google.com> | 2011-08-30 11:33:24 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2011-08-30 13:45:03 -0700 |
| commit | efb4bc67eecf468d8b9b49e644fc9230bded122d (patch) | |
| tree | 42c83eb777cc79a7cf0c76884a9978097c3012c3 | |
| parent | 0b4d5c5a5834d0113068959c57e0e10bf919a081 (diff) | |
| download | android_packages_apps_Gallery2-efb4bc67eecf468d8b9b49e644fc9230bded122d.tar.gz android_packages_apps_Gallery2-efb4bc67eecf468d8b9b49e644fc9230bded122d.tar.bz2 android_packages_apps_Gallery2-efb4bc67eecf468d8b9b49e644fc9230bded122d.zip | |
bug #5234237: fix NPE in Gallery
- mActivity.getGalleryActionBar() can return null, check for null before using it.
Change-Id: Ib84d5d56e51e6098adee9323c5e8d5c78f9a76e8
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index 6542be1d2..958f9b21d 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -257,8 +257,11 @@ public class AlbumSetPage extends ActivityState implements mSubtitle = data.getString(AlbumSetPage.KEY_SET_SUBTITLE); mEyePosition = new EyePosition(mActivity.getAndroidContext(), this); mDetailsSource = new MyDetailsSource(); - mActivity.getGalleryActionBar().setSelectedTab(data.getInt( - AlbumSetPage.KEY_SELECTED_TAB_TYPE, FilterUtils.CLUSTER_BY_ALBUM)); + GalleryActionBar actionBar = mActivity.getGalleryActionBar(); + if (actionBar != null) { + actionBar.setSelectedTab(data.getInt( + AlbumSetPage.KEY_SELECTED_TAB_TYPE, FilterUtils.CLUSTER_BY_ALBUM)); + } startTransition(); } |