commit e4806bbccc2150607d84d2df5cb91aa24c4fe10a
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jan 28 00:20:08 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 28 00:20:08 2017 +0000
tree e27b946a543e6fe5e38ac8ea3820ad6e7a588a1c
parent 78b3ee27f696980c999c9ac5db87e626ff6f717f
parent 2c37fd3a0ab8ad01bd21af0f1a1efbc240a2c0bd

Merge "audio: fix device address conversion to HIDL"

media/libaudiohal/DeviceHalHidl.cpp

diff --git a/media/libaudiohal/DeviceHalHidl.cpp b/media/libaudiohal/DeviceHalHidl.cpp
index a6ced12..dcedfd3 100644
--- a/media/libaudiohal/DeviceHalHidl.cpp
+++ b/media/libaudiohal/DeviceHalHidl.cpp
@@ -50,6 +50,10 @@
 status_t deviceAddressFromHal(
         audio_devices_t device, const char* halAddress, DeviceAddress* address) {
     address->device = AudioDevice(device);
+
+    if (address == nullptr || strnlen(halAddress, AUDIO_DEVICE_MAX_ADDRESS_LEN) == 0) {
+        return OK;
+    }
     const bool isInput = (device & AUDIO_DEVICE_BIT_IN) != 0;
     if (isInput) device &= ~AUDIO_DEVICE_BIT_IN;
     if ((!isInput && (device & AUDIO_DEVICE_OUT_ALL_A2DP) != 0)