summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-08-24 17:09:09 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-08-24 17:09:09 -0700
commit26e087af5583ded29e1b38aa939b08dbe211f3f3 (patch)
tree647fb2356937215d84694f12cae3cd9f5349c2c3
parent203c55ee2e5b4ae840a9154b775012298e23b8d6 (diff)
parent09d168e0ffc1b0ef9df6475ca60e801ef105c388 (diff)
downloadandroid_hardware_qcom_fm-26e087af5583ded29e1b38aa939b08dbe211f3f3.tar.gz
android_hardware_qcom_fm-26e087af5583ded29e1b38aa939b08dbe211f3f3.tar.bz2
android_hardware_qcom_fm-26e087af5583ded29e1b38aa939b08dbe211f3f3.zip
Merge "FM: Fix the issue with SSR"
-rw-r--r--fmapp2/src/com/caf/fmradio/FMRadioService.java1
-rw-r--r--qcom/fmradio/FmRxEventListner.java4
2 files changed, 4 insertions, 1 deletions
diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index ec080bb..aaf38cb 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -2218,7 +2218,6 @@ public class FMRadioService extends Service
// This will reset the FM radio receiver
if (mReceiver != null)
{
- bStatus = mReceiver.reset();
mReceiver = null;
}
stop();
diff --git a/qcom/fmradio/FmRxEventListner.java b/qcom/fmradio/FmRxEventListner.java
index f73aab3..0f73a5c 100644
--- a/qcom/fmradio/FmRxEventListner.java
+++ b/qcom/fmradio/FmRxEventListner.java
@@ -220,8 +220,12 @@ class FmRxEventListner {
cb.FmRxEvDisableReceiver();
Thread.currentThread().interrupt();
} else {
+ FmTransceiver.setFMPowerState(FmTransceiver.FMState_Turned_Off);
Log.d(TAG, "Unexpected RADIO_DISABLED recvd");
+ Log.v(TAG, "RxEvtList: CURRENT-STATE : FMRxOn ---> NEW-STATE : FMOff");
+ FmTransceiver.release("/dev/radio0");
cb.FmRxEvRadioReset();
+ Thread.currentThread().interrupt();
}
break;
case 19: