diff options
| author | Eric Laurent <elaurent@google.com> | 2015-03-30 19:39:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-30 19:39:11 +0000 |
| commit | ac41a6f253a69671f6e018fcc84daf0030615ca9 (patch) | |
| tree | 17fe629ef01986411dd6cfcae1552a3b0a02c8b7 /services/audiopolicy/managerdefault/Devices.cpp | |
| parent | 765f27c2376e83766d9e1d8f8136025c5437ce49 (diff) | |
| parent | f5d144f7ca773750ea7be371f14f9fc975a15862 (diff) | |
| download | frameworks_av-ac41a6f253a69671f6e018fcc84daf0030615ca9.zip frameworks_av-ac41a6f253a69671f6e018fcc84daf0030615ca9.tar.gz frameworks_av-ac41a6f253a69671f6e018fcc84daf0030615ca9.tar.bz2 | |
Merge "audio policy: fix IOProfile::isCompatibleProfile()"
Diffstat (limited to 'services/audiopolicy/managerdefault/Devices.cpp')
| -rw-r--r-- | services/audiopolicy/managerdefault/Devices.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audiopolicy/managerdefault/Devices.cpp b/services/audiopolicy/managerdefault/Devices.cpp index 42e198c..5b1401e 100644 --- a/services/audiopolicy/managerdefault/Devices.cpp +++ b/services/audiopolicy/managerdefault/Devices.cpp @@ -241,7 +241,7 @@ void DeviceDescriptor::toAudioPortConfig(struct audio_port_config *dstConfig, // without the test? // This has been demonstrated to NOT be true (at start up) // ALOG_ASSERT(mModule != NULL); - dstConfig->ext.device.hw_module = mModule != NULL ? mModule->mHandle : NULL; + dstConfig->ext.device.hw_module = mModule != 0 ? mModule->mHandle : AUDIO_IO_HANDLE_NONE; strncpy(dstConfig->ext.device.address, mAddress.string(), AUDIO_DEVICE_MAX_ADDRESS_LEN); } |