diff options
| author | Gloria Wang <gwang@google.com> | 2010-03-05 10:22:04 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-05 10:22:04 -0800 |
| commit | 3b7991efec59c681b2128b6f46796ba242068592 (patch) | |
| tree | 10e81c94aae5273eaabc14e2eac33b2083f2a932 /core | |
| parent | 16d8cf905b86965875cc8ef5d5c996b0d78fef79 (diff) | |
| parent | efb882cf75eef39ecaf9f8920ed302a019fa629f (diff) | |
| download | frameworks_base-3b7991efec59c681b2128b6f46796ba242068592.zip frameworks_base-3b7991efec59c681b2128b6f46796ba242068592.tar.gz frameworks_base-3b7991efec59c681b2128b6f46796ba242068592.tar.bz2 | |
Merge "Release mediaplayer if the current state is not suspending. Fix for bug 2480093."
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/VideoView.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/VideoView.java b/core/java/android/widget/VideoView.java index c2517a8..fb8b5aa 100644 --- a/core/java/android/widget/VideoView.java +++ b/core/java/android/widget/VideoView.java @@ -484,6 +484,9 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { // after we return from this we can't use the surface any more mSurfaceHolder = null; if (mMediaController != null) mMediaController.hide(); + if (mCurrentState != STATE_SUSPEND) { + release(true); + } } }; |