diff options
| author | wqi <wqi@codeaurora.org> | 2016-06-02 15:47:02 +0800 |
|---|---|---|
| committer | Likai Ding <likaid@codeaurora.org> | 2016-07-08 10:12:10 +0800 |
| commit | 794da4ec640ec97664f1785dd8599a4607dcbe0b (patch) | |
| tree | d9dcddb4fc66d0b7b7392f098e0699d850ae321b | |
| parent | ad5509e1fcd462a95d6ded18cd2260bb2ea7f370 (diff) | |
| download | android_packages_apps_Gallery2-794da4ec640ec97664f1785dd8599a4607dcbe0b.tar.gz android_packages_apps_Gallery2-794da4ec640ec97664f1785dd8599a4607dcbe0b.tar.bz2 android_packages_apps_Gallery2-794da4ec640ec97664f1785dd8599a4607dcbe0b.zip | |
Gallery2: Fix NullPointerException when edit picture.
Add NullPointerException check of mMasterImage.
Change-Id: I278f95d96bd83f2683fc96455e06301e2e1aa3f7
CRs-Fixed: 1005204
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index f0af615c0..5abd82768 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -1769,6 +1769,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } void resetHistory() { + if (mMasterImage == null) { + return; + } HistoryManager adapter = mMasterImage.getHistory(); adapter.reset(); HistoryItem historyItem = adapter.getItem(0); |