commit 8726fa994082c30ef5fd92beb2ee991ac3393554
author Bryan Mawhinney <bryanmawhinney@google.com> Wed Jul 20 18:58:51 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 20 18:58:52 2016 +0000
tree e2d0ea8475e3168a92a9dc9588c57f5e73d441e6
parent b5aac433cda041c1fde2fcfadf1835f3f8d19eeb
parent ef6308df6322b9e7ee460a89e7eaea76ff7bc457

Merge "Add .mov to MediaScanner video file types" into nyc-mr1-dev

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 9169941..a3dcdcf 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -6246,7 +6246,8 @@
         mTimestamp.mTimeNs[ExtendedTimestamp::LOCATION_SERVER] = systemTime();
 
         // Update server timestamp with kernel stats
-        if (mInput->stream->get_capture_position != nullptr) {
+        if (mInput->stream->get_capture_position != nullptr
+                && mPipeSource.get() == nullptr /* don't obtain for FastCapture, could block */) {
             int64_t position, time;
             int ret = mInput->stream->get_capture_position(mInput->stream, &position, &time);
             if (ret == NO_ERROR) {