summaryrefslogtreecommitdiffstats
path: root/qcom
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-11-29 19:56:29 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-11-29 19:56:29 -0800
commit6cd308edabb50f49026accf7e2a656df89587fd6 (patch)
treedc376d271cf66eaaefc5f84aa490b5f4207297b5 /qcom
parent55e2fbfa99151ef2bebe7dcefd2ce1ed8ebda3b3 (diff)
parentb30388791b47e780118d7ca09b431f56299a51e4 (diff)
downloadandroid_hardware_qcom_fm-6cd308edabb50f49026accf7e2a656df89587fd6.tar.gz
android_hardware_qcom_fm-6cd308edabb50f49026accf7e2a656df89587fd6.tar.bz2
android_hardware_qcom_fm-6cd308edabb50f49026accf7e2a656df89587fd6.zip
Merge "FM: Update state after tune is complete when search is cancelled"
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: