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

Commit 0bfaf7ec authored by Oscar Azucena's avatar Oscar Azucena Committed by android-build-merger
Browse files

Merge "Enabled removeUidDeviceAffinities" into qt-dev

am: 2112c916

Change-Id: Id31c57806a05e00f0f4af4314ae152db8e8b2ddb
parents 1b835f6a 2112c916
Loading
Loading
Loading
Loading
+5 −16
Original line number Diff line number Diff line
@@ -3003,23 +3003,12 @@ status_t AudioPolicyManager::setUidDeviceAffinities(uid_t uid,

status_t AudioPolicyManager::removeUidDeviceAffinities(uid_t uid) {
    ALOGV("%s() uid=%d", __FUNCTION__, uid);
    Vector<AudioDeviceTypeAddr> devices;
    status_t res =  mPolicyMixes.getDevicesForUid(uid, devices);
    if (res == NO_ERROR) {
        // reevaluate outputs for all found devices
        for (size_t i = 0; i < devices.size(); i++) {
            sp<DeviceDescriptor> devDesc = mHwModules.getDeviceDescriptor(
                    devices[i].mType, devices[i].mAddress, String8(),
                    AUDIO_FORMAT_DEFAULT);
            SortedVector<audio_io_handle_t> outputs;
            if (checkOutputsForDevice(devDesc, AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE,
                    outputs) != NO_ERROR) {
                ALOGE("%s() error in checkOutputsForDevice for device=%08x addr=%s",
                        __FUNCTION__, devices[i].mType, devices[i].mAddress.string());
    status_t res = mPolicyMixes.removeUidDeviceAffinities(uid);
    if (res != NO_ERROR) {
        ALOGE("%s() Could not remove all device affinities fo uid = %d",
            __FUNCTION__, uid);
        return INVALID_OPERATION;
    }
        }
    }

    return res;
}