summaryrefslogtreecommitdiffstats
path: root/qcom
diff options
context:
space:
mode:
authorSatish Kodishala <skodisha@codeaurora.org>2014-11-20 16:09:56 +0530
committerSatish Kodishala <skodisha@codeaurora.org>2014-11-20 16:38:18 +0530
commitb30388791b47e780118d7ca09b431f56299a51e4 (patch)
tree84facab5b2e92416744893583685fa8d6be393c7 /qcom
parent3dbc41b58eff4bf30cd48141e136ff8308ea1c3b (diff)
downloadandroid_hardware_qcom_fm-b30388791b47e780118d7ca09b431f56299a51e4.tar.gz
android_hardware_qcom_fm-b30388791b47e780118d7ca09b431f56299a51e4.tar.bz2
android_hardware_qcom_fm-b30388791b47e780118d7ca09b431f56299a51e4.zip
FM: Update state after tune is complete when search is cancelled
If seek is cancelled at the same time when it is complete, there is a chance that search state machine can remain in cancel search state and subsequent searches will fail. Change search state after tune complete event is received when search is cancelled. CRs-fixed: 760134 Change-Id: Iff7c746aba592452552403811b6db4a7dda7c43b
Diffstat (limited to 'qcom')
-rw-r--r--qcom/fmradio/FmRxEventListner.java11
1 files changed, 4 insertions, 7 deletions
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 @@ class FmRxEventListner {
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 @@ class FmRxEventListner {
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: