diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-01-21 03:36:42 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-01-21 03:36:42 -0800 |
| commit | 16870fa9241b73a8ed0b77c7741a3b4628586843 (patch) | |
| tree | 95569ea916f59aa1a7653bec86ef75cc00cf85cd | |
| parent | ac299edc98e592ed467b4f78fb54e8568963e9d4 (diff) | |
| parent | dff8029a9bc8cf7f4e3cc8b0263c1afacb5d2ef4 (diff) | |
| download | android_packages_apps_Gallery2-16870fa9241b73a8ed0b77c7741a3b4628586843.tar.gz android_packages_apps_Gallery2-16870fa9241b73a8ed0b77c7741a3b4628586843.tar.bz2 android_packages_apps_Gallery2-16870fa9241b73a8ed0b77c7741a3b4628586843.zip | |
Merge "Gallery2: Release MediaPlayer when the error occurred."
| -rw-r--r-- | src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java index f8c70505f..0cb26d2d3 100644 --- a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java +++ b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java @@ -273,6 +273,7 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr } } + mMediaPlayer.reset(); /* Otherwise, pop up an error dialog so the user knows that * something bad has happened. Only try and pop up the dialog * if we're attached to a window. When we're going away and no @@ -299,6 +300,7 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr if (mOnCompletionListener != null) { mOnCompletionListener.onCompletion(mMediaPlayer); } + release(true); } }) .setCancelable(false) |