diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-03-31 18:02:24 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2015-04-01 11:29:43 -0700 |
| commit | 887a9ed4446cb451181c392a0e51a69914e58fbf (patch) | |
| tree | 148916028dcdf5c2db173f62f1b063412d070124 /services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h | |
| parent | 2110e04cdfbf9ad85ce154ce5f778ee5ccfc95eb (diff) | |
| download | frameworks_av-887a9ed4446cb451181c392a0e51a69914e58fbf.zip frameworks_av-887a9ed4446cb451181c392a0e51a69914e58fbf.tar.gz frameworks_av-887a9ed4446cb451181c392a0e51a69914e58fbf.tar.bz2 | |
Updates to AudioPolicyManager refactor
Use protected access in AudioPolicyManager class for
- engine field
- querying phone state
- isStrategyActive
Fix inclusion of AudioPolicyManagerInterface header.
Use "APM_" prefix in audio policy conf parsing code to avoid
naming conflicts with some HALs.
DeviceDescriptor and its collection class are good friends now.
Change-Id: I236d62a2b8a4b6bf68dd515932650b912577c145
Diffstat (limited to 'services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h')
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h b/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h index b9e1d4a..d15f6b4 100644 --- a/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h +++ b/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h @@ -54,6 +54,8 @@ public: private: audio_devices_t mDeviceType; + +friend class DeviceVector; }; class DeviceVector : public SortedVector< sp<DeviceDescriptor> > |