diff options
| author | zhuw <zhuw@codeaurora.org> | 2017-07-20 18:15:44 +0800 |
|---|---|---|
| committer | zhuw <zhuw@codeaurora.org> | 2017-07-20 18:15:44 +0800 |
| commit | d853e5a110221f81745f40501ae7895fe181d65b (patch) | |
| tree | 1efb0e0fa54203e7cbc1e7f82738873bad771d0c /src/com/android/gallery3d/app | |
| parent | e7dc0d2a497e1f36ebb6ebf0f1022ecdc44c8263 (diff) | |
| download | android_packages_apps_Gallery2-d853e5a110221f81745f40501ae7895fe181d65b.tar.gz android_packages_apps_Gallery2-d853e5a110221f81745f40501ae7895fe181d65b.tar.bz2 android_packages_apps_Gallery2-d853e5a110221f81745f40501ae7895fe181d65b.zip | |
Fix AssertionError int StateManager
we should verify null pointer before we call getTopState
Change-Id: I48a22fdb859d5edbc968948939408ee5eccf6e74
CRs-Fixed: 2079520
Diffstat (limited to 'src/com/android/gallery3d/app')
| -rw-r--r-- | src/com/android/gallery3d/app/StateManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/StateManager.java b/src/com/android/gallery3d/app/StateManager.java index aa372a824..40a713019 100644 --- a/src/com/android/gallery3d/app/StateManager.java +++ b/src/com/android/gallery3d/app/StateManager.java @@ -130,7 +130,9 @@ public class StateManager { } public void notifyActivityResult(int requestCode, int resultCode, Intent data) { - getTopState().onStateResult(requestCode, resultCode, data); + if (!mStack.isEmpty()) { + getTopState().onStateResult(requestCode, resultCode, data); + } } public void clearActivityResult() { |