commit dcdfaecc1fa630a799e1fdb508a9b92da55abc36
author Nicolas Roulet <nicoroulet@google.com> Tue Feb 14 10:18:39 2017 -0800
committer Nicolas Roulet <nicoroulet@google.com> Thu Mar 09 12:30:24 2017 -0800
tree 407138ab3b7cef085ca4f283ea24378910ce775e
parent cca34c05ca2d5e7ac6c2fbee3ac2db88f059143d

NBLog periodic merging thread

Bug: 35468674
Test: no change in functionality, everything works as before
Change-Id: Id2cea243bc15767ca6803c9505bf23a18411500e

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index b10e42c..b247b64 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -2953,6 +2953,10 @@
 #endif
     while (!exitPending())
     {
+        // Log merge requests are performed during AudioFlinger binder transactions, but
+        // that does not cover audio playback. It's requested here for that reason.
+        mAudioFlinger->requestLogMerge();
+
         cpuStats.sample(myName);
 
         Vector< sp<EffectChain> > effectChains;