diff options
| author | John Grossman <johngro@google.com> | 2012-08-24 09:22:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-24 09:22:23 -0700 |
| commit | e171593f9afb2b345257cc8e6599f8da9b3437c3 (patch) | |
| tree | 77f07b8a0d4aeb0ff8ad0badf69cab797ce415ef /media/libmediaplayerservice | |
| parent | e4b03a9c2a467b1bc088962e055092c76a5f7ad5 (diff) | |
| parent | 6de95261c619d53f3e7b431fd17995e73928571e (diff) | |
| download | frameworks_av-e171593f9afb2b345257cc8e6599f8da9b3437c3.zip frameworks_av-e171593f9afb2b345257cc8e6599f8da9b3437c3.tar.gz frameworks_av-e171593f9afb2b345257cc8e6599f8da9b3437c3.tar.bz2 | |
am 6de95261: Merge "Add a missing NULL check." into jb-mr1-dev
* commit '6de95261c619d53f3e7b431fd17995e73928571e':
Add a missing NULL check.
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 8620856..58e4723 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -1046,7 +1046,8 @@ void MediaPlayerService::Client::notify( { Mutex::Autolock l(client->mLock); if (msg == MEDIA_PLAYBACK_COMPLETE && client->mNextClient != NULL) { - client->mAudioOutput->switchToNextOutput(); + if (client->mAudioOutput != NULL) + client->mAudioOutput->switchToNextOutput(); client->mNextClient->start(); client->mNextClient->mClient->notify(MEDIA_INFO, MEDIA_INFO_STARTED_AS_NEXT, 0, obj); } |