Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 933ff5d0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Gallery: Fix crash after rename or delete photo out of gallery"

parents ba2be0a9 48efd7d1

src/com/android/gallery3d/app/PhotoPage.java

+5 −1
Original line number Diff line number Diff line
@@ -1434,7 +1434,11 @@ public abstract class PhotoPage extends ActivityState implements 
        mRecenterCameraOnResume = false;

        switch (requestCode) {

            case REQUEST_EDIT:

                if (data.getData() == null) {

                    onUpPressed();

                } else {

                    setCurrentPhotoByIntent(data);

                }

                break;

         /*case REQUEST_CROP:

                if (resultCode == Activity.RESULT_OK) {

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -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);

                }

src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);