diff options
| author | Andy Hung <hunga@google.com> | 2014-12-09 00:57:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 00:57:40 +0000 |
| commit | f849e1984ae639112e125a91e27098cf0ebc68c1 (patch) | |
| tree | 4eea9fd5416a58567491624048663ae5263fc2da /services | |
| parent | 5a246de63468f2da0e6e6250a001da0dcefded4e (diff) | |
| parent | 900f6535af232298e4a77477907a40f68e8dc61b (diff) | |
| download | frameworks_av-f849e1984ae639112e125a91e27098cf0ebc68c1.zip frameworks_av-f849e1984ae639112e125a91e27098cf0ebc68c1.tar.gz frameworks_av-f849e1984ae639112e125a91e27098cf0ebc68c1.tar.bz2 | |
am 900f6535: am 561f50de: am db995fe3: Merge "Fix getTimestamp if offload thread is not initialized." into lmp-mr1-dev
* commit '900f6535af232298e4a77477907a40f68e8dc61b':
Fix getTimestamp if offload thread is not initialized.
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index a5dc3e6..d5952bf 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -2754,7 +2754,8 @@ status_t AudioFlinger::PlaybackThread::getTimestamp_l(AudioTimestamp& timestamp) if (mNormalSink != 0) { return mNormalSink->getTimestamp(timestamp); } - if ((mType == OFFLOAD || mType == DIRECT) && mOutput->stream->get_presentation_position) { + if ((mType == OFFLOAD || mType == DIRECT) + && mOutput != NULL && mOutput->stream->get_presentation_position) { uint64_t position64; int ret = mOutput->stream->get_presentation_position( mOutput->stream, &position64, ×tamp.mTime); |