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

Commit d83de550 authored by Shunkai Yao's avatar Shunkai Yao Committed by Android (Google) Code Review
Browse files

Merge "EffectProxy return the active sub-effect descriptor" into udc-qpr-dev

parents 55a86929 fdf42d76
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -133,8 +133,8 @@ ndk::ScopedAStatus EffectProxy::close() {
}

ndk::ScopedAStatus EffectProxy::getDescriptor(Descriptor* desc) {
    desc->common = mDescriptorCommon;
    desc->capability = mSubEffects[mActiveSubIdx].descriptor.capability;
    *desc = mSubEffects[mActiveSubIdx].descriptor;
    desc->common.id.uuid = desc->common.id.proxy.value();
    return ndk::ScopedAStatus::ok();
}

@@ -168,7 +168,7 @@ Descriptor::Common EffectProxy::buildDescriptorCommon(
        // same as HIDL EffectProxy flags
        common.flags.type = Flags::Type::INSERT;
        common.flags.insert = Flags::Insert::LAST;
        common.flags.volume = Flags::Volume::CTRL;
        common.flags.volume = Flags::Volume::NONE;

        // set indication if any sub-effect indication was set
        common.flags.offloadIndication |= desc.common.flags.offloadIndication;