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

am: ad3bf06a89

Change-Id: I20826e0229db5596bb5e7ecffab274542f735931
This commit is contained in:
Mikhail Naganov
2019-10-03 13:17:21 -07:00
committed by android-build-merger
2 changed files with 3 additions and 3 deletions

View File

@@ -378,7 +378,7 @@ Return<void> Device::getMicrophones(getMicrophones_cb _hidl_cb) {
} }
Return<Result> Device::setConnectedState(const DeviceAddress& address, bool connected) { 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); return setParam(key, address);
} }
#endif #endif

View File

@@ -243,8 +243,8 @@ Return<Result> Stream::setParameters(const hidl_vec<ParameterValue>& parameters)
Return<Result> Stream::setConnectedState(const DeviceAddress& address, bool connected) { Return<Result> Stream::setConnectedState(const DeviceAddress& address, bool connected) {
return setParam( return setParam(
connected ? AudioParameter::keyStreamConnect : AudioParameter::keyStreamDisconnect, connected ? AudioParameter::keyDeviceConnect : AudioParameter::keyDeviceDisconnect,
address); address);
} }
#elif MAJOR_VERSION >= 4 #elif MAJOR_VERSION >= 4
Return<void> Stream::getDevices(getDevices_cb _hidl_cb) { Return<void> Stream::getDevices(getDevices_cb _hidl_cb) {