commit b519aeca47a7b798926c00ce5c8cf730e26e75fd
author Mark Salyzyn <salyzyn@google.com> Tue Apr 08 15:21:50 2014 -0700
committer Mark Salyzyn <salyzyn@google.com> Tue Apr 08 16:17:51 2014 -0700
tree d665dd7d7f51e2011c54672e4a24ee64629b864a
parent 3fb2b7132b64c65163e7c6cd948e45f703e93687

jni: liblog reading error API incorrect

- return value contains -errno on error.

Bug: 13907124
Change-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5

core/jni/android_util_EventLog.cpp

diff --git a/core/jni/android_util_EventLog.cpp b/core/jni/android_util_EventLog.cpp
index 2593420..8a0eaa2 100644
--- a/core/jni/android_util_EventLog.cpp
+++ b/core/jni/android_util_EventLog.cpp
@@ -177,13 +177,13 @@
             break;
         }
         if (ret < 0) {
-            if (errno == EINTR) {
+            if (ret == -EINTR) {
                 continue;
             }
-            if (errno == EINVAL) {
+            if (ret == -EINVAL) {
                 jniThrowException(env, "java/io/IOException", "Event too short");
-            } else if (errno != EAGAIN) {
-                jniThrowIOException(env, errno);  // Will throw on return
+            } else if (ret != -EAGAIN) {
+                jniThrowIOException(env, -ret);  // Will throw on return
             }
             break;
         }