commit 9a67c9d55e573ea7c908b1863b568e2806697b41
author Mike Lockwood <lockwood@google.com> Tue Apr 03 10:34:41 2012 -0700
committer Mike Lockwood <lockwood@google.com> Tue Apr 03 10:34:41 2012 -0700
tree bf7fecad060ad8605de435c749d9949e77f7b15b
parent 79a0d9c410a2060744e044aec2536e29a4f5213c
parent 6d3fbd7737583f1344e58f3e742898207e283b55

Merge remote-tracking branch 'goog/ics-aah'

JNIHelp.cpp

diff --git a/JNIHelp.cpp b/JNIHelp.cpp
index e1ad6fc..7c0b146 100644
--- a/JNIHelp.cpp
+++ b/JNIHelp.cpp
@@ -68,16 +68,16 @@
 {
     JNIEnv* e = reinterpret_cast<JNIEnv*>(env);
 
-    LOGV("Registering %s natives", className);
+    ALOGV("Registering %s natives", className);
 
     scoped_local_ref<jclass> c(env, findClass(env, className));
     if (c.get() == NULL) {
-        LOGE("Native registration unable to find class '%s', aborting", className);
+        ALOGE("Native registration unable to find class '%s', aborting", className);
         abort();
     }
 
     if ((*env)->RegisterNatives(e, c.get(), gMethods, numMethods) < 0) {
-        LOGE("RegisterNatives failed for '%s', aborting", className);
+        ALOGE("RegisterNatives failed for '%s', aborting", className);
         abort();
     }
 
@@ -213,20 +213,20 @@
 
         if (exception.get() != NULL) {
             char* text = getExceptionSummary(env, exception.get());
-            LOGW("Discarding pending exception (%s) to throw %s", text, className);
+            ALOGW("Discarding pending exception (%s) to throw %s", text, className);
             free(text);
         }
     }
 
     scoped_local_ref<jclass> exceptionClass(env, findClass(env, className));
     if (exceptionClass.get() == NULL) {
-        LOGE("Unable to find exception class %s", className);
+        ALOGE("Unable to find exception class %s", className);
         /* ClassNotFoundException now pending */
         return -1;
     }
 
     if ((*env)->ThrowNew(e, exceptionClass.get(), msg) != JNI_OK) {
-        LOGE("Failed throwing '%s' '%s'", className, msg);
+        ALOGE("Failed throwing '%s' '%s'", className, msg);
         /* an exception, most likely OOM, will now be pending */
         return -1;
     }

include/nativehelper/JNIHelp.h

diff --git a/include/nativehelper/JNIHelp.h b/include/nativehelper/JNIHelp.h
index aa98c2c..f5666f2 100644
--- a/include/nativehelper/JNIHelp.h
+++ b/include/nativehelper/JNIHelp.h
@@ -167,7 +167,7 @@
  * from the JNI environment, if any.
  */
 #define LOG_EX(env, priority, tag, ...) \
-    IF_LOG(priority, tag) jniLogException(env, ANDROID_##priority, tag, ##__VA_ARGS__)
+    IF_ALOG(priority, tag) jniLogException(env, ANDROID_##priority, tag, ##__VA_ARGS__)
 #define LOGV_EX(env, ...) LOG_EX(env, LOG_VERBOSE, LOG_TAG, ##__VA_ARGS__)
 #define LOGD_EX(env, ...) LOG_EX(env, LOG_DEBUG, LOG_TAG, ##__VA_ARGS__)
 #define LOGI_EX(env, ...) LOG_EX(env, LOG_INFO, LOG_TAG, ##__VA_ARGS__)