diff options
| author | John Grossman <johngro@google.com> | 2012-08-24 09:24:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-24 09:24:41 -0700 |
| commit | f6520a29781ebf1fa16efc282899fbd0c858a57e (patch) | |
| tree | b20753caf29f6ed4b7cd353b0c32772e2a638bdd | |
| parent | c0c152f81d9e7374a30f90d7ce576719d318fe98 (diff) | |
| parent | e171593f9afb2b345257cc8e6599f8da9b3437c3 (diff) | |
| download | frameworks_av-f6520a29781ebf1fa16efc282899fbd0c858a57e.zip frameworks_av-f6520a29781ebf1fa16efc282899fbd0c858a57e.tar.gz frameworks_av-f6520a29781ebf1fa16efc282899fbd0c858a57e.tar.bz2 | |
am e171593f: am 6de95261: Merge "Add a missing NULL check." into jb-mr1-dev
* commit 'e171593f9afb2b345257cc8e6599f8da9b3437c3':
Add a missing NULL check.
| -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); } |