diff options
| author | zhuw <zhuw@codeaurora.org> | 2016-08-03 10:05:00 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-02 19:44:46 -0700 |
| commit | 48efd7d136d5c42717849a6805a7aa6a4fb18243 (patch) | |
| tree | b6b4cb6a23aa5126cc788bc218a8054483b3285f /src/com/android/gallery3d/app/PhotoPage.java | |
| parent | 7ed375d6829e18a0d342d31c3217d6263b9a5c33 (diff) | |
| download | android_packages_apps_Gallery2-48efd7d136d5c42717849a6805a7aa6a4fb18243.tar.gz android_packages_apps_Gallery2-48efd7d136d5c42717849a6805a7aa6a4fb18243.tar.bz2 android_packages_apps_Gallery2-48efd7d136d5c42717849a6805a7aa6a4fb18243.zip | |
Gallery: Fix crash after rename or delete photo out of gallery
1. Fix Null Pointer Exception in ProcessingService and FilterShowActivity.
2. Modify PhotoPage to finish itself when receive null data from FilterShowActivity.
Change-Id: I8e6e101ea3e98c1bdd87ab7b5499d63c7f348f2b
CRs-Fixed: 1042815
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
| -rwxr-xr-x | src/com/android/gallery3d/app/PhotoPage.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 0c82944d8..5d4e439a5 100755 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -1434,7 +1434,11 @@ public abstract class PhotoPage extends ActivityState implements mRecenterCameraOnResume = false; switch (requestCode) { case REQUEST_EDIT: - setCurrentPhotoByIntent(data); + if (data.getData() == null) { + onUpPressed(); + } else { + setCurrentPhotoByIntent(data); + } break; /*case REQUEST_CROP: if (resultCode == Activity.RESULT_OK) { |