diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-12-12 14:54:02 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-12-12 14:54:02 -0800 |
| commit | 24fbad88bc04fb6c31ef8880dac815f6d360041a (patch) | |
| tree | 2f7b31ff14c0c637264d88b9f47c982022cc7272 /media | |
| parent | 33ce459110ec8af960d81bce65e1fb38fb750fe8 (diff) | |
| parent | a479699890a11e10cd78eb40264b2d884773ba82 (diff) | |
| download | frameworks_av-24fbad88bc04fb6c31ef8880dac815f6d360041a.zip frameworks_av-24fbad88bc04fb6c31ef8880dac815f6d360041a.tar.gz frameworks_av-24fbad88bc04fb6c31ef8880dac815f6d360041a.tar.bz2 | |
Merge "libmedia: add pre jb-4.2.1 signature for AudioSystem::getDeviceConnectionState" into mr1-staging
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 6 |
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; |