summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorHashcode <hashcode0f@gmail.com>2012-11-30 00:28:40 -0800
committerHashcode <hashcode0f@gmail.com>2012-11-30 00:28:40 -0800
commita479699890a11e10cd78eb40264b2d884773ba82 (patch)
tree3ebdafb3438f22bc33cbab0186f55ce4e65d0fef /media/libmedia
parent001573b26e5ccfb6bee9a34837ec4f29d5f73f7f (diff)
downloadframeworks_av-a479699890a11e10cd78eb40264b2d884773ba82.zip
frameworks_av-a479699890a11e10cd78eb40264b2d884773ba82.tar.gz
frameworks_av-a479699890a11e10cd78eb40264b2d884773ba82.tar.bz2
libmedia: add pre jb-4.2.1 signature for AudioSystem::getDeviceConnectionState
With jb-4.2.1 the type audio_devices_t found in system/core/include/system/audio.h was redefined from a typedef enum to uint32_t. This causes the signature of AudioSystem::getDeviceConnectionState to change in libmedia.so. Any older than 4.2.1 prebuilt audio.primary.___.so binaries (such as mine from ICS) may refer to the old signature. This patch adds back in that reference. Change-Id: Ie4f92eaec20d581c9bebc805cfd25f8558406e30 Signed-off-by: Hashcode <hashcode0f@gmail.com>
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/AudioSystem.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp
index 94d5089..b7b3b7d 100644
--- a/media/libmedia/AudioSystem.cpp
+++ b/media/libmedia/AudioSystem.cpp
@@ -561,6 +561,12 @@ audio_policy_dev_state_t AudioSystem::getDeviceConnectionState(audio_devices_t d
return aps->getDeviceConnectionState(device, device_address);
}
+extern "C" audio_policy_dev_state_t _ZN7android11AudioSystem24getDeviceConnectionStateE15audio_devices_tPKc(audio_devices_t device,
+ const char *device_address)
+{
+ return AudioSystem::getDeviceConnectionState(device, device_address);
+}
+
status_t AudioSystem::setPhoneState(audio_mode_t state)
{
if (uint32_t(state) >= AUDIO_MODE_CNT) return BAD_VALUE;