Revert^2 "Add APIs to query MMAP support in AAudio."
aca8f4620d31b4788e579f3fcc048b90a23d6758
Change-Id: I8db2f75f1af5df667e0c00b195feb55551337f88
diff --git a/services/audiopolicy/AudioPolicyInterface.h b/services/audiopolicy/AudioPolicyInterface.h
index edcb805..d0548ef 100644
--- a/services/audiopolicy/AudioPolicyInterface.h
+++ b/services/audiopolicy/AudioPolicyInterface.h
@@ -19,6 +19,8 @@
#include <android/media/DeviceConnectedState.h>
#include <android/media/TrackInternalMuteInfo.h>
+#include <android/media/audio/common/AudioMMapPolicyInfo.h>
+#include <android/media/audio/common/AudioMMapPolicyType.h>
#include <media/AudioCommonTypes.h>
#include <media/AudioContainers.h>
#include <media/AudioDeviceTypeAddr.h>
@@ -444,6 +446,13 @@
virtual status_t clearPreferredMixerAttributes(const audio_attributes_t* attr,
audio_port_handle_t portId,
uid_t uid) = 0;
+
+ virtual status_t getMmapPolicyInfos(
+ media::audio::common::AudioMMapPolicyType policyType,
+ std::vector<media::audio::common::AudioMMapPolicyInfo> *policyInfos) = 0;
+ virtual status_t getMmapPolicyForDevice(
+ media::audio::common::AudioMMapPolicyType policyType,
+ media::audio::common::AudioMMapPolicyInfo *policyInfo) = 0;
};
// Audio Policy client Interface
@@ -608,6 +617,10 @@
virtual status_t setTracksInternalMute(
const std::vector<media::TrackInternalMuteInfo>& tracksInternalMute) = 0;
+
+ virtual status_t getMmapPolicyInfos(
+ media::audio::common::AudioMMapPolicyType policyType,
+ std::vector<media::audio::common::AudioMMapPolicyInfo> *policyInfos) = 0;
};
// These are the signatures of createAudioPolicyManager/destroyAudioPolicyManager
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index c1c4a28..36809ab 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -40,6 +40,7 @@
#include <vector>
#include <Serializer.h>
+#include <android/media/audio/common/AudioMMapPolicy.h>
#include <android/media/audio/common/AudioPort.h>
#include <com_android_media_audio.h>
#include <android_media_audiopolicy.h>
@@ -64,6 +65,10 @@
using android::media::audio::common::AudioDevice;
using android::media::audio::common::AudioDeviceAddress;
+using android::media::audio::common::AudioDeviceDescription;
+using android::media::audio::common::AudioMMapPolicy;
+using android::media::audio::common::AudioMMapPolicyInfo;
+using android::media::audio::common::AudioMMapPolicyType;
using android::media::audio::common::AudioPortDeviceExt;
using android::media::audio::common::AudioPortExt;
using com::android::media::audioserver::fix_call_audio_patch;
@@ -4707,6 +4712,18 @@
dumpDeviceTypes({it.first}).c_str(),
mEngine->getVolumeGroupForAttributes(it.second));
}
+
+ // dump mmap policy by device
+ dst->appendFormat("\nMmap policy:\n");
+ for (const auto& [policyType, policyByDevice] : mMmapPolicyByDeviceType) {
+ std::stringstream ss;
+ ss << '{';
+ for (const auto& [deviceType, policy] : policyByDevice) {
+ ss << deviceType.toString() << ":" << toString(policy) << " ";
+ }
+ ss << '}';
+ dst->appendFormat(" - %s: %s\n", toString(policyType).c_str(), ss.str().c_str());
+ }
}
status_t AudioPolicyManager::dump(int fd)
@@ -9362,4 +9379,88 @@
}
}
+status_t AudioPolicyManager::getMmapPolicyInfos(AudioMMapPolicyType policyType,
+ std::vector<AudioMMapPolicyInfo> *policyInfos) {
+ if (policyType != AudioMMapPolicyType::DEFAULT &&
+ policyType != AudioMMapPolicyType::EXCLUSIVE) {
+ return BAD_VALUE;
+ }
+ if (mMmapPolicyByDeviceType.count(policyType) == 0) {
+ if (status_t status = updateMmapPolicyInfos(policyType); status != NO_ERROR) {
+ return status;
+ }
+ }
+ *policyInfos = mMmapPolicyInfos[policyType];
+ return NO_ERROR;
+}
+
+status_t AudioPolicyManager::getMmapPolicyForDevice(
+ AudioMMapPolicyType policyType, AudioMMapPolicyInfo *policyInfo) {
+ if (policyType != AudioMMapPolicyType::DEFAULT &&
+ policyType != AudioMMapPolicyType::EXCLUSIVE) {
+ return BAD_VALUE;
+ }
+ if (mMmapPolicyByDeviceType.count(policyType) == 0) {
+ if (status_t status = updateMmapPolicyInfos(policyType); status != NO_ERROR) {
+ return status;
+ }
+ }
+ auto it = mMmapPolicyByDeviceType[policyType].find(policyInfo->device.type);
+ policyInfo->mmapPolicy = it == mMmapPolicyByDeviceType[policyType].end()
+ ? AudioMMapPolicy::NEVER : it->second;
+ return NO_ERROR;
+}
+
+status_t AudioPolicyManager::updateMmapPolicyInfos(AudioMMapPolicyType policyType) {
+ std::vector<AudioMMapPolicyInfo> policyInfos;
+ if (status_t status = mpClientInterface->getMmapPolicyInfos(policyType, &policyInfos);
+ status != NO_ERROR) {
+ ALOGE("%s, failed, error = %d", __func__, status);
+ return status;
+ }
+ std::map<AudioDeviceDescription, AudioMMapPolicy> mmapPolicyByDeviceType;
+ if (policyInfos.size() == 1 && policyInfos[0].device == AudioDevice()) {
+ // When there is only one AudioMMapPolicyInfo instance and the device is a default value,
+ // it indicates the mmap policy is reported via system property. In that case, use the
+ // routing information to fill details for how mmap is supported for a particular device.
+ for (const auto &hwModule: mHwModules) {
+ for (const auto &profile: hwModule->getInputProfiles()) {
+ if ((profile->getFlags() & AUDIO_INPUT_FLAG_MMAP_NOIRQ)
+ != AUDIO_INPUT_FLAG_MMAP_NOIRQ) {
+ continue;
+ }
+ for (const auto &device: profile->getSupportedDevices()) {
+ auto deviceDesc =
+ legacy2aidl_audio_devices_t_AudioDeviceDescription(device->type());
+ if (deviceDesc.ok()) {
+ mmapPolicyByDeviceType.emplace(
+ deviceDesc.value(), policyInfos[0].mmapPolicy);
+ }
+ }
+ }
+ for (const auto &profile: hwModule->getOutputProfiles()) {
+ if ((profile->getFlags() & AUDIO_OUTPUT_FLAG_MMAP_NOIRQ)
+ != AUDIO_OUTPUT_FLAG_MMAP_NOIRQ) {
+ continue;
+ }
+ for (const auto &device: profile->getSupportedDevices()) {
+ auto deviceDesc =
+ legacy2aidl_audio_devices_t_AudioDeviceDescription(device->type());
+ if (deviceDesc.ok()) {
+ mmapPolicyByDeviceType.emplace(
+ deviceDesc.value(), policyInfos[0].mmapPolicy);
+ }
+ }
+ }
+ }
+ } else {
+ for (const auto &info: policyInfos) {
+ mmapPolicyByDeviceType[info.device.type] = info.mmapPolicy;
+ }
+ }
+ mMmapPolicyByDeviceType.emplace(policyType, mmapPolicyByDeviceType);
+ mMmapPolicyInfos.emplace(policyType, policyInfos);
+ return NO_ERROR;
+}
+
} // namespace android
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
index 9ad2ea5..6c247ba 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
@@ -436,6 +436,13 @@
void onNewAudioModulesAvailable() override;
+ status_t getMmapPolicyInfos(
+ media::audio::common::AudioMMapPolicyType policyType,
+ std::vector<media::audio::common::AudioMMapPolicyInfo> *policyInfos) override;
+ status_t getMmapPolicyForDevice(
+ media::audio::common::AudioMMapPolicyType policyType,
+ media::audio::common::AudioMMapPolicyInfo *policyInfo) override;
+
status_t initialize();
protected:
@@ -1408,9 +1415,17 @@
int index,
const DeviceTypeSet &deviceTypes);
+ status_t updateMmapPolicyInfos(media::audio::common::AudioMMapPolicyType policyType);
+
// Contains for devices that support absolute volume the audio attributes
// corresponding to the streams that are driving the volume changes
std::unordered_map<audio_devices_t, audio_attributes_t> mAbsoluteVolumeDrivingStreams;
+
+ std::map<media::audio::common::AudioMMapPolicyType,
+ const std::vector<media::audio::common::AudioMMapPolicyInfo>> mMmapPolicyInfos;
+ std::map<media::audio::common::AudioMMapPolicyType,
+ const std::map<media::audio::common::AudioDeviceDescription,
+ media::audio::common::AudioMMapPolicy>> mMmapPolicyByDeviceType;
};
};
diff --git a/services/audiopolicy/service/AudioPolicyClientImpl.cpp b/services/audiopolicy/service/AudioPolicyClientImpl.cpp
index 363dfa7..cb42977 100644
--- a/services/audiopolicy/service/AudioPolicyClientImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyClientImpl.cpp
@@ -376,4 +376,14 @@
return af->setTracksInternalMute(tracksInternalMute);
}
+status_t AudioPolicyService::AudioPolicyClient::getMmapPolicyInfos(
+ media::audio::common::AudioMMapPolicyType policyType,
+ std::vector<media::audio::common::AudioMMapPolicyInfo> *policyInfos) {
+ sp<IAudioFlinger> af = AudioSystem::get_audio_flinger();
+ if (af == nullptr) {
+ return PERMISSION_DENIED;
+ }
+ return af->getMmapPolicyInfos(policyType, policyInfos);
+}
+
} // namespace android
diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index 24ab6a1..2e25fb2 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -2753,4 +2753,24 @@
return Status::ok();
}
+Status AudioPolicyService::getMmapPolicyInfos(
+ AudioMMapPolicyType policyType, std::vector<AudioMMapPolicyInfo> *_aidl_return) {
+ if (mAudioPolicyManager == nullptr) {
+ return binderStatusFromStatusT(NO_INIT);
+ }
+ audio_utils::lock_guard _l(mMutex);
+ return binderStatusFromStatusT(
+ mAudioPolicyManager->getMmapPolicyInfos(policyType, _aidl_return));
+}
+
+Status AudioPolicyService::getMmapPolicyForDevice(
+ AudioMMapPolicyType policyType, AudioMMapPolicyInfo *policyInfo) {
+ if (mAudioPolicyManager == nullptr) {
+ return binderStatusFromStatusT(NO_INIT);
+ }
+ audio_utils::lock_guard _l(mMutex);
+ return binderStatusFromStatusT(
+ mAudioPolicyManager->getMmapPolicyForDevice(policyType, policyInfo));
+}
+
} // namespace android
diff --git a/services/audiopolicy/service/AudioPolicyService.cpp b/services/audiopolicy/service/AudioPolicyService.cpp
index 7b7275e..13ee5cf 100644
--- a/services/audiopolicy/service/AudioPolicyService.cpp
+++ b/services/audiopolicy/service/AudioPolicyService.cpp
@@ -170,6 +170,8 @@
BINDER_METHOD_ENTRY(clearPreferredMixerAttributes) \
BINDER_METHOD_ENTRY(getRegisteredPolicyMixes) \
BINDER_METHOD_ENTRY(getPermissionController) \
+BINDER_METHOD_ENTRY(getMmapPolicyInfos) \
+BINDER_METHOD_ENTRY(getMmapPolicyForDevice) \
\
// singleton for Binder Method Statistics for IAudioPolicyService
static auto& getIAudioPolicyServiceStatistics() {
diff --git a/services/audiopolicy/service/AudioPolicyService.h b/services/audiopolicy/service/AudioPolicyService.h
index c47b5e9..2fb221f 100644
--- a/services/audiopolicy/service/AudioPolicyService.h
+++ b/services/audiopolicy/service/AudioPolicyService.h
@@ -58,6 +58,8 @@
using media::audio::common::AudioDevice;
using media::audio::common::AudioDeviceDescription;
using media::audio::common::AudioFormatDescription;
+using media::audio::common::AudioMMapPolicyInfo;
+using media::audio::common::AudioMMapPolicyType;
using media::audio::common::AudioMode;
using media::audio::common::AudioSource;
using media::audio::common::AudioStreamType;
@@ -328,6 +330,13 @@
// Should only be called by AudioService to push permission data down to audioserver
binder::Status getPermissionController(sp<INativePermissionController>* out) override;
+ binder::Status getMmapPolicyInfos(
+ AudioMMapPolicyType policyType,
+ std::vector<AudioMMapPolicyInfo>* _aidl_return) override;
+ binder::Status getMmapPolicyForDevice(
+ AudioMMapPolicyType policyType,
+ AudioMMapPolicyInfo* policyInfo) override;
+
status_t onTransact(uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) override;
// -- IAudioPolicyLocal methods
@@ -938,6 +947,10 @@
status_t setTracksInternalMute(
const std::vector<media::TrackInternalMuteInfo>& tracksInternalMute) override;
+ status_t getMmapPolicyInfos(
+ media::audio::common::AudioMMapPolicyType policyType,
+ std::vector<media::audio::common::AudioMMapPolicyInfo> *policyInfos) override;
+
private:
AudioPolicyService *mAudioPolicyService;
};
diff --git a/services/audiopolicy/tests/AudioPolicyTestClient.h b/services/audiopolicy/tests/AudioPolicyTestClient.h
index 9ddfd6c..91d85f3 100644
--- a/services/audiopolicy/tests/AudioPolicyTestClient.h
+++ b/services/audiopolicy/tests/AudioPolicyTestClient.h
@@ -120,6 +120,12 @@
const std::vector<media::TrackInternalMuteInfo>& /*tracksInternalMute*/) override {
return INVALID_OPERATION;
}
+
+ status_t getMmapPolicyInfos(
+ media::audio::common::AudioMMapPolicyType /*policyType*/,
+ std::vector<media::audio::common::AudioMMapPolicyInfo>* /*policyInfos*/) override {
+ return INVALID_OPERATION;
+ }
};
} // namespace android