AUPT: NCs in system_server caused runtime restart

b/22322272

Change-Id: If4eb9dd3fcefeef2ab26f991e8ee5dd8947a2837

2 files changed, 3 insertions, 15 deletions

diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index 5795d3561..6019f8543 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -1503,18 +1503,6 @@ static jobject android_net_wifi_get_tdls_capabilities(JNIEnv *env, jclass cls, j
 // ----------------------------------------------------------------------------
 // Debug framework
 // ----------------------------------------------------------------------------
-
-static void onRingBufferData(char * ring_name, char * buffer,
-int buffer_size, wifi_ring_buffer_status *status) {
-    JNIEnv *env = NULL;
-    mVM->AttachCurrentThread(&env, NULL);
-
-    ALOGD("onRingBufferData called, vm = %p, obj = %p, env = %p", mVM, mCls, env);
-
-    reportEvent(env, mCls, "onDataAvailable", "(I[Landroid/net/wifi/WiFiLogger$LogData;)V",
-        0, 0);
-}
-
 static jint android_net_wifi_get_supported_logger_feature(JNIEnv *env, jclass cls, jint iface){
     //Not implemented yet
     wifi_interface_handle handle = getIfaceHandle(env, cls, iface);
@@ -1686,10 +1674,10 @@ static void on_alert_data(wifi_request_id id, char *buffer, int buffer_size, int
         jbyteArray records = env->NewByteArray(buffer_size);
         jbyte *bytes = (jbyte *) buffer;
         env->SetByteArrayRegion(records, 0,buffer_size, bytes);
-        reportEvent(env, mCls,"onWifiAlert","([B;I)V", records, err_code);
+        reportEvent(env, mCls,"onWifiAlert","([BI)V", records, err_code);
         env->DeleteLocalRef(records);
     } else {
-        reportEvent(env, mCls,"onWifiAlert","([B;I)V", NULL, err_code);
+        reportEvent(env, mCls,"onWifiAlert","([BI)V", NULL, err_code);
     }
 }
 
diff --git a/service/jni/jni_helper.cpp b/service/jni/jni_helper.cpp
index 1463e4675..e3965137d 100644
--- a/service/jni/jni_helper.cpp
+++ b/service/jni/jni_helper.cpp
@@ -436,7 +436,7 @@ void reportEvent(JNIEnv *env, jclass cls, const char *method, const char *signat
     va_start(params, signature);
 
     jmethodID methodID = env->GetStaticMethodID(cls, method, signature);
-    if (method == NULL) {
+    if (methodID == NULL) {
         ALOGE("Error in getting method ID");
         return;
     }