diff options
author | Santosh Madhava <smadhava@google.com> | 2011-03-02 09:48:39 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-02 09:48:39 -0800 |
commit | 06b3afe2bdea5a00a2221ca1f3381def1c431ab7 (patch) | |
tree | 70e9835fadef8bc68fadc740cb23770f771ae862 /media | |
parent | 41440cf8cf275ada6d18b3bfa5dc9ca9fce77bca (diff) | |
parent | 7256a7c525e079442fd733db692936f5f070b996 (diff) | |
download | frameworks_base-06b3afe2bdea5a00a2221ca1f3381def1c431ab7.zip frameworks_base-06b3afe2bdea5a00a2221ca1f3381def1c431ab7.tar.gz frameworks_base-06b3afe2bdea5a00a2221ca1f3381def1c431ab7.tar.bz2 |
Merge "Fix for issue 3495914: (In Java) Video clip switches between start and end"
Diffstat (limited to 'media')
-rw-r--r-- | media/java/android/media/videoeditor/MediaArtistNativeHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java index 53bbb0f..29c4b89 100644 --- a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java +++ b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java @@ -1919,14 +1919,14 @@ class MediaArtistNativeHelper { overlayData = null; } - mPreviewProgressListener.onProgress(mVideoEditor, progress, overlayData); - if (progress != 0) { mPreviewProgress = progress; } if (isFinished) { mPreviewProgressListener.onStop(mVideoEditor); + } else { + mPreviewProgressListener.onProgress(mVideoEditor, progress, overlayData); } } } |