audio_policy: look for config file in /vendor first

Change-Id: If10308f688437e1682e4104120772cfce16e9d89
Signed-off-by: Dima Zavin <dima@android.com>

diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp
index 0c00208..d5c0e6f 100644 (file)
--- 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 (file)
--- 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"