diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-20 18:39:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 18:39:25 +0000 |
| commit | 568689b169d8b0ae2cc252b88602db5e5acaa604 (patch) | |
| tree | d5962cc1343c1efec7d731d94ddfc6179aea8c90 /include | |
| parent | 225f4f6d458331c26e2015a593079c45942520e3 (diff) | |
| parent | 3a2a32b5e758854712caf638fe1f74bb49b50777 (diff) | |
| download | frameworks_av-568689b169d8b0ae2cc252b88602db5e5acaa604.zip frameworks_av-568689b169d8b0ae2cc252b88602db5e5acaa604.tar.gz frameworks_av-568689b169d8b0ae2cc252b88602db5e5acaa604.tar.bz2 | |
am 3a2a32b5: Merge "AudioSystem: fix cross deadlock" into lmp-mr1-dev
* commit '3a2a32b5e758854712caf638fe1f74bb49b50777':
AudioSystem: fix cross deadlock
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index d54eca7..1614525 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -90,7 +90,7 @@ public: static void setErrorCallback(audio_error_callback cb); // helper function to obtain AudioFlinger service handle - static const sp<IAudioFlinger>& get_audio_flinger(); + static const sp<IAudioFlinger> get_audio_flinger(); static float linearToLog(int volume); static int logToLinear(float volume); @@ -270,7 +270,7 @@ public: // and output configuration cache (gOutputs) static void clearAudioConfigCache(); - static const sp<IAudioPolicyService>& get_audio_policy_service(); + static const sp<IAudioPolicyService> get_audio_policy_service(); // helpers for android.media.AudioManager.getProperty(), see description there for meaning static uint32_t getPrimaryOutputSamplingRate(); |