diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-22 13:55:32 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-22 13:55:32 -0700 |
| commit | f7b38dfe6dd58a1e93f1106d32a8db6eb00c5bad (patch) | |
| tree | 485aed3d91e0c290be14cd1857f717afc986ee1c /src/com/android/gallery3d/app | |
| parent | 0dd4553a4aaca363ff1d626f73a80f792b2dee59 (diff) | |
| parent | d853e5a110221f81745f40501ae7895fe181d65b (diff) | |
| download | android_packages_apps_Gallery2-f7b38dfe6dd58a1e93f1106d32a8db6eb00c5bad.tar.gz android_packages_apps_Gallery2-f7b38dfe6dd58a1e93f1106d32a8db6eb00c5bad.tar.bz2 android_packages_apps_Gallery2-f7b38dfe6dd58a1e93f1106d32a8db6eb00c5bad.zip | |
Merge "Fix AssertionError int StateManager"
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() { |