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

Commit ccd86805 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am: 125fc63d

am: a5d728cc

Change-Id: I82e1af7e7ff4b7dcc7a9b1121893f7514fdbf05d
parents 4fa1ff89 a5d728cc
Loading
Loading
Loading
Loading
+18 −0
Original line number Diff line number Diff line
@@ -1309,6 +1309,24 @@ status_t AudioFlinger::EffectHandle::command(uint32_t cmdCode,
    ALOGVV("command(), cmdCode: %d, mHasControl: %d, mEffect: %p",
            cmdCode, mHasControl, mEffect.unsafe_get());

    // reject commands reserved for internal use by audio framework if coming from outside
    // of audioserver
    switch(cmdCode) {
        case EFFECT_CMD_ENABLE:
        case EFFECT_CMD_DISABLE:
        case EFFECT_CMD_SET_PARAM:
        case EFFECT_CMD_SET_PARAM_DEFERRED:
        case EFFECT_CMD_SET_PARAM_COMMIT:
        case EFFECT_CMD_GET_PARAM:
            break;
        default:
            if (cmdCode >= EFFECT_CMD_FIRST_PROPRIETARY) {
                break;
            }
            android_errorWriteLog(0x534e4554, "62019992");
            return BAD_VALUE;
    }

    if (cmdCode == EFFECT_CMD_ENABLE) {
        if (*replySize < sizeof(int)) {
            android_errorWriteLog(0x534e4554, "32095713");