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

Commit 31af18aa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE APM clear AS routing cache on output activity with... 

Merge "DO NOT MERGE APM clear AS routing cache on output activity with preferred device" into tm-qpr-dev
parents daa52e99 32b7a104

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+9 −0
Original line number Diff line number Diff line
@@ -2002,6 +2002,10 @@ status_t AudioPolicyManager::startOutput(audio_port_handle_t portId) 
        outputDesc->stop();

        return status;

    }

    if (client->hasPreferredDevice()) {

        // playback activity with preferred device impacts routing occurred, inform upper layers

        mpClientInterface->onRoutingUpdated();

    }

    if (delayMs != 0) {

        usleep(delayMs * 1000);

    }
@@ -2247,6 +2251,11 @@ status_t AudioPolicyManager::stopOutput(audio_port_handle_t portId) 
    }

    sp<TrackClientDescriptor> client = outputDesc->getClient(portId);



    if (client->hasPreferredDevice(true)) {

        // playback activity with preferred device impacts routing occurred, inform upper layers

        mpClientInterface->onRoutingUpdated();

    }



    ALOGV("stopOutput() output %d, stream %d, session %d",

          outputDesc->mIoHandle, client->stream(), client->session());