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

Commit ad3bf06a authored by Mikhail Naganov's avatar Mikhail Naganov Committed by android-build-merger
Browse files

Merge "Fix the name of the constant for device [dis]connect parameter" am: 998c4cd0 

am: a8770db0

Change-Id: Icde1704bd46642567050f4704d4d65ac9ad96845
parents 6c3213c9 a8770db0

audio/core/all-versions/default/Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ Return<void> Device::getMicrophones(getMicrophones_cb _hidl_cb) { 
}



Return<Result> Device::setConnectedState(const DeviceAddress& address, bool connected) {

    auto key = connected ? AudioParameter::keyStreamConnect : AudioParameter::keyStreamDisconnect;

    auto key = connected ? AudioParameter::keyDeviceConnect : AudioParameter::keyDeviceDisconnect;

    return setParam(key, address);

}

#endif

audio/core/all-versions/default/Stream.cpp

+2 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ Return<Result> Stream::setParameters(const hidl_vec<ParameterValue>& parameters) 


Return<Result> Stream::setConnectedState(const DeviceAddress& address, bool connected) {

    return setParam(

        connected ? AudioParameter::keyStreamConnect : AudioParameter::keyStreamDisconnect,

            connected ? AudioParameter::keyDeviceConnect : AudioParameter::keyDeviceDisconnect,

            address);

}

#elif MAJOR_VERSION >= 4