diff options
| author | Robert Shih <robertshih@google.com> | 2015-07-24 22:12:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-24 22:12:23 +0000 |
| commit | b45cb776b7ae43f763200040d6358657ab80f855 (patch) | |
| tree | f9512524e01f368c4fc5882a0a2b4f6ecea2c5eb /media/libmedia | |
| parent | 2c7d0f2013203588f9307166cad42902eb5a676f (diff) | |
| parent | 2b95bda111444f2834e64221e3a3eb1a87d43c38 (diff) | |
| download | frameworks_av-b45cb776b7ae43f763200040d6358657ab80f855.zip frameworks_av-b45cb776b7ae43f763200040d6358657ab80f855.tar.gz frameworks_av-b45cb776b7ae43f763200040d6358657ab80f855.tar.bz2 | |
Merge "Explicitly disconnect in MediaPlayer::reset" into mnc-dev
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index c215abf..502ab2d 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -574,6 +574,7 @@ status_t MediaPlayer::reset_l() ALOGE("reset() failed with return code (%d)", ret); mCurrentState = MEDIA_PLAYER_STATE_ERROR; } else { + mPlayer->disconnect(); mCurrentState = MEDIA_PLAYER_IDLE; } // setDataSource has to be called again to create a |