Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a14ba0b authored by Charlie Boutier's avatar Charlie Boutier Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-27578620-VKNRGBZONE" into main 

* changes:
  Revert "Revert "Revert^2 "Audio policy: anonymize Bluetooth MAC ..."
  Revert "Audio policy: anonymize Bluetooth MAC addresses take 3"
parents a01c6ad4 62496753

media/utils/ServiceUtilities.cpp

+16 −4
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static const String16 sAndroidPermissionRecordAudio("android.permission.RECORD_A 
static const String16 sModifyPhoneState("android.permission.MODIFY_PHONE_STATE");

static const String16 sModifyAudioRouting("android.permission.MODIFY_AUDIO_ROUTING");

static const String16 sCallAudioInterception("android.permission.CALL_AUDIO_INTERCEPTION");

static const String16 sAndroidPermissionBluetoothConnect("android.permission.BLUETOOTH_CONNECT");



static String16 resolveCallingPackage(PermissionController& permissionController,

        const std::optional<String16> opPackageName, uid_t uid) {
@@ -395,19 +396,30 @@ status_t checkIMemory(const sp<IMemory>& iMemory) 
/**

 * Determines if the MAC address in Bluetooth device descriptors returned by APIs of

 * a native audio service (audio flinger, audio policy) must be anonymized.

 * MAC addresses returned to a system service are not anonymized.

 * MAC addresses returned to system server or apps with BLUETOOTH_CONNECT permission

 * are not anonymized.

 *

 * @param attributionSource The attribution source of the calling app.

 * @param caller string identifying the caller for logging.

 * @return true if the MAC addresses must be anonymized, false otherwise.

 */

bool mustAnonymizeBluetoothAddress(

        const AttributionSourceState& attributionSource) {

        const AttributionSourceState& attributionSource, const String16& caller) {

    uid_t uid = VALUE_OR_FATAL(aidl2legacy_int32_t_uid_t(attributionSource.uid));

    if (isServiceUid(uid)) {

    if (isAudioServerOrSystemServerUid(uid)) {

        return false;

    }

    const std::optional<AttributionSourceState> resolvedAttributionSource =

            resolveAttributionSource(attributionSource, DEVICE_ID_DEFAULT);

    if (!resolvedAttributionSource.has_value()) {

        return true;

    }

    permission::PermissionChecker permissionChecker;

    return permissionChecker.checkPermissionForPreflightFromDatasource(

            sAndroidPermissionBluetoothConnect, resolvedAttributionSource.value(), caller,

            AppOpsManager::OP_BLUETOOTH_CONNECT)

                != permission::PermissionChecker::PERMISSION_GRANTED;

}



/**

 * Modifies the passed MAC address string in place for consumption by unprivileged clients.

media/utils/include/mediautils/ServiceUtilities.h

+2 −1
Original line number Diff line number Diff line
@@ -113,7 +113,8 @@ bool modifyPhoneStateAllowed(const AttributionSourceState& attributionSource); 
bool bypassInterruptionPolicyAllowed(const AttributionSourceState& attributionSource);

bool callAudioInterceptionAllowed(const AttributionSourceState& attributionSource);

void purgePermissionCache();

bool mustAnonymizeBluetoothAddress(const AttributionSourceState& attributionSource);

bool mustAnonymizeBluetoothAddress(

        const AttributionSourceState& attributionSource, const String16& caller);

void anonymizeBluetoothAddress(char *address);



int32_t getOpForSource(audio_source_t source);

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1622,7 +1622,7 @@ Status AudioPolicyService::listAudioPorts(media::AudioPortRole roleAidl, 
        numPortsReq = std::min(numPortsReq, num_ports);

    }



    if (mustAnonymizeBluetoothAddress(attributionSource)) {

    if (mustAnonymizeBluetoothAddress(attributionSource, String16(__func__))) {

        for (size_t i = 0; i < numPortsReq; ++i) {

            anonymizePortBluetoothAddress(&ports[i]);

        }
@@ -1664,7 +1664,7 @@ Status AudioPolicyService::getAudioPort(int portId, 
        RETURN_IF_BINDER_ERROR(binderStatusFromStatusT(mAudioPolicyManager->getAudioPort(&port)));

    }



    if (mustAnonymizeBluetoothAddress(attributionSource)) {

    if (mustAnonymizeBluetoothAddress(attributionSource, String16(__func__))) {

        anonymizePortBluetoothAddress(&port);

    }
@@ -1740,7 +1740,7 @@ Status AudioPolicyService::listAudioPatches(Int* count, 
        numPatchesReq = std::min(numPatchesReq, num_patches);

    }



    if (mustAnonymizeBluetoothAddress(attributionSource)) {

    if (mustAnonymizeBluetoothAddress(attributionSource, String16(__func__))) {

        for (size_t i = 0; i < numPatchesReq; ++i) {

            for (size_t j = 0; j < patches[i].num_sources; ++j) {

                anonymizePortBluetoothAddress(&patches[i].sources[j]);