From 5ec145df7708564d385fd3fb764085321cf4c253 Mon Sep 17 00:00:00 2001 From: Dima Zavin Date: Mon, 23 Apr 2012 16:51:00 -0700 Subject: audio_policy: look for config file in /vendor first Change-Id: If10308f688437e1682e4104120772cfce16e9d89 Signed-off-by: Dima Zavin --- audio/AudioPolicyManagerBase.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'audio/AudioPolicyManagerBase.cpp') 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; } -- cgit v1.2.3