diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-09 16:11:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-09 16:11:04 +0000 |
| commit | 7a67c927e622bb176b21455b8ed56c76b8e0f602 (patch) | |
| tree | 0376bce8a5e19989c47a0587d889493f74e56441 | |
| parent | b6ab8c17bd0163bf07ff3dbe03ab352d58b61cb3 (diff) | |
| parent | ecdf9b199ac9659c37c34c0b23084199acea80bf (diff) | |
| download | frameworks_base-7a67c927e622bb176b21455b8ed56c76b8e0f602.zip frameworks_base-7a67c927e622bb176b21455b8ed56c76b8e0f602.tar.gz frameworks_base-7a67c927e622bb176b21455b8ed56c76b8e0f602.tar.bz2 | |
am ecdf9b19: Merge "jni: liblog reading error API incorrect"
* commit 'ecdf9b199ac9659c37c34c0b23084199acea80bf':
jni: liblog reading error API incorrect
| -rw-r--r-- | core/jni/android_util_EventLog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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 @@ static void android_util_EventLog_readEvents(JNIEnv* env, jobject clazz UNUSED, 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; } |