Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'b894f8959c6be2de5a0c89fedb9824012783dd14':
  Fix issue 3426200 Movie Studio crashes when a media item is deleted
This commit is contained in:
Dharmaray Kundargi
2011-02-04 17:03:47 -08:00
committed by Android Git Automerger
parent 57bb7faf97 b894f8959c
commit 73edcfe8f4
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
media/java/android/media/videoeditor/MediaArtistNativeHelper.java
View File

@@ -2984,27 +2984,28 @@ class MediaArtistNativeHelper {
} }
} }
} }
}
if (!mErrorFlagSet) {
mPreviewEditSettings.videoFrameSize = findVideoResolution(mVideoEditor
.getAspectRatio(), maxHeight);
populateBackgroundMusicProperties(mediaBGMList);
/** call to native populate settings */ if (!mErrorFlagSet) {
try { mPreviewEditSettings.videoFrameSize = findVideoResolution(mVideoEditor
nativePopulateSettings(mPreviewEditSettings, mClipProperties, mAudioSettings); .getAspectRatio(), maxHeight);
} catch (IllegalArgumentException ex) { populateBackgroundMusicProperties(mediaBGMList);
Log.e(TAG, "Illegal argument exception in nativePopulateSettings");
throw ex; /** call to native populate settings */
} catch (IllegalStateException ex) { try {
Log.e(TAG, "Illegal state exception in nativePopulateSettings"); nativePopulateSettings(mPreviewEditSettings, mClipProperties, mAudioSettings);
throw ex; } catch (IllegalArgumentException ex) {
} catch (RuntimeException ex) { Log.e(TAG, "Illegal argument exception in nativePopulateSettings");
Log.e(TAG, "Runtime exception in nativePopulateSettings"); throw ex;
throw ex; } catch (IllegalStateException ex) {
Log.e(TAG, "Illegal state exception in nativePopulateSettings");
throw ex;
} catch (RuntimeException ex) {
Log.e(TAG, "Runtime exception in nativePopulateSettings");
throw ex;
}
mInvalidatePreviewArray = false;
mProcessingState = PROCESSING_NONE;
} }
mInvalidatePreviewArray = false;
mProcessingState = PROCESSING_NONE;
} }
if (mErrorFlagSet) { if (mErrorFlagSet) {
mErrorFlagSet = false; mErrorFlagSet = false;