commit 9ee56ec1a7ace45b42b65e01fdda98114b5c0833
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 07 23:47:55 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 07 23:47:55 2019 +0000
tree 0690e8bd1cf46c3824b49956d5dbfae0770f0270
parent d7a1506715bf9d588210d46b8d6563fc9e92e25a
parent 59cee8cc171715174b912c326ba8a5f500e3afdd

Merge "audio policy: fix capture policy for HOTWORD source"

services/audiopolicy/service/AudioPolicyService.cpp

diff --git a/services/audiopolicy/service/AudioPolicyService.cpp b/services/audiopolicy/service/AudioPolicyService.cpp
index 85ea94f..62010e1 100644
--- a/services/audiopolicy/service/AudioPolicyService.cpp
+++ b/services/audiopolicy/service/AudioPolicyService.cpp
@@ -458,16 +458,20 @@
             continue;
         }
 
+        bool isAssistant = mUidPolicy->isAssistantUid(current->uid);
         if (appState == APP_STATE_TOP) {
             if (current->startTimeNs > topStartNs) {
                 topActive = current;
                 topStartNs = current->startTimeNs;
             }
-            if (mUidPolicy->isAssistantUid(current->uid)) {
+            if (isAssistant) {
                 isAssistantOnTop = true;
             }
         }
-        if (current->startTimeNs > latestStartNs) {
+        // Assistant capturing for HOTWORD not considered for latest active to avoid
+        // masking regular clients started before
+        if (current->startTimeNs > latestStartNs &&
+            !(current->attributes.source == AUDIO_SOURCE_HOTWORD && isAssistant)) {
             latestActive = current;
             latestStartNs = current->startTimeNs;
         }