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

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

Browse Source
This commit is contained in:
Dharmaray Kundargi
2011-02-04 17:01:51 -08:00
committed by Android (Google) Code Review
parent 3944b784e9 0d99f5a95c
commit b894f8959c
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 */
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;