commit a18dced5af77307be66d8c05ac05e6160ab8d8ed
author Eric Laurent <elaurent@google.com> Fri Jul 20 15:14:54 2018 -0700
committer Eric Laurent <elaurent@google.com> Fri Jul 20 15:30:25 2018 -0700
tree f23e3ffe92d2753871f194de45d8a69a60180726
parent 68234ec840e4eefdb9d0bf400c745a09a07156c9

audio policy: refactor record activity tracking (AudioSession)

Refactor input activity ref counting and callbacks to align
with implementation for output.

This will help migration to per client activity tracking.

Test: audio smoke test, CTS for AudioRecord
Change-Id: I8806446f33d3090f1042e0956df81318646d5285

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 5cdd63a..efc9753 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1679,8 +1679,7 @@
                                                      config->channel_mask,
                                                      flags,
                                                      uid,
-                                                     isSoundTrigger,
-                                                     policyMix, mpClientInterface);
+                                                     isSoundTrigger);
 
 // FIXME: disable concurrent capture until UI is ready
 #if 0
@@ -2007,7 +2006,7 @@
 
     // increment activity count before calling getNewInputDevice() below as only active sessions
     // are considered for device selection
-    audioSession->changeActiveCount(1);
+    inputDesc->changeRefCount(session, 1);
 
     // Routing?
     mInputRoutes.incRouteActivity(session);
@@ -2021,7 +2020,7 @@
         status_t status = inputDesc->start();
         if (status != NO_ERROR) {
             mInputRoutes.decRouteActivity(session);
-            audioSession->changeActiveCount(-1);
+            inputDesc->changeRefCount(session, -1);
             return status;
         }
 
@@ -2085,7 +2084,7 @@
         return INVALID_OPERATION;
     }
 
-    audioSession->changeActiveCount(-1);
+    inputDesc->changeRefCount(session, -1);
 
     // Routing?
     mInputRoutes.decRouteActivity(session);