Add some more jni compiler errors

Bug: 27360209
Change-Id: I01575f17a37e34aae9f158133bff9baed8fd8ab1

6 files changed, 11 insertions, 13 deletions

diff --git a/service/Android.mk b/service/Android.mk
index f516f8611..9f2366679 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -23,7 +23,8 @@ include $(CLEAR_VARS)
 
 LOCAL_REQUIRED_MODULES :=
 
-LOCAL_CFLAGS += -Wno-unused-parameter -Wall -Werror
+LOCAL_CFLAGS += -Wall -Werror -Wextra -Wno-unused-parameter -Wno-unused-function \
+                -Wunused-variable -Winit-self -Wwrite-strings -Wshadow
 
 LOCAL_C_INCLUDES += \
 	external/libnl-headers \
@@ -43,7 +44,8 @@ include $(CLEAR_VARS)
 
 LOCAL_REQUIRED_MODULES :=
 
-LOCAL_CFLAGS += -Wno-unused-parameter -Wall -Werror
+LOCAL_CFLAGS += -Wall -Werror -Wextra -Wno-unused-parameter -Wno-unused-function \
+                -Wunused-variable -Winit-self -Wwrite-strings -Wshadow
 
 LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/jni \
@@ -80,8 +82,8 @@ include $(CLEAR_VARS)
 
 LOCAL_REQUIRED_MODULES := libhardware_legacy
 
-LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter -Wno-unused-function \
-                -Wno-unused-variable
+LOCAL_CFLAGS += -Wall -Werror -Wextra -Wno-unused-parameter -Wno-unused-function \
+                -Wunused-variable -Winit-self -Wwrite-strings -Wshadow
 
 LOCAL_C_INCLUDES += \
 	$(JNI_H_INCLUDE) \
diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index 6b4448990..add0d17fe 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -166,7 +166,6 @@ static JavaVM *mVM;                             /* saved JVM pointer */
 
 static const char *WifiHandleVarName = "sWifiHalHandle";
 static const char *WifiIfaceHandleVarName = "sWifiIfaceHandles";
-static jmethodID OnScanResultsMethodID;
 
 wifi_handle getWifiHandle(JNIHelper &helper, jclass cls) {
     return (wifi_handle) helper.getStaticLongField(cls, WifiHandleVarName);
@@ -1544,8 +1543,6 @@ static jobject android_net_wifi_get_tdls_capabilities(JNIEnv *env, jclass cls, j
 // ----------------------------------------------------------------------------
 static jint android_net_wifi_get_supported_logger_feature(JNIEnv *env, jclass cls, jint iface){
     //Not implemented yet
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
     return -1;
 }
 
diff --git a/service/jni/com_android_server_wifi_nan_WifiNanNative.cpp b/service/jni/com_android_server_wifi_nan_WifiNanNative.cpp
index 7efc356a3..cae441a0c 100644
--- a/service/jni/com_android_server_wifi_nan_WifiNanNative.cpp
+++ b/service/jni/com_android_server_wifi_nan_WifiNanNative.cpp
@@ -33,8 +33,6 @@
 
 namespace android {
 
-static jint DBG = true;
-
 static jclass mCls;                             /* saved WifiNanNative object */
 static JavaVM *mVM = NULL;                      /* saved JVM pointer */
 
diff --git a/service/lib/wifi_hal_stub.cpp b/service/lib/wifi_hal_stub.cpp
index bb09fac9e..c934c6127 100644
--- a/service/lib/wifi_hal_stub.cpp
+++ b/service/lib/wifi_hal_stub.cpp
@@ -42,7 +42,7 @@ wifi_error wifi_get_concurrency_matrix_stub(wifi_interface_handle handle, int ma
     return WIFI_ERROR_UNINITIALIZED;
 }
 
-wifi_error wifi_set_scanning_mac_oui_stub(wifi_interface_handle handle, unsigned char *oui) {
+wifi_error wifi_set_scanning_mac_oui_stub(wifi_interface_handle handle, unsigned char *oui_data) {
     return WIFI_ERROR_UNINITIALIZED;
 }
 
diff --git a/tests/wifitests/Android.mk b/tests/wifitests/Android.mk
index eeefe6d8b..32ae15938 100644
--- a/tests/wifitests/Android.mk
+++ b/tests/wifitests/Android.mk
@@ -21,7 +21,8 @@ include $(CLEAR_VARS)
 
 LOCAL_REQUIRED_MODULES :=
 
-LOCAL_CFLAGS += -Wno-unused-parameter -Wall -Werror
+LOCAL_CFLAGS += -Wall -Werror -Wextra -Wno-unused-parameter -Wno-unused-function \
+                -Wunused-variable -Winit-self -Wwrite-strings -Wshadow
 
 LOCAL_C_INCLUDES += \
 	$(JNI_H_INCLUDE) \
diff --git a/tests/wifitests/jni/wifi_hal_mock.cpp b/tests/wifitests/jni/wifi_hal_mock.cpp
index 36b0bd39f..06b2d23f5 100644
--- a/tests/wifitests/jni/wifi_hal_mock.cpp
+++ b/tests/wifitests/jni/wifi_hal_mock.cpp
@@ -170,8 +170,8 @@ void HalMockJsonReader::get_byte_array(const char* key, bool* error, u8* array,
 }
 
 
-int init_wifi_hal_func_table_mock(wifi_hal_fn *hal_fn) {
-  if (hal_fn == NULL) {
+int init_wifi_hal_func_table_mock(wifi_hal_fn *fn) {
+  if (fn == NULL) {
     return -1;
   }