commit 6cd308edabb50f49026accf7e2a656df89587fd6
author Linux Build Service Account <lnxbuild@localhost> Sat Nov 29 19:56:29 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Nov 29 19:56:29 2014 -0800
tree dc376d271cf66eaaefc5f84aa490b5f4207297b5
parent 55e2fbfa99151ef2bebe7dcefd2ce1ed8ebda3b3
parent b30388791b47e780118d7ca09b431f56299a51e4

Merge "FM: Update state after tune is complete when search is cancelled"

qcom/fmradio/FmRxEventListner.java

diff --git a/qcom/fmradio/FmRxEventListner.java b/qcom/fmradio/FmRxEventListner.java
index 5f9a254..c5307e5 100644
--- a/qcom/fmradio/FmRxEventListner.java
+++ b/qcom/fmradio/FmRxEventListner.java
@@ -107,6 +107,10 @@
                                 freq = FmReceiverJNI.getFreqNative(fd);
                                 state = FmReceiver.getSearchState();
                                 switch(state) {
+                                   case FmTransceiver.subSrchLevel_SrchAbort:
+                                        Log.v(TAG, "Current state is SRCH_ABORTED");
+                                        Log.v(TAG, "Aborting on-going search command...");
+                                        /* intentional fall through */
                                    case FmTransceiver.subSrchLevel_SeekInPrg :
                                         Log.v(TAG, "Current state is " + state);
                                         FmReceiver.setSearchState(FmTransceiver.subSrchLevel_SrchComplete);
@@ -131,13 +135,6 @@
                                       Log.v(TAG, "RxEvtList: CURRENT-STATE : Search ---> NEW-STATE : FMRxOn");
                                       cb.FmRxEvSearchComplete(FmReceiverJNI.getFreqNative(fd));
                                       break;
-                                   case FmTransceiver.subSrchLevel_SrchAbort:
-                                      Log.v(TAG, "Current state is SRCH_ABORTED");
-                                      Log.v(TAG, "Aborting on-going search command...");
-                                      FmReceiver.setSearchState(FmTransceiver.subSrchLevel_SrchComplete);
-                                      Log.v(TAG, "RxEvtList: CURRENT-STATE : Search ---> NEW-STATE : FMRxOn");
-                                      cb.FmRxEvSearchComplete(FmReceiverJNI.getFreqNative(fd));
-                                      break;
                                 }
                                 break;
                             case 3: