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

Commit 52e4b1ac authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AudioFlinger: propagate createEffect return status safely to caller"... 

Merge "AudioFlinger: propagate createEffect return status safely to caller" am: ac07a05e am: 82dd1a95 am: f364a5ba am: 5790deb0

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



Change-Id: Id334aee6d26b548d2e2c68df004d4f094346e012
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b4ccb28 5790deb0

services/audioflinger/DeviceEffectManager.cpp

+7 −2
Original line number Diff line number Diff line
@@ -106,11 +106,16 @@ sp<AudioFlinger::EffectHandle> AudioFlinger::DeviceEffectManager::createEffect_l 
        if (lStatus == NO_ERROR) {

            lStatus = effect->addHandle(handle.get());

            if (lStatus == NO_ERROR) {

                effect->init(patches);

                lStatus = effect->init(patches);

                if (lStatus == NAME_NOT_FOUND) {

                    lStatus = NO_ERROR;

                }

                if (lStatus == NO_ERROR || lStatus == ALREADY_EXISTS) {

                    mDeviceEffects.emplace(device, effect);

                }

            }

        }

    }

    if (enabled != NULL) {

        *enabled = (int)effect->isEnabled();

    }