diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-01-17 21:50:33 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-01-17 21:50:33 -0800 |
| commit | d5403a8e775e8c600f41356a0d0ae72cfe0912ed (patch) | |
| tree | fe5b08c2e8f31e9390501461e6e9dc601ad4d178 /fmapp2/src/com/caf/fmradio/FMRadioService.java | |
| parent | 944af0b8b6ea2d688529991c5face4b4ea84043d (diff) | |
| parent | 6646f15fb5c0f6110032c96ed3499b9bb5439dd9 (diff) | |
| download | android_hardware_qcom_fm-d5403a8e775e8c600f41356a0d0ae72cfe0912ed.tar.gz android_hardware_qcom_fm-d5403a8e775e8c600f41356a0d0ae72cfe0912ed.tar.bz2 android_hardware_qcom_fm-d5403a8e775e8c600f41356a0d0ae72cfe0912ed.zip | |
Merge "FM: Added support for audio routing from speaker to BT headset."
Diffstat (limited to 'fmapp2/src/com/caf/fmradio/FMRadioService.java')
| -rw-r--r-- | fmapp2/src/com/caf/fmradio/FMRadioService.java | 7 |
1 files changed, 4 insertions, 3 deletions
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 @@ public class FMRadioService extends Service 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 @@ public class FMRadioService extends Service // 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 @@ public class FMRadioService extends Service mStoppedOnFocusLoss = false; if (!mA2dpDeviceSupportInHal && (true == mA2dpDeviceState.isDeviceAvailable()) && - (!isSpeakerEnabled()) && !isAnalogModeEnabled() + !isAnalogModeEnabled() && (true == startA2dpPlayback())) { mOverA2DP=true; } else { |