summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKamal Negi <kamaln@codeaurora.org>2016-03-22 16:57:06 +0530
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2016-04-19 20:40:13 -0700
commit2f5edee0cb5b4ee9cc09b44e77509fa2a5ecfd92 (patch)
tree84fe229e639283b39830242bd7c1c6103ef6b7c0
parent836e8dc262d13eee0679986ceae5eda204d3c433 (diff)
downloadandroid_hardware_qcom_fm-2f5edee0cb5b4ee9cc09b44e77509fa2a5ecfd92.tar.gz
android_hardware_qcom_fm-2f5edee0cb5b4ee9cc09b44e77509fa2a5ecfd92.tar.bz2
android_hardware_qcom_fm-2f5edee0cb5b4ee9cc09b44e77509fa2a5ecfd92.zip
FM: Fix Static Analysis Issues
Removed unused variable and cleanup code for FM seek functionality. Change-Id: I01d9a55f76e1c7d68abfad9d513ae6b3625c5c77
-rw-r--r--libfm_jni/LibfmJni.cpp28
1 files changed, 7 insertions, 21 deletions
diff --git a/libfm_jni/LibfmJni.cpp b/libfm_jni/LibfmJni.cpp
index d96751a..94a696f 100644
--- a/libfm_jni/LibfmJni.cpp
+++ b/libfm_jni/LibfmJni.cpp
@@ -116,32 +116,18 @@ jboolean SetFreq(JNIEnv *env, jobject thiz, jfloat freq)
jfloat Seek(JNIEnv *env, jobject thiz, jfloat freq, jboolean isUp)
{
- int ret = 0;
- int tmp_freq;
- int ret_freq = 0;
- float val;
+ int ret = JNI_FALSE;
+ float val = freq;
- tmp_freq = (int)(freq * FREQ_MULT); //Eg, 87.55 * 100 --> 87550
- if (pFMRadio)
+ if (pFMRadio) {
ret = pFMRadio->Set_mute(true);
- else
- ret = JNI_FALSE;
- if (ret) {
- ALOGE("%s, error, [ret=%d]\n", __func__, ret);
- }
- ALOGD("%s, [mute] [ret=%d]\n", __func__, ret);
- if (pFMRadio)
+ ALOGD("%s, [mute] [ret=%d]\n", __func__, ret);
ret = pFMRadio->Seek((int)isUp);
- else
- ret = JNI_FALSE;
- if (ret < 0) {
- ret_freq = tmp_freq; //seek error, so use original freq
+ ALOGD("%s, [freq=%f] [ret=%d]\n", __func__, freq, ret);
+ if (ret > 0)
+ val = (float)ret/FREQ_MULT; //Eg, 8755 / 100 --> 87.55
}
- ALOGD("%s, [freq=%d] [ret=%d]\n", __func__, ret_freq, ret);
-
- val = (float)ret/FREQ_MULT; //Eg, 8755 / 100 --> 87.55
-
return val;
}