commit 66fc0bd58b9d79b539f61869722a798e7f00701a
author Andy Hung <hunga@google.com> Wed Jan 04 11:45:50 2023 -0800
committer Andy Hung <hunga@google.com> Thu Jan 05 17:59:27 2023 -0800
tree 806470434f2f619d0e07f1074d714ae77302efc3
parent 1d312b975483e6fc4f4b50c09707c49b60b19414

audioserver: Bypass AIDL translation for in-proc AudioFlinger calls

Test: boots, kill audioserver.
Bug: 264463471
Change-Id: Ie755c7c29fb73c97f815b1f6f0056c5a116e7965

media/audioserver/main_audioserver.cpp

diff --git a/media/audioserver/main_audioserver.cpp b/media/audioserver/main_audioserver.cpp
index a45ce28..1e3bfe0 100644
--- a/media/audioserver/main_audioserver.cpp
+++ b/media/audioserver/main_audioserver.cpp
@@ -165,7 +165,8 @@
         const auto af = sp<AudioFlinger>::make();
         const auto afAdapter = sp<AudioFlingerServerAdapter>::make(af);
         ALOGD("%s: AudioFlinger created", __func__);
-        AudioSystem::setAudioFlingerBinder(afAdapter);
+        ALOGW_IF(AudioSystem::setLocalAudioFlinger(af) != OK,
+                "%s: AudioSystem already has an AudioFlinger instance!", __func__);
         const auto aps = sp<AudioPolicyService>::make();
         ALOGD("%s: AudioPolicy created", __func__);