aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2014-12-09 20:07:23 +0000
committerVishal Bhoj <vishal.bhoj@hackbox.linaro.org>2014-12-10 09:24:49 +0000
commitecdc4f78f13600cb31b18f630d8f703f8abaaba8 (patch)
tree92438aaf067285edbd9cb1dbfba42ed30530d5b4
parent7c8b233795574b87c67af5dc6f92a1f576a2798b (diff)
downloadvexpress-ecdc4f78f13600cb31b18f630d8f703f8abaaba8.tar.gz
vexpress Audio HAL: use correct API version
The Versatile Express Audio HAL was using the _CURRENT API constant instead of the _2_0 constant. The API version has moved on from Android K to L and the HAL has not been updated to the latest API version. Fixes Bug 950 - [Android L] Audio HAL crashed on vexpress-tc2 Change-Id: I0f3b61df5f76c379acd5558a362a131fb1c871d2 Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rw-r--r--audio/audio_hw.c2
-rw-r--r--device.mk3
2 files changed, 2 insertions, 3 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 4dad691..3b6b692 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -1731,7 +1731,7 @@ static int adev_open(const hw_module_t* module, const char* name,
return -ENOMEM;
adev->hw_device.common.tag = HARDWARE_DEVICE_TAG;
- adev->hw_device.common.version = AUDIO_DEVICE_API_VERSION_CURRENT;
+ adev->hw_device.common.version = AUDIO_DEVICE_API_VERSION_2_0;
adev->hw_device.common.module = (struct hw_module_t *) module;
adev->hw_device.common.close = adev_close;
diff --git a/device.mk b/device.mk
index 4f9749c..9ef6b66 100644
--- a/device.mk
+++ b/device.mk
@@ -91,8 +91,7 @@ $(call inherit-product-if-exists, device/linaro/build/extra-and-tests.mk)
# Include Android userspace tests
$(call inherit-product-if-exists, external/linaro-android-userspace-test/product.mk)
-# Disable audio for now in Android Lollipop
-# PRODUCT_PACKAGES += audio.primary.vexpress
+PRODUCT_PACKAGES += audio.primary.vexpress
# Need AppWidget permission to prevent from Launcher's crash.