commit 4b06aec0d4ce89859c0376096fdffeec50c65c2f
author Andy Hung <hunga@google.com> Thu Jul 07 21:27:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 07 21:27:23 2016 +0000
tree 6c91488b275509a3eaa4c4a7a26088f3e4191c54
parent 8d54707d1a6219c9b28d851794de831579de3be3
parent bf6dc1af5bd88135f47c2489c03cdb9f95d57927

Merge \"Attribute throttle time to previous loops write time\" into nyc-mr1-dev
am: bf6dc1af5b

Change-Id: I4bc857144d49760097f7344c1d58ad7444b66548

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index eb3aad9..a5b2e26 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -3326,6 +3326,9 @@
                                     " ret(%zd) deltaMs(%d) requires sleep %d ms",
                                     this, ret, deltaMs, throttleMs);
                             mThreadThrottleTimeMs += throttleMs;
+                            // Throttle must be attributed to the previous mixer loop's write time
+                            // to allow back-to-back throttling.
+                            lastWriteFinished += throttleMs * 1000000;
                         } else {
                             uint32_t diff = mThreadThrottleTimeMs - mThreadThrottleEndMs;
                             if (diff > 0) {