commit d5403a8e775e8c600f41356a0d0ae72cfe0912ed
author Linux Build Service Account <lnxbuild@localhost> Fri Jan 17 21:50:33 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jan 17 21:50:33 2014 -0800
tree fe5b08c2e8f31e9390501461e6e9dc601ad4d178
parent 944af0b8b6ea2d688529991c5face4b4ea84043d
parent 6646f15fb5c0f6110032c96ed3499b9bb5439dd9

Merge "FM: Added support for audio routing from speaker to BT headset."

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 0f738c3..b23aac1 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -359,6 +359,7 @@
                             Log.d(LOGTAG, "A2DP device is dis-connected!");
                             mA2dpDisconnected = true;
                         } else {
+                            Log.d(LOGTAG, "A2DP device is connected!");
                             mA2dpDisconnected = false;
                         }
                         if (isAnalogModeEnabled()) {
@@ -371,8 +372,8 @@
                        // will take care of audio routing
                        if( (isFmOn()) &&
                            (true == ((bA2dpConnected)^(mOverA2DP))) &&
-                           (false == mStoppedOnFocusLoss) &&
-                           (!isSpeakerEnabled())) {
+                           (false == mStoppedOnFocusLoss)) {
+                           Log.d(LOGTAG, "stopping and starting FM\n");
                            stopFM();
                            startFM();
                        }
@@ -759,7 +760,7 @@
        mStoppedOnFocusLoss = false;
 
        if (!mA2dpDeviceSupportInHal &&  (true == mA2dpDeviceState.isDeviceAvailable()) &&
-            (!isSpeakerEnabled()) && !isAnalogModeEnabled()
+           !isAnalogModeEnabled()
             && (true == startA2dpPlayback())) {
             mOverA2DP=true;
        } else {