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

Commit 04ed0466 authored by Kevin Rocard's avatar Kevin Rocard
Browse files

AudioPolicy: Improve logging on Remote submix errors 



Bug: 131064451
Test: atest AudioPlaybackCaptureTest
Change-Id: I13e662514de11e66f7ca145b320f351640a55ddb
Signed-off-by: default avatarKevin Rocard <krocard@google.com>
parent 48aa740f

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+12 −12
Original line number Diff line number Diff line
@@ -1999,7 +1999,7 @@ status_t AudioPolicyManager::getInputForAttr(const audio_attributes_t *attr, 
                                                  String8(attr->tags + strlen("addr=")),

                                                  AUDIO_FORMAT_DEFAULT);

        if (device == nullptr) {

            ALOGW("%s could not find device for source %d, tags %s",

            ALOGW("%s could not find in Remote Submix device for source %d, tags %s",

                    __func__, attributes.source, attributes.tags);

            status = BAD_VALUE;

            goto error;
@@ -2957,17 +2957,17 @@ status_t AudioPolicyManager::unregisterPolicyMixes(Vector<AudioMix> mixes) 
                continue;

            }



            if (getDeviceConnectionState(AUDIO_DEVICE_IN_REMOTE_SUBMIX, address.string()) ==

            for (auto device : {AUDIO_DEVICE_IN_REMOTE_SUBMIX, AUDIO_DEVICE_OUT_REMOTE_SUBMIX}) {

                if (getDeviceConnectionState(device, address.string()) ==

                        AUDIO_POLICY_DEVICE_STATE_AVAILABLE)  {

                setDeviceConnectionStateInt(AUDIO_DEVICE_IN_REMOTE_SUBMIX,

                        AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE,

                        address.string(), "remote-submix", AUDIO_FORMAT_DEFAULT);

                    res = setDeviceConnectionStateInt(device, AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE,

                                                      address.string(), "remote-submix",

                                                      AUDIO_FORMAT_DEFAULT);

                    if (res != OK) {

                        ALOGE("Error making RemoteSubmix device unavailable for mix "

                              "with type %d, address %s", device, address.string());

                    }

                }

            if (getDeviceConnectionState(AUDIO_DEVICE_OUT_REMOTE_SUBMIX, address.string()) ==

                    AUDIO_POLICY_DEVICE_STATE_AVAILABLE)  {

                setDeviceConnectionStateInt(AUDIO_DEVICE_OUT_REMOTE_SUBMIX,

                        AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE,

                        address.string(), "remote-submix", AUDIO_FORMAT_DEFAULT);

            }

            rSubmixModule->removeOutputProfile(address);

            rSubmixModule->removeInputProfile(address);