commit 61bc467cca94ad0964e019dfcce4e4aa84abec21
author Linux Build Service Account <lnxbuild@localhost> Thu Aug 27 16:38:53 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Aug 27 16:38:53 2015 -0700
tree 7bc017af6beefc6f0301e96a68dbd0171a897b8a
parent 26e087af5583ded29e1b38aa939b08dbe211f3f3
parent ec264e65131fa9b3d0ed35aaa9bdb4688b9ab437

Merge "FM: Remove FM TX support"

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 ec080bb..aaf38cb 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -2218,7 +2218,6 @@
       // This will reset the FM radio receiver
       if (mReceiver != null)
       {
-         bStatus = mReceiver.reset();
          mReceiver = null;
       }
       stop();

qcom/fmradio/FmRxEventListner.java

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 @@
                                     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: