commit b70ed7324f6bb68c32799632dd47c7db4ff52b48
author Linux Build Service Account <lnxbuild@localhost> Mon Nov 21 20:47:54 2016 -0700
committer Linux Build Service Account <lnxbuild@localhost> Mon Nov 21 20:47:54 2016 -0700
tree cc4060df1cb7673cbfc11af9d11ac3b0d9081941
parent 8e1882b2bb1af47b0cecd40dc1d8d7ee5643e45a
parent 7e4074908c5682bf7ccfeb8cf5fbab2e7d29034b

Promotion of fm.lnx.2.1-00014.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1087424   I748d8432ffdc875e7efd0064018ac9d95b907600   Add checks to listen for A2dp state changes

Change-Id: I354373a1af9119939652c22d513b8f4f53d6ea6c
CRs-Fixed: 1087424

fmapp2/src/com/caf/fmradio/FMRadioService.java

diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 43e91a6..54654fa 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -608,6 +608,7 @@
      */
     public void registerHeadsetListener() {
         if (mHeadsetReceiver == null) {
+            boolean fm_a2dp_disabled = SystemProperties.getBoolean("fm.a2dp.conc.disabled",true);
             mHeadsetReceiver = new BroadcastReceiver() {
                 @Override
                 public void onReceive(Context context, Intent intent) {
@@ -682,7 +683,9 @@
             AudioManager am = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
             IntentFilter iFilter = new IntentFilter();
             iFilter.addAction(Intent.ACTION_HEADSET_PLUG);
-            iFilter.addAction(mA2dpDeviceState.getActionSinkStateChangedString());
+            if (!fm_a2dp_disabled) {
+                iFilter.addAction(mA2dpDeviceState.getActionSinkStateChangedString());
+            }
             iFilter.addAction("HDMI_CONNECTED");
             iFilter.addAction(Intent.ACTION_SHUTDOWN);
             iFilter.addCategory(Intent.CATEGORY_DEFAULT);

helium/radio_helium_hal.c

diff --git a/helium/radio_helium_hal.c b/helium/radio_helium_hal.c
index 3f68812..3fa4587 100644
--- a/helium/radio_helium_hal.c
+++ b/helium/radio_helium_hal.c
@@ -623,7 +623,7 @@
 
     memcpy(data+RDS_OFFSET, &buff[RDS_PS_DATA_OFFSET], len-RDS_OFFSET);
 
-    ALOGE("SSK call ps-callback");
+    ALOGV("call ps-callback");
     hal->jni_cb->ps_update_cb(data);
 
     free(data);