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

Commit 98031bcf authored by Phil Burk's avatar Phil Burk Committed by Automerger Merge Worker
Browse files

Merge "aaudio: preserve requested device ID, fix regression" into tm-qpr-dev am: c3238c22 

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



Change-Id: If71cdd4a0f55ce381e328a5cef7420ec44477040
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59830928 c3238c22

services/oboeservice/AAudioServiceEndpointMMAP.cpp

+10 −1
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ std::string AAudioServiceEndpointMMAP::dump() const { 
aaudio_result_t AAudioServiceEndpointMMAP::open(const aaudio::AAudioStreamRequest &request) {

    aaudio_result_t result = AAUDIO_OK;

    copyFrom(request.getConstantConfiguration());

    mRequestedDeviceId = getDeviceId();



    mMmapClient.attributionSource = request.getAttributionSource();

    // TODO b/182392769: use attribution source util

    mMmapClient.attributionSource.uid = VALUE_OR_FATAL(
@@ -115,7 +117,7 @@ aaudio_result_t AAudioServiceEndpointMMAP::openWithFormat(audio_format_t audioFo 


    const audio_attributes_t attributes = getAudioAttributesFrom(this);



    mRequestedDeviceId = deviceId = getDeviceId();

    deviceId = mRequestedDeviceId;



    // Fill in config

    config.format = audioFormat;
@@ -151,6 +153,10 @@ aaudio_result_t AAudioServiceEndpointMMAP::openWithFormat(audio_format_t audioFo 
    audio_session_t sessionId = AAudioConvert_aaudioToAndroidSessionId(requestedSessionId);



    // Open HAL stream. Set mMmapStream

    ALOGD("%s trying to open MMAP stream with format=%#x, "

          "sample_rate=%u, channel_mask=%#x, device=%d",

          __func__, config.format, config.sample_rate,

          config.channel_mask, deviceId);

    status_t status = MmapStreamInterface::openMmapStream(streamDirection,

                                                          &attributes,

                                                          &config,
@@ -221,6 +227,9 @@ aaudio_result_t AAudioServiceEndpointMMAP::openWithFormat(audio_format_t audioFo 


error:

    close();

    // restore original requests

    setDeviceId(mRequestedDeviceId);

    setSessionId(requestedSessionId);

    return result;

}