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

Commit 320b0958 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "audio: ble: change the ring of ble same as sco" into main am: 5b03292d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3147377



Change-Id: Ie4218750e5715fd5705fdb040b3e9e48735e35c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fef0cf48 5b03292d

media/libaudioclient/PolicyAidlConversion.cpp

+4 −0
Original line number Diff line number Diff line
@@ -379,6 +379,8 @@ aidl2legacy_AudioPolicyForcedConfig_audio_policy_forced_cfg_t(media::AudioPolicy 
            return AUDIO_POLICY_FORCE_ENCODED_SURROUND_ALWAYS;

        case media::AudioPolicyForcedConfig::ENCODED_SURROUND_MANUAL:

            return AUDIO_POLICY_FORCE_ENCODED_SURROUND_MANUAL;

        case media::AudioPolicyForcedConfig::BT_BLE:

            return AUDIO_POLICY_FORCE_BT_BLE;

    }

    return unexpected(BAD_VALUE);

}
@@ -418,6 +420,8 @@ legacy2aidl_audio_policy_forced_cfg_t_AudioPolicyForcedConfig(audio_policy_force 
            return media::AudioPolicyForcedConfig::ENCODED_SURROUND_ALWAYS;

        case AUDIO_POLICY_FORCE_ENCODED_SURROUND_MANUAL:

            return media::AudioPolicyForcedConfig::ENCODED_SURROUND_MANUAL;

        case AUDIO_POLICY_FORCE_BT_BLE:

            return media::AudioPolicyForcedConfig::BT_BLE;

        case AUDIO_POLICY_FORCE_CFG_CNT:

            break;

    }

media/libaudioclient/aidl/android/media/AudioPolicyForcedConfig.aidl

+1 −0
Original line number Diff line number Diff line
@@ -36,4 +36,5 @@ enum AudioPolicyForcedConfig { 
    ENCODED_SURROUND_NEVER = 13,

    ENCODED_SURROUND_ALWAYS = 14,

    ENCODED_SURROUND_MANUAL = 15,

    BT_BLE = 16,

}

services/audiopolicy/enginedefault/src/Engine.cpp

+36 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ status_t Engine::setForceUse(audio_policy_force_use_t usage, audio_policy_forced 
        }

        break;

    case AUDIO_POLICY_FORCE_FOR_VIBRATE_RINGING:

        if (config != AUDIO_POLICY_FORCE_BT_SCO && config != AUDIO_POLICY_FORCE_NONE) {

        if (config != AUDIO_POLICY_FORCE_BT_SCO && config != AUDIO_POLICY_FORCE_BT_BLE

                && config != AUDIO_POLICY_FORCE_NONE) {

            ALOGW("setForceUse() invalid config %d for VIBRATE_RINGING", config);

            return BAD_VALUE;

        }
@@ -402,6 +403,40 @@ DeviceVector Engine::getDevicesForStrategyInt(legacy_strategy strategy, 
                }

            }

        }



        // if LEA headset is connected and we are told to use it, play ringtone over

        // speaker and BT LEA

        if (!availableOutputDevices.getDevicesFromTypes(getAudioDeviceOutAllBleSet()).isEmpty()) {

            DeviceVector devices2;

            devices2 = availableOutputDevices.getFirstDevicesFromTypes({

                    AUDIO_DEVICE_OUT_BLE_HEADSET, AUDIO_DEVICE_OUT_BLE_SPEAKER});

            // Use ONLY Bluetooth LEA output when ringing in vibration mode

            if (!((getForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM) == AUDIO_POLICY_FORCE_SYSTEM_ENFORCED)

                    && (strategy == STRATEGY_ENFORCED_AUDIBLE))) {

                if (getForceUse(AUDIO_POLICY_FORCE_FOR_VIBRATE_RINGING)

                        == AUDIO_POLICY_FORCE_BT_BLE) {

                    if (!devices2.isEmpty()) {

                        devices = devices2;

                        break;

                    }

                }

            }

            // Use both Bluetooth LEA and phone default output when ringing in normal mode

            if (audio_is_ble_out_device(getPreferredDeviceTypeForLegacyStrategy(

                    availableOutputDevices, STRATEGY_PHONE))) {

                if (strategy == STRATEGY_SONIFICATION) {

                    devices.replaceDevicesByType(

                            AUDIO_DEVICE_OUT_SPEAKER,

                            availableOutputDevices.getDevicesFromType(

                                    AUDIO_DEVICE_OUT_SPEAKER_SAFE));

                }

                if (!devices2.isEmpty()) {

                    devices.add(devices2);

                    break;

                }

            }

        }



        // The second device used for sonification is the same as the device used by media strategy

        FALLTHROUGH_INTENDED;