diff options
| author | Eric Laurent <elaurent@google.com> | 2014-06-07 10:01:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-07 10:01:16 +0000 |
| commit | 7e45ef9db7446d33c941961c14555413641e444b (patch) | |
| tree | b3e2dca352431bace292402d2498f888ebd7a377 /services/audiopolicy/AudioPolicyManager.h | |
| parent | 3e648747e7e40752580ae7fd0ff2e803623680cd (diff) | |
| parent | 318cd78e3b8503113919191b3711eb8be5d23d35 (diff) | |
| download | frameworks_av-7e45ef9db7446d33c941961c14555413641e444b.zip frameworks_av-7e45ef9db7446d33c941961c14555413641e444b.tar.gz frameworks_av-7e45ef9db7446d33c941961c14555413641e444b.tar.bz2 | |
am 318cd78e: Merge "audio policy: added audio HAL version in audio_policy.conf" into lmp-preview-dev
* commit '318cd78e3b8503113919191b3711eb8be5d23d35':
audio policy: added audio HAL version in audio_policy.conf
Diffstat (limited to 'services/audiopolicy/AudioPolicyManager.h')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.h b/services/audiopolicy/AudioPolicyManager.h index b572f13..1abeb6a 100644 --- a/services/audiopolicy/AudioPolicyManager.h +++ b/services/audiopolicy/AudioPolicyManager.h @@ -359,8 +359,9 @@ protected: void dump(int fd); - const char *const mName; // base name of the audio HW module (primary, a2dp ...) - audio_module_handle_t mHandle; + const char *const mName; // base name of the audio HW module (primary, a2dp ...) + uint32_t mHalVersion; // audio HAL API version + audio_module_handle_t mHandle; Vector < sp<IOProfile> > mOutputProfiles; // output profiles exposed by this module Vector < sp<IOProfile> > mInputProfiles; // input profiles exposed by this module DeviceVector mDeclaredDevices; // devices declared in audio_policy.conf |