commit 222aa71f2ebebdf0c286e357b32e07225c5060c3
author himta ram <hram@codeaurora.org> Mon Jan 06 17:28:49 2020 +0530
committer himta ram <hram@codeaurora.org> Fri Jan 10 12:54:55 2020 +0530
tree 3d2facb5773ee97198b36b30219767d3a97bf08a
parent 56348a539fe58d5db59df7330828ffe3e1f04683

Fm: Use btconfigstore interface to fetch vendor property

Use btconfigstore interface to fetch "persist.vendor.btwlan.lpfenabler"
and "persist.vendor.fm_wan.ratconf" property.

CRs-fixed: 2600766
Change-Id: I7ec522e5239ce0ba1c034090c8b54e10265cdcef

jni/android_hardware_fm.cpp

diff --git a/jni/android_hardware_fm.cpp b/jni/android_hardware_fm.cpp
index 8e70592..2bf77c0 100644
--- a/jni/android_hardware_fm.cpp
+++ b/jni/android_hardware_fm.cpp
@@ -81,6 +81,11 @@
     SCAN_DN
 };
 
+enum fm_prop_t {
+    FMWAN_RATCONF,
+    FMBTWLAN_LPFENABLER
+};
+
 static JavaVM *g_jVM = NULL;
 
 namespace android {
@@ -1545,6 +1550,26 @@
     return ret;
 }
 
+static jint android_hardware_fmradio_FmReceiverJNI_getFmCoexPropNative
+(JNIEnv * env, jobject thiz, jint fd, jint prop)
+{
+    jint ret;
+    int property = (int)prop;
+    char value[PROPERTY_VALUE_MAX] = {'\0'};
+
+    if (property == FMWAN_RATCONF) {
+        get_property(FM_PROP_WAN_RATCONF, value);
+    } else if (property == FMBTWLAN_LPFENABLER) {
+        get_property(FM_PROP_BTWLAN_LPFENABLER, value);
+    } else {
+        ALOGE("%s: invalid get property prop = %d\n", __func__, property);
+    }
+
+    ret = atoi(value);
+    ALOGI("%d:: ret  = %d",property, ret);
+    return ret;
+}
+
 static jint android_hardware_fmradio_FmReceiverJNI_enableSoftMuteNative
  (JNIEnv * env, jobject thiz, jint fd, jint val)
 {
@@ -1730,6 +1755,8 @@
              (void*) android_hardware_fmradio_FmReceiverJNI_getSocNameNative},
         {"getFmStatsPropNative", "()Z",
              (void*) android_hardware_fmradio_FmReceiverJNI_getFmStatsPropNative},
+        { "getFmCoexPropNative", "(II)I",
+            (void*)android_hardware_fmradio_FmReceiverJNI_getFmCoexPropNative},
 };
 
 int register_android_hardware_fm_fmradio(JNIEnv* env)

qcom/fmradio/FmReceiver.java

diff --git a/qcom/fmradio/FmReceiver.java b/qcom/fmradio/FmReceiver.java
index 39974d6..b7c1613 100644
--- a/qcom/fmradio/FmReceiver.java
+++ b/qcom/fmradio/FmReceiver.java
@@ -343,6 +343,13 @@
    private static final int SEARCH_MPXDCC = 0;
    private static final int SEARCH_SINR_INT = 1;
 
+   /**
+    * Fm Coex property type
+    */
+   private static final int WAN_RATCONF = 0;
+   private static final int BTWLAN_LPFENABLER = 1;
+
+
    public boolean isSmdTransportLayer() {
        String chip = getSocName();
        if (chip.equals("pronto"))
@@ -402,7 +409,7 @@
            if (WifiManager.WIFI_STATE_CHANGED_ACTION.equals(intent.getAction())) {
                int newState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
                        WifiManager.WIFI_STATE_UNKNOWN);
-               int mBtWlanLpf = SystemProperties.getInt("persist.btwlan.lpfenabler", 0);
+               int mBtWlanLpf = getFmWanWlanCoexProp(BTWLAN_LPFENABLER);
                if (newState == WifiManager.WIFI_STATE_ENABLED) {
                    Log.d (TAG, "enable LPF on wifi enabled " + newState);
                    if ((mBtWlanLpf & mIsWlanLpfEnabled) == mIsWlanLpfEnabled)
@@ -2955,7 +2962,7 @@
      return;
    }
    public void FMcontrolLowPassFilter(int state, int net_type, int enable) {
-       int RatConf = SystemProperties.getInt("persist.fm_wan.ratconf", 0);
+       int RatConf = getFmWanWlanCoexProp(WAN_RATCONF);
        Log.v (TAG, "FMcontrolLowPassFilter " + RatConf);
        switch (net_type)
        {
@@ -3096,4 +3103,8 @@
    public boolean getFmStatsProp() {
      return FmReceiverJNI.getFmStatsPropNative();
    }
+
+   public int getFmWanWlanCoexProp(int property) {
+     return FmReceiverJNI.getFmCoexPropNative(sFd, property);
+   }
 }

qcom/fmradio/FmReceiverJNI.java

diff --git a/qcom/fmradio/FmReceiverJNI.java b/qcom/fmradio/FmReceiverJNI.java
index 21a7e98..73f0d34 100644
--- a/qcom/fmradio/FmReceiverJNI.java
+++ b/qcom/fmradio/FmReceiverJNI.java
@@ -564,4 +564,5 @@
     static native int enableSoftMute(int fd, int val);
     static native String getSocNameNative();
     static native boolean getFmStatsPropNative();
+    static native int getFmCoexPropNative(int fd, int property);
 }