commit 4e6ff4151f03c6b7211136b83e71fca34bbc402c
author Mikhail Naganov <mnaganov@google.com> Mon Aug 22 23:08:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 22 23:08:27 2016 +0000
tree 990012b1ec4e5726b8998a794039c02978ec118a
parent b57d5f9e2a1bd8e079427f21f8f1afe65a5f1e13
parent e50af19356b852781a28233d50f06b7adde7d470

audioflinger: Fix battery accounting for offload tracks am: e94c27a17f am: 7cba7beec4
am: e50af19356

Change-Id: I80e26985a69800d31b0aa9331bccdc0a91caa08b

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 1907e12..99a5297 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");