Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 06:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "audiohal: Fix incorrect parameter handling in IDevicesFactory::openDevice" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-04 21:26:25 +00:00
committed by Android (Google) Code Review
parent c6cba90b96 8604a738a7
commit f66f505bc6
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
audio/2.0/default/DevicesFactory.cpp
View File

@@ -39,6 +39,7 @@ const char* DevicesFactory::deviceToString(IDevicesFactory::Device device) {
case IDevicesFactory::Device::R_SUBMIX: return AUDIO_HARDWARE_MODULE_ID_REMOTE_SUBMIX;
case IDevicesFactory::Device::STUB: return AUDIO_HARDWARE_MODULE_ID_STUB;
}
return nullptr;
}
// static
@@ -75,19 +76,22 @@ out:
// Methods from ::android::hardware::audio::V2_0::IDevicesFactory follow.
Return<void> DevicesFactory::openDevice(IDevicesFactory::Device device, openDevice_cb _hidl_cb) {
audio_hw_device_t *halDevice;
int halStatus = loadAudioInterface(deviceToString(device), &halDevice);
Result retval(Result::OK);
Result retval(Result::INVALID_ARGUMENTS);
sp<IDevice> result;
if (halStatus == OK) {
if (device == IDevicesFactory::Device::PRIMARY) {
result = new PrimaryDevice(halDevice);
} else {
result = new ::android::hardware::audio::V2_0::implementation::Device(halDevice);
const char* moduleName = deviceToString(device);
if (moduleName != nullptr) {
int halStatus = loadAudioInterface(moduleName, &halDevice);
if (halStatus == OK) {
if (device == IDevicesFactory::Device::PRIMARY) {
result = new PrimaryDevice(halDevice);
} else {
result = new ::android::hardware::audio::V2_0::implementation::
Device(halDevice);
}
retval = Result::OK;
} else if (halStatus == -EINVAL) {
retval = Result::NOT_INITIALIZED;
}
} else if (halStatus == -EINVAL) {
retval = Result::NOT_INITIALIZED;
} else {
retval = Result::INVALID_ARGUMENTS;
}
_hidl_cb(retval, result);
return Void();

10
audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp
View File

@@ -155,6 +155,16 @@ TEST_F(AudioHidlTest, GetAudioDevicesFactoryService) {
doc::test("test the getService (called in SetUp)");
}
TEST_F(AudioHidlTest, OpenDeviceInvalidParameter) {
doc::test("test passing an invalid parameter to openDevice");
IDevicesFactory::Result result;
sp<IDevice> device;
ASSERT_OK(devicesFactory->openDevice(IDevicesFactory::Device(-1),
returnIn(result, device)));
ASSERT_EQ(IDevicesFactory::Result::INVALID_ARGUMENTS, result);
ASSERT_TRUE(device == nullptr);
}
//////////////////////////////////////////////////////////////////////////////
/////////////////////////////// openDevice primary ///////////////////////////
//////////////////////////////////////////////////////////////////////////////