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

Commit 935aef6d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Convert mask types from uint32_t to enum type" am: 1f551d87 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1510239

Change-Id: I5a49cd9e90e5d3cd09f522c545fd4d1001937b42
parents 1b990bc7 1f551d87

audio/core/all-versions/default/Conversions.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ std::string deviceAddressToHal(const DeviceAddress& address) { 
    // HAL assumes that the address is NUL-terminated.

    // HAL assumes that the address is NUL-terminated.

    char halAddress[AUDIO_DEVICE_MAX_ADDRESS_LEN];

    char halAddress[AUDIO_DEVICE_MAX_ADDRESS_LEN];

    memset(halAddress, 0, sizeof(halAddress));

    memset(halAddress, 0, sizeof(halAddress));

    uint32_t halDevice = static_cast<uint32_t>(address.device);

    audio_devices_t halDevice = static_cast<audio_devices_t>(address.device);

    if (getAudioDeviceOutAllA2dpSet().count(halDevice) > 0 ||

    if (getAudioDeviceOutAllA2dpSet().count(halDevice) > 0 ||

        halDevice == AUDIO_DEVICE_IN_BLUETOOTH_A2DP) {

        halDevice == AUDIO_DEVICE_IN_BLUETOOTH_A2DP) {

        snprintf(halAddress, sizeof(halAddress), "%02X:%02X:%02X:%02X:%02X:%02X",

        snprintf(halAddress, sizeof(halAddress), "%02X:%02X:%02X:%02X:%02X:%02X",