summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorSantosh Madhava <smadhava@google.com>2011-02-24 15:12:11 -0800
committerSantosh Madhava <smadhava@google.com>2011-02-24 15:12:11 -0800
commit89782f501343fdbbe3bd6ab36e65474d49cd4b89 (patch)
treeb80d76d1ef660894e784387bb4995c41805d4977 /media/java
parent069d748da85559ffb2d09d181b186b1f71e350e7 (diff)
downloadframeworks_base-89782f501343fdbbe3bd6ab36e65474d49cd4b89.zip
frameworks_base-89782f501343fdbbe3bd6ab36e65474d49cd4b89.tar.gz
frameworks_base-89782f501343fdbbe3bd6ab36e65474d49cd4b89.tar.bz2
Fix for issue 3485010: The project thumbnail is not regenerated
Change-Id: I2c882bdf2e82b95b1ad19ab50ec636a78b1c1561
Diffstat (limited to 'media/java')
-rwxr-xr-xmedia/java/android/media/videoeditor/VideoEditorImpl.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/media/java/android/media/videoeditor/VideoEditorImpl.java b/media/java/android/media/videoeditor/VideoEditorImpl.java
index 3019057..a6b4544 100755
--- a/media/java/android/media/videoeditor/VideoEditorImpl.java
+++ b/media/java/android/media/videoeditor/VideoEditorImpl.java
@@ -928,6 +928,7 @@ public class VideoEditorImpl implements VideoEditor {
String name;
MediaItem currentMediaItem = null;
Overlay currentOverlay = null;
+ boolean regenerateProjectThumbnail = false;
while (eventType != XmlPullParser.END_DOCUMENT) {
switch (eventType) {
case XmlPullParser.START_TAG: {
@@ -948,6 +949,11 @@ public class VideoEditorImpl implements VideoEditor {
} catch (Exception ex) {
Log.w(TAG, "Cannot load media item: " + mediaItemId, ex);
currentMediaItem = null;
+
+ // First media item is invalid, mark for project thumbnail removal
+ if (mMediaItems.size() == 0) {
+ regenerateProjectThumbnail = true;
+ }
// Ignore the media item
ignoredMediaItems.add(mediaItemId);
}
@@ -1043,6 +1049,11 @@ public class VideoEditorImpl implements VideoEditor {
eventType = parser.next();
}
computeTimelineDuration();
+ // Regenerate project thumbnail
+ if (regenerateProjectThumbnail) {
+ generateProjectThumbnail();
+ regenerateProjectThumbnail = false;
+ }
} finally {
if (fis != null) {
fis.close();