FM: Rename the QC introduced props to have vendor tag added
Change-Id: I64d19f80ceb37a88dfd59919863ac83c09f695f7
diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index 37873d2..ec80835 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -392,7 +392,7 @@
if ((mERadioTextScroller == null) && (mERadioTextTV != null)) {
mERadioTextScroller = new ScrollerText(mERadioTextTV);
}
- mBTsoc = SystemProperties.get("qcom.bluetooth.soc");
+ mBTsoc = SystemProperties.get("vendor.bluetooth.soc");
}
protected void setDisplayvalue(){
diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index a0cfbdb..6d3ccd3 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -2252,9 +2252,6 @@
Log.d(LOGTAG,"Analog Path is not supported ");
return false;
}
- if (SystemProperties.getBoolean("hw.fm.digitalpath",false)) {
- return false;
- }
boolean state = mReceiver.setAnalogMode(analogMode);
if (false == state) {
@@ -2585,7 +2582,6 @@
unMute();
if (isAnalogModeEnabled()) {
- SystemProperties.set("hw.fm.isAnalog","false");
misAnalogPathEnabled = false;
}
}
@@ -2610,7 +2606,6 @@
}
if (isAnalogModeEnabled()) {
- SystemProperties.set("hw.fm.isAnalog","false");
misAnalogPathEnabled = false;
}
diff --git a/fmapp2/src/com/caf/fmradio/FMStats.java b/fmapp2/src/com/caf/fmradio/FMStats.java
index f7254a2..0441682 100644
--- a/fmapp2/src/com/caf/fmradio/FMStats.java
+++ b/fmapp2/src/com/caf/fmradio/FMStats.java
@@ -2896,7 +2896,7 @@
private boolean isCherokeeChip() {
Log.d(LOGTAG, "isCherokeeChip");
- String chip = SystemProperties.get("qcom.bluetooth.soc");
+ String chip = SystemProperties.get("vendor.bluetooth.soc");
if (chip.equals("cherokee"))
return true;
else
@@ -2906,7 +2906,7 @@
private boolean isRomeChip() {
String chip = "";
- chip = SystemProperties.get("qcom.bluetooth.soc");
+ chip = SystemProperties.get("vendor.bluetooth.soc");
if(chip.equals("rome"))
return true;
return false;
diff --git a/jni/Android.mk b/jni/Android.mk
index 4c64481..bf12d79 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -3,10 +3,6 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-ifeq ($(BOARD_HAS_QCA_FM_SOC), "cherokee")
-LOCAL_CFLAGS += -DFM_SOC_TYPE_CHEROKEE
-endif
-
LOCAL_SRC_FILES:= \
android_hardware_fm.cpp \
ConfFileParser.cpp \
diff --git a/jni/android_hardware_fm.cpp b/jni/android_hardware_fm.cpp
index 6964271..0dca4fa 100644
--- a/jni/android_hardware_fm.cpp
+++ b/jni/android_hardware_fm.cpp
@@ -679,26 +679,26 @@
ALOGD("Driver Version(Same as ChipId): %x \n", cap.version );
/*Conver the integer to string */
snprintf(versionStr, sizeof(versionStr), "%d", cap.version);
- property_set("hw.fm.version", versionStr);
+ property_set("vendor.hw.fm.version", versionStr);
} else {
close(fd);
return FM_JNI_FAILURE;
}
- property_get("qcom.bluetooth.soc", value, NULL);
+ property_get("vendor.bluetooth.soc", value, NULL);
ALOGD("BT soc is %s\n", value);
if (strcmp(value, "rome") != 0)
{
/*Set the mode for soc downloader*/
- property_set("hw.fm.mode", "normal");
+ property_set("vendor.hw.fm.mode", "normal");
/* Need to clear the hw.fm.init firstly */
- property_set("hw.fm.init", "0");
+ property_set("vendor.hw.fm.init", "0");
property_set("ctl.start", "fm_dl");
sched_yield();
for(i=0; i<45; i++) {
- property_get("hw.fm.init", value, NULL);
+ property_get("vendor.hw.fm.init", value, NULL);
if (strcmp(value, "1") == 0) {
init_success = 1;
break;
@@ -726,7 +726,7 @@
char retval =0;
char value[PROPERTY_VALUE_MAX] = {'\0'};
- property_get("qcom.bluetooth.soc", value, NULL);
+ property_get("vendor.bluetooth.soc", value, NULL);
ALOGD("BT soc is %s\n", value);
@@ -739,21 +739,15 @@
}
static bool is_soc_cherokee() {
+
char value[PROPERTY_VALUE_MAX] = {'\0'};
property_get("vendor.bluetooth.soc", value, NULL);
ALOGD("BT soc is %s\n", value);
- // Need to rework on property
- /*if(strcmp(value, "cherokee") == 0)
+ if(strcmp(value, "cherokee") == 0)
return true;
else
- return false;*/
-#ifdef FM_SOC_TYPE_CHEROKEE
- ALOGD("BT soc is CHEROKEE");
- return true;
-#else
- return false;
-#endif
+ return false;
}
/********************************************************************
* Current JNI
@@ -1210,23 +1204,23 @@
int band;
int err = 0;
- property_get("qcom.bluetooth.soc", value, NULL);
+ property_get("vendor.bluetooth.soc", value, NULL);
ALOGD("BT soc is %s\n", value);
if (strcmp(value, "rome") != 0)
{
/*Enable/Disable the WAN avoidance*/
- property_set("hw.fm.init", "0");
+ property_set("vendor.hw.fm.init", "0");
if (aValue)
- property_set("hw.fm.mode", "wa_enable");
+ property_set("vendor.hw.fm.mode", "wa_enable");
else
- property_set("hw.fm.mode", "wa_disable");
+ property_set("vendor.hw.fm.mode", "wa_disable");
property_set("ctl.start", "fm_dl");
sched_yield();
for(i=0; i<10; i++) {
- property_get("hw.fm.init", value, NULL);
+ property_get("vendor.hw.fm.init", value, NULL);
if (strcmp(value, "1") == 0) {
init_success = 1;
break;
@@ -1236,7 +1230,7 @@
}
ALOGE("init_success:%d after %f seconds \n", init_success, 0.2*i);
- property_get("notch.value", notch, NULL);
+ property_get("vendor.notch.value", notch, NULL);
ALOGE("Notch = %s",notch);
if (!strncmp("HIGH",notch,strlen("HIGH")))
band = HIGH_BAND;
@@ -1270,24 +1264,19 @@
char value[PROPERTY_VALUE_MAX] = {'\0'};
char firmwareVersion[80];
- property_get("qcom.bluetooth.soc", value, NULL);
+ property_get("vendor.bluetooth.soc", value, NULL);
ALOGD("BT soc is %s\n", value);
if (strcmp(value, "rome") != 0)
{
/*Enable/Disable Analog Mode FM*/
- property_set("hw.fm.init", "0");
- if (aValue) {
- property_set("hw.fm.isAnalog", "true");
- } else {
- property_set("hw.fm.isAnalog", "false");
- }
- property_set("hw.fm.mode","config_dac");
+ property_set("vendor.hw.fm.init", "0");
+ property_set("vendor.hw.fm.mode","config_dac");
property_set("ctl.start", "fm_dl");
sched_yield();
for(i=0; i<10; i++) {
- property_get("hw.fm.init", value, NULL);
+ property_get("vendor.hw.fm.init", value, NULL);
if (strcmp(value, "1") == 0) {
return 1;
} else {
diff --git a/qcom/fmradio/FmReceiver.java b/qcom/fmradio/FmReceiver.java
index 4957fef..9738540 100644
--- a/qcom/fmradio/FmReceiver.java
+++ b/qcom/fmradio/FmReceiver.java
@@ -352,7 +352,7 @@
}
public static boolean isRomeChip() {
- String chip = SystemProperties.get("qcom.bluetooth.soc");
+ String chip = SystemProperties.get("vendor.bluetooth.soc");
if (chip.equals("rome"))
return true;
else
@@ -360,7 +360,7 @@
}
public static boolean isCherokeeChip() {
- String chip = SystemProperties.get("qcom.bluetooth.soc");
+ String chip = SystemProperties.get("vendor.bluetooth.soc");
if (chip.equals("cherokee"))
return true;
else