diff options
| author | Dima Zavin <dima@android.com> | 2012-04-23 16:51:00 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2012-04-23 16:51:00 -0700 |
| commit | 5ec145df7708564d385fd3fb764085321cf4c253 (patch) | |
| tree | 69cea202e9fd9d9df7b391b1a98274f34441fcfb | |
| parent | 9029a4fe8abafd383e6fbb1409d1e2f749b51391 (diff) | |
| download | libhardware_legacy-5ec145df7708564d385fd3fb764085321cf4c253.tar.gz | |
audio_policy: look for config file in /vendor first
Change-Id: If10308f688437e1682e4104120772cfce16e9d89
Signed-off-by: Dima Zavin <dima@android.com>
| -rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 8 | ||||
| -rw-r--r-- | include/hardware_legacy/audio_policy_conf.h | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 0c00208..d5c0e6f 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -1217,8 +1217,10 @@ AudioPolicyManagerBase::AudioPolicyManagerBase(AudioPolicyClientInterface *clien mScoDeviceAddress = String8(""); mUsbCardAndDevice = String8(""); - if (loadAudioPolicyConfig(AUDIO_POLICY_CONFIG_FILE) != NO_ERROR) { - ALOGE("could not load audio policy configuration file"); + if (loadAudioPolicyConfig(AUDIO_POLICY_VENDOR_CONFIG_FILE) != NO_ERROR) { + if (loadAudioPolicyConfig(AUDIO_POLICY_CONFIG_FILE) != NO_ERROR) { + ALOGE("could not load audio policy configuration file"); + } } // open all output streams needed to access attached devices @@ -3399,6 +3401,8 @@ status_t AudioPolicyManagerBase::loadAudioPolicyConfig(const char *path) free(root); free(data); + ALOGI("loadAudioPolicyConfig() loaded %s\n", path); + return NO_ERROR; } diff --git a/include/hardware_legacy/audio_policy_conf.h b/include/hardware_legacy/audio_policy_conf.h index c5e8940..c1fc0c1 100644 --- a/include/hardware_legacy/audio_policy_conf.h +++ b/include/hardware_legacy/audio_policy_conf.h @@ -26,6 +26,7 @@ #define AUDIO_HARDWARE_MODULE_ID_MAX_LEN 32 #define AUDIO_POLICY_CONFIG_FILE "/system/etc/audio_policy.conf" +#define AUDIO_POLICY_VENDOR_CONFIG_FILE "/vendor/etc/audio_policy.conf" // global configuration #define GLOBAL_CONFIG_TAG "global_configuration" |