am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb
* commit 'b894f8959c6be2de5a0c89fedb9824012783dd14':
Fix issue 3426200 Movie Studio crashes when a media item is deleted
diff --git a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java
index 6b3f223..806b284 100644
--- a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java
+++ b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java
@@ -2984,27 +2984,28 @@
}
}
}
- }
- if (!mErrorFlagSet) {
- mPreviewEditSettings.videoFrameSize = findVideoResolution(mVideoEditor
- .getAspectRatio(), maxHeight);
- populateBackgroundMusicProperties(mediaBGMList);
- /** call to native populate settings */
- try {
- nativePopulateSettings(mPreviewEditSettings, mClipProperties, mAudioSettings);
- } catch (IllegalArgumentException ex) {
- Log.e(TAG, "Illegal argument exception in nativePopulateSettings");
- 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;
+ if (!mErrorFlagSet) {
+ mPreviewEditSettings.videoFrameSize = findVideoResolution(mVideoEditor
+ .getAspectRatio(), maxHeight);
+ populateBackgroundMusicProperties(mediaBGMList);
+
+ /** call to native populate settings */
+ try {
+ nativePopulateSettings(mPreviewEditSettings, mClipProperties, mAudioSettings);
+ } catch (IllegalArgumentException ex) {
+ Log.e(TAG, "Illegal argument exception in nativePopulateSettings");
+ 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) {
mErrorFlagSet = false;