diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-21 01:54:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-21 01:54:44 +0000 |
| commit | aa1496ac8c4365b43b6504941b44903dc0f9b7e7 (patch) | |
| tree | 4b711eb8ef608ab9c4a4df667f03d1d47a713f65 /include | |
| parent | 8eeda89ae361ccd048d7bba0fd11291e05577e2a (diff) | |
| parent | c9769c557e202df671e35196c8c735b49257be7d (diff) | |
| download | frameworks_av-aa1496ac8c4365b43b6504941b44903dc0f9b7e7.zip frameworks_av-aa1496ac8c4365b43b6504941b44903dc0f9b7e7.tar.gz frameworks_av-aa1496ac8c4365b43b6504941b44903dc0f9b7e7.tar.bz2 | |
am 568689b1: am 3a2a32b5: Merge "AudioSystem: fix cross deadlock" into lmp-mr1-dev
automerge: c9769c5
* commit 'c9769c557e202df671e35196c8c735b49257be7d':
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(); |