Add interface to query the mmap support.
Currently, the mmap support is defined in system property. But the
vendor may set the values wrongly which may cause some CTS tests fail.
These values are best known by the HAL. In that case, add interface to
query MMAP support.
Test: atest AAudioTests
Test: Run OboeTester TEST OUTPUT
Test: Verify that MMAP is showed as enabled if supported
Test: Try toggling MMAP on and off when opening streams
Bug: 193275465
Change-Id: Ida9060b93fa3315031fc451bdea2004ba95207e7
diff --git a/media/audioserver/main_audioserver.cpp b/media/audioserver/main_audioserver.cpp
index 8ee1efb..e0740de 100644
--- a/media/audioserver/main_audioserver.cpp
+++ b/media/audioserver/main_audioserver.cpp
@@ -17,20 +17,26 @@
#define LOG_TAG "audioserver"
//#define LOG_NDEBUG 0
+#include <algorithm>
+
#include <fcntl.h>
#include <sys/prctl.h>
#include <sys/wait.h>
#include <cutils/properties.h>
+#include <android/media/AudioMMapPolicy.h>
+#include <android/media/AudioMMapPolicyInfo.h>
+#include <android/media/AudioMMapPolicyType.h>
+#include <android/media/IAudioFlingerService.h>
#include <binder/IPCThreadState.h>
#include <binder/ProcessState.h>
#include <binder/IServiceManager.h>
+#include <binder/IInterface.h>
#include <hidl/HidlTransportSupport.h>
#include <mediautils/LimitProcessMemory.h>
#include <utils/Log.h>
// from include_dirs
-#include "aaudio/AAudioTesting.h" // aaudio_policy_t, AAUDIO_PROP_MMAP_POLICY, AAUDIO_POLICY_*
#include "AudioFlinger.h"
#include "AudioPolicyService.h"
#include "AAudioService.h"
@@ -146,10 +152,24 @@
// AAudioService should only be used in OC-MR1 and later.
// And only enable the AAudioService if the system MMAP policy explicitly allows it.
// This prevents a client from misusing AAudioService when it is not supported.
- aaudio_policy_t mmapPolicy = property_get_int32(AAUDIO_PROP_MMAP_POLICY,
- AAUDIO_POLICY_NEVER);
- if (mmapPolicy == AAUDIO_POLICY_AUTO || mmapPolicy == AAUDIO_POLICY_ALWAYS) {
+ // If we cannot get audio flinger here, there must be some serious problems. In that case,
+ // attempting to call audio flinger on a null pointer could make the process crash
+ // and attract attentions.
+ sp<IAudioFlinger> af = AudioSystem::get_audio_flinger();
+ std::vector<media::AudioMMapPolicyInfo> policyInfos;
+ status_t status = af->getMmapPolicyInfos(
+ media::AudioMMapPolicyType::DEFAULT, &policyInfos);
+ // Initialize aaudio service when querying mmap policy succeeds and
+ // any of the policy supports MMAP.
+ if (status == NO_ERROR ||
+ std::any_of(policyInfos.begin(), policyInfos.end(), [](const auto& info) {
+ return info.mmapPolicy == media::AudioMMapPolicy::AUTO ||
+ info.mmapPolicy == media::AudioMMapPolicy::ALWAYS;
+ })) {
AAudioService::instantiate();
+ } else {
+ ALOGD("Do not init aaudio service, status %d, policy info size %zu",
+ status, policyInfos.size());
}
ProcessState::self()->startThreadPool();