commit 163ce833fa11d50e40a5111b17336feb7dad490b
author François Gaffie <francois.gaffie@renault.com> Wed Jun 28 11:36:35 2023 +0200
committer Shunkai Yao <yaoshunkai@google.com> Fri Jun 30 21:14:04 2023 +0000
tree 3f0ab1b369744da11e4025e0711a3cb3a17c819a
parent 0f66058e024e31395159c21ba61a899c35893036

audio effect: fix registration of default device effects

Bug: 268441977
Test: dumpsys media.audio_policy shows registered default device
effect(s)
dumpsys media.audio_flinger shows enabled / registered default device
effect(s).

Device effects are initialized asynchronously when audio policy service
is created. During the initialization, these effects will register to
audio policy service. However, the service is declared available only at
the late init.
It leads to erratic registration of default device effects.

Change-Id: Ia6e2c4f05ef600ab1e47d78505e5cae9df5c525d
Signed-off-by: François Gaffie <francois.gaffie@renault.com>

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index c8998ad..2a33991 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -512,11 +512,12 @@
     if (!locked) {
         result.append("\t\tCould not lock Fx mutex:\n");
     }
-
-    result.append("\t\tSession State Registered Enabled Suspended:\n");
-    result.appendFormat("\t\t%05d   %03d   %s          %s       %s\n",
-            mSessionId, mState, mPolicyRegistered ? "y" : "n",
-            mPolicyEnabled ? "y" : "n", mSuspended ? "y" : "n");
+    bool isInternal = isInternal_l();
+    result.append("\t\tSession State Registered Internal Enabled Suspended:\n");
+    result.appendFormat("\t\t%05d   %03d   %s          %s        %s       %s\n",
+            mSessionId, mState, mPolicyRegistered ? "y" : "n", isInternal ? "y" : "n",
+            ((isInternal && isEnabled()) || (!isInternal && mPolicyEnabled)) ? "y" : "n",
+            mSuspended ? "y" : "n");
 
     result.append("\t\tDescriptor:\n");
     char uuidStr[64];