diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-13 18:56:06 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-13 18:56:06 -0800 |
| commit | a3f6630152663ff56b6f58497360d90d34566c59 (patch) | |
| tree | 8c0e12731140faf20b3071674ea55dffc3e6b7cf | |
| parent | 3dbc41b58eff4bf30cd48141e136ff8308ea1c3b (diff) | |
| parent | 69c76c3c19c54ced8373c882228f806b36abefe7 (diff) | |
| download | android_hardware_qcom_fm-a3f6630152663ff56b6f58497360d90d34566c59.tar.gz android_hardware_qcom_fm-a3f6630152663ff56b6f58497360d90d34566c59.tar.bz2 android_hardware_qcom_fm-a3f6630152663ff56b6f58497360d90d34566c59.zip | |
Merge "FM: Fix the issue with A2DP disconnect"
| -rw-r--r-- | fmapp2/src/com/caf/fmradio/FMRadioService.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java index 2de50e7..458fb96 100644 --- a/fmapp2/src/com/caf/fmradio/FMRadioService.java +++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2013, The Linux Foundation. All rights reserved. + * Copyright (c) 2009-2014, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -375,12 +375,10 @@ public class FMRadioService extends Service Log.d(LOGTAG, "FM Audio Path is Analog Mode: FM Over BT not allowed"); return ; } - //when playback is overA2Dp and A2dp disconnected - //when playback is not overA2DP and A2DP Connected + //when A2dp connected/disconnected // In above two cases we need to Stop and Start FM which // will take care of audio routing if( (isFmOn()) && - (true == ((bA2dpConnected)^(mOverA2DP))) && (false == mStoppedOnFocusLoss)) { Log.d(LOGTAG, "stopping and starting FM\n"); stopFM(); |