Combine getInputForAttr perm checks
Push all permission checks to a single function, which is called in
the middle of the APM function after the mix (and virtualdeviceid) is
selected.
This ensures that we don't incorrectly check perms for default vdi.
To enable this, add a method in the AudioPolicyClient which
evaluates perms for a particular input request to keep the perm checks
out of APM.
Test: CtsMediaAudioTestCases
Bug: 374870131
Fixes: 343523722
Flag: EXEMPT infeasible bugfix
Change-Id: I0f83d26fb7ad3b08a5a89d3ee58701315a91ae6d
diff --git a/services/audiopolicy/AudioPolicyInterface.h b/services/audiopolicy/AudioPolicyInterface.h
index 33194b7..e5bd121 100644
--- a/services/audiopolicy/AudioPolicyInterface.h
+++ b/services/audiopolicy/AudioPolicyInterface.h
@@ -24,6 +24,7 @@
#include <android/media/audio/common/AudioMMapPolicyType.h>
#include <android/media/GetInputForAttrResponse.h>
#include <android/content/AttributionSourceState.h>
+#include <error/BinderResult.h>
#include <media/AudioCommonTypes.h>
#include <media/AudioContainers.h>
#include <media/AudioDeviceTypeAddr.h>
@@ -182,8 +183,7 @@
audio_input_flags_t flags,
audio_unique_id_t riid,
audio_session_t session,
- const AttributionSourceState& attributionSource,
- input_type_t *inputType /* out param */) = 0;
+ const AttributionSourceState& attributionSource) = 0;
// indicates to the audio policy manager that the input starts being used.
virtual status_t startInput(audio_port_handle_t portId) = 0;
// indicates to the audio policy manager that the input stops being used.
@@ -636,6 +636,32 @@
virtual status_t getMmapPolicyInfos(
media::audio::common::AudioMMapPolicyType policyType,
std::vector<media::audio::common::AudioMMapPolicyInfo> *policyInfos) = 0;
+
+ enum class MixType {
+ // e.g. audio recording from a microphone
+ NONE = 0,
+ // used for "remote submix" legacy mode (no DAP), capture of the media to play it remotely
+ CAPTURE,
+ // used for platform audio rerouting, where mixes are handled by external and dynamically
+ // installed policies which reroute audio mixes
+ EXT_POLICY_REROUTE,
+ // used for playback capture with a MediaProjection
+ PUBLIC_CAPTURE_PLAYBACK,
+ // used for capture from telephony RX path
+ TELEPHONY_RX_CAPTURE,
+ };
+
+ struct PermissionReqs {
+ media::audio::common::AudioSource source;
+ MixType mixType;
+ uint32_t virtualDeviceId;
+ // Flag based validation
+ bool isHotword;
+ bool isCallRedir;
+ };
+
+ virtual error::BinderResult<bool> checkPermissionForInput(const AttributionSourceState& attr,
+ const PermissionReqs& req) = 0;
};
// These are the signatures of createAudioPolicyManager/destroyAudioPolicyManager