commit e94c27a17fd56fd5ac63fc2de9df08cfcc80b1e3
author Mikhail Naganov <mnaganov@google.com> Thu Aug 18 17:31:46 2016 -0700
committer Mikhail Naganov <mnaganov@google.com> Thu Aug 18 17:31:46 2016 -0700
tree d88183ad52dcb7f0c96426a59cb6ed4200a996be
parent 15223ec262f8f1135be6ee727a480dd4a04457e7

audioflinger: Fix battery accounting for offload tracks

Ensure that the list of wakelock UIDs is only cleared if
the offload playback wakelock is released during async completion
wait.

Bug: 30830106
Change-Id: Icf18b9e88e55c27bc03d8a904cc91f593cc95815

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index aa2561e..5e0a7ac 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -3106,9 +3106,9 @@
                 if (!keepWakeLock()) {
                     releaseWakeLock_l();
                     released = true;
+                    mWakeLockUids.clear();
+                    mActiveTracksGeneration++;
                 }
-                mWakeLockUids.clear();
-                mActiveTracksGeneration++;
                 ALOGV("wait async completion");
                 mWaitWorkCV.wait(mLock);
                 ALOGV("async completion/wake");