diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-03 17:44:44 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-03 17:44:44 -0700 |
| commit | 933ff5d0c4124f4e57a08d6e6a18fa1705241dab (patch) | |
| tree | 8b52365252e6a8a4fef24148ac714c72134434ba /src/com | |
| parent | ba2be0a98cc97baee0b6abfd50b09da362661e3e (diff) | |
| parent | 48efd7d136d5c42717849a6805a7aa6a4fb18243 (diff) | |
| download | android_packages_apps_Gallery2-933ff5d0c4124f4e57a08d6e6a18fa1705241dab.tar.gz android_packages_apps_Gallery2-933ff5d0c4124f4e57a08d6e6a18fa1705241dab.tar.bz2 android_packages_apps_Gallery2-933ff5d0c4124f4e57a08d6e6a18fa1705241dab.zip | |
Merge "Gallery: Fix crash after rename or delete photo out of gallery"
Diffstat (limited to 'src/com')
3 files changed, 10 insertions, 3 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) { diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 890458b4b..157087972 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -134,6 +134,8 @@ import com.android.gallery3d.util.GalleryUtils; import com.android.photos.data.GalleryBitmapPool; import com.thundersoft.hz.selfportrait.makeup.engine.MakeupEngine; +import static android.app.Activity.RESULT_OK; + public class FilterShowActivity extends FragmentActivity implements OnItemClickListener, OnShareTargetSelectedListener, DialogInterface.OnShowListener, DialogInterface.OnDismissListener, PopupMenu.OnDismissListener{ @@ -249,7 +251,8 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL long requestId = bundle.getLong(ProcessingService.KEY_REQUEST_ID); //only handle own request if (requestId == mRequestId) { - Uri saveUri = Uri.parse(bundle.getString(ProcessingService.KEY_URL)); + String url = bundle.getString(ProcessingService.KEY_URL); + Uri saveUri = url == null ? null : Uri.parse(url); boolean releaseDualCam = bundle.getBoolean(ProcessingService.KEY_DUALCAM); completeSaveImage(saveUri, releaseDualCam); } diff --git a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java index 86d4c92c1..b5e9609e2 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java +++ b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java @@ -285,7 +285,7 @@ public class ProcessingService extends Service { if (exit) { // terminate now Bundle bundle = new Bundle(); - bundle.putString(KEY_URL, result.toString()); + bundle.putString(KEY_URL, result == null ? null : result.toString()); bundle.putLong(KEY_REQUEST_ID, requestId); bundle.putBoolean(KEY_DUALCAM, releaseDualCam); broadcastState(SAVE_IMAGE_COMPLETE_ACTION, bundle); |