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

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

Merge "libaudiohal: Allow get/setMasterVolume invocation on IDevice"

parents 7a2f8152 ae1f662a

media/libaudiohal/impl/DeviceHalHidl.cpp

+2 −4
Original line number Diff line number Diff line
@@ -123,15 +123,13 @@ status_t DeviceHalHidl::setVoiceVolume(float volume) { 


status_t DeviceHalHidl::setMasterVolume(float volume) {

    if (mDevice == 0) return NO_INIT;

    if (mPrimaryDevice == 0) return INVALID_OPERATION;

    return processReturn("setMasterVolume", mPrimaryDevice->setMasterVolume(volume));

    return processReturn("setMasterVolume", mDevice->setMasterVolume(volume));

}



status_t DeviceHalHidl::getMasterVolume(float *volume) {

    if (mDevice == 0) return NO_INIT;

    if (mPrimaryDevice == 0) return INVALID_OPERATION;

    Result retval;

    Return<void> ret = mPrimaryDevice->getMasterVolume(

    Return<void> ret = mDevice->getMasterVolume(

            [&](Result r, float v) {

                retval = r;

                if (retval == Result::OK) {