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

Commit b7d950a5 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge changes Ief07a36c,I8b8b9fdf 

* changes:
  audiopolicy: add null pointer check for primary hw
  av: Add AUDIO_OUTPUT_FLAG_MMAP_NOIRQ flag.
parents 22242519 fedb5986

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+5 −1
Original line number Diff line number Diff line
@@ -472,6 +472,10 @@ status_t AudioPolicyManager::getHwOffloadEncodingFormatsSupportedForA2DP( 
    std::unordered_set<audio_format_t> formatSet;

    sp<HwModule> primaryModule =

            mHwModules.getModuleFromName(AUDIO_HARDWARE_MODULE_ID_PRIMARY);

    if (primaryModule == nullptr) {

        ALOGE("%s() unable to get primary module", __func__);

        return NO_INIT;

    }

    DeviceVector declaredDevices = primaryModule->getDeclaredDevices().getDevicesFromTypeMask(

            AUDIO_DEVICE_OUT_ALL_A2DP);

    for (const auto& device : declaredDevices) {
@@ -836,7 +840,7 @@ sp<IOProfile> AudioPolicyManager::getProfileForOutput( 
        // if explicitly requested

        static const uint32_t kRelevantFlags =

                (AUDIO_OUTPUT_FLAG_HW_AV_SYNC | AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD |

                 AUDIO_OUTPUT_FLAG_VOIP_RX);

                 AUDIO_OUTPUT_FLAG_VOIP_RX | AUDIO_OUTPUT_FLAG_MMAP_NOIRQ);

        flags =

            (audio_output_flags_t)((flags & kRelevantFlags) | AUDIO_OUTPUT_FLAG_DIRECT);

    }