commit 883056f1be85471b1093aea6c54c24946a40bd69
author CNSS_WLAN Service <cnssbldsw@qualcomm.com> Fri Mar 09 05:28:30 2018 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Mar 09 05:28:30 2018 -0800
tree efbb22f0a84a6fd9950fa87835932649ff8f864a
parent ee6c260c2b80b46f6862eb0556e0eef679ca2bc2
parent d38c1651c581bd1e97575849540ee648a7354800

Merge "FM: synchronization for FM_TX path - if que is not empty don't wait - added more logs in tx path" into fm.lnx.2.9.1

jni/Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 32382e8..1a8326d 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -20,7 +20,8 @@
         liblog \
         libcutils
 
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
+LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
+                   $(TOP)/libnativehelper/include/nativehelper
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
 LOCAL_MODULE := libqcomfm_jni

jni/android_hardware_fm.cpp

diff --git a/jni/android_hardware_fm.cpp b/jni/android_hardware_fm.cpp
index 5cb7318..628559c 100644
--- a/jni/android_hardware_fm.cpp
+++ b/jni/android_hardware_fm.cpp
@@ -128,7 +128,7 @@
 static bool mCallbacksObjCreated = false;
 static jfieldID sCallbacksField;
 
-jclass javaClassRef;
+static jclass javaClassRef;
 static jmethodID method_psInfoCallback;
 static jmethodID method_rtCallback;
 static jmethodID method_ertCallback;