commit 415c0f40d9b745cb250f6125b04bfae9fe859cec
author Linux Build Service Account <lnxbuild@localhost> Mon Jun 27 03:04:44 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jun 27 03:04:44 2016 -0700
tree 141cb64a952cd903ec79145a32809eef314bd098
parent ddd610b49410295661910e9eda97e642ea54ce3e
parent 8f83f10634d7cd4050041c4bf8cf04cfbeff83fc

Merge "audiopolicy: add log to print XML policy config flag" into av-userspace.lnx.2.0-dev

policy_hal/Android.mk

diff --git a/policy_hal/Android.mk b/policy_hal/Android.mk
index 811c2c9..854eaee 100644
--- a/policy_hal/Android.mk
+++ b/policy_hal/Android.mk
@@ -65,6 +65,10 @@
 LOCAL_CFLAGS += -DFM_POWER_OPT
 endif
 
+ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)
+LOCAL_CFLAGS += -DUSE_XML_AUDIO_POLICY_CONF
+endif
+
 LOCAL_MODULE := libaudiopolicymanager
 
 include $(BUILD_SHARED_LIBRARY)

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 4c15fda..a5e0978 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -2107,6 +2107,12 @@
       mFMIsActive(false)
 {
 
+#ifdef USE_XML_AUDIO_POLICY_CONF
+    ALOGD("USE_XML_AUDIO_POLICY_CONF is TRUE");
+#else
+    ALOGD("USE_XML_AUDIO_POLICY_CONF is FALSE");
+#endif
+
     //TODO: Check the new logic to parse policy conf and update the below code
     //      Need this when SSR encoding is enabled
     char ssr_enabled[PROPERTY_VALUE_MAX] = {0};