diff options
| author | Andy Hung <hunga@google.com> | 2014-12-05 02:46:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-05 02:46:08 +0000 |
| commit | 561f50de82ce47f11ba8d4f25db1ca1d8467b2a7 (patch) | |
| tree | ded3c6a20c5f3395dfc680951754df7625d95675 | |
| parent | 7f099ffd8feeca1d9ac6616e64f422a35cdb9890 (diff) | |
| parent | db995fe3239276be9dfd9e446b10417e07948acc (diff) | |
| download | frameworks_av-561f50de82ce47f11ba8d4f25db1ca1d8467b2a7.zip frameworks_av-561f50de82ce47f11ba8d4f25db1ca1d8467b2a7.tar.gz frameworks_av-561f50de82ce47f11ba8d4f25db1ca1d8467b2a7.tar.bz2 | |
am db995fe3: Merge "Fix getTimestamp if offload thread is not initialized." into lmp-mr1-dev
* commit 'db995fe3239276be9dfd9e446b10417e07948acc':
Fix getTimestamp if offload thread is not initialized.
| -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 08d9eb1..dab6d91 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -2688,7 +2688,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); |