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

Commit c7fdfdff authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audiohal: Do not extract value from Result unless it is Ok"

parents 76f4bc38 b1f9f0bf
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -56,17 +56,19 @@ class ConversionHelperHidl {
    }

    status_t processReturn(const char* funcName, const Return<hardware::audio::V2_0::Result>& ret) {
        return processReturn(funcName, ret, ret);
        if (!ret.isOk()) {
            emitError(funcName, ret.description().c_str());
        }
        return ret.isOk() ? analyzeResult(ret) : FAILED_TRANSACTION;
    }

    template<typename T>
    status_t processReturn(
            const char* funcName, const Return<T>& ret, hardware::audio::V2_0::Result retval) {
        const status_t st = ret.isOk() ? analyzeResult(retval) : FAILED_TRANSACTION;
        if (!ret.isOk()) {
            emitError(funcName, ret.description().c_str());
        }
        return st;
        return ret.isOk() ? analyzeResult(retval) : FAILED_TRANSACTION;
    }

  private: