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

Commit 73edcfe8 authored by Dharmaray Kundargi's avatar Dharmaray Kundargi Committed by Android Git Automerger
Browse files

am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item... 

am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb

* commit 'b894f895':
  Fix issue 3426200 Movie Studio crashes when a media item is deleted
parents 57bb7faf b894f895

media/java/android/media/videoeditor/MediaArtistNativeHelper.java

+20 −19
Original line number Diff line number Diff line
@@ -2984,7 +2984,7 @@ class MediaArtistNativeHelper { 
                        }

                    }

                }

            }



                if (!mErrorFlagSet) {

                    mPreviewEditSettings.videoFrameSize = findVideoResolution(mVideoEditor

                            .getAspectRatio(), maxHeight);
@@ -3006,6 +3006,7 @@ class MediaArtistNativeHelper { 
                    mInvalidatePreviewArray = false;

                    mProcessingState  = PROCESSING_NONE;

                }

            }

            if (mErrorFlagSet) {

                mErrorFlagSet = false;

                throw new RuntimeException("preview generation cannot be completed");