Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ecdf9b19: Merge "jni: liblog reading error API incorrect"

Browse Source 
* commit 'ecdf9b199ac9659c37c34c0b23084199acea80bf':
  jni: liblog reading error API incorrect
This commit is contained in:
Mark Salyzyn
2014-04-09 16:11:04 +00:00
committed by Android Git Automerger
parent b6ab8c17bd ecdf9b199a
commit 7a67c927e6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android_util_EventLog.cpp
View File

@@ -177,13 +177,13 @@ static void android_util_EventLog_readEvents(JNIEnv* env, jobject clazz UNUSED,
break; break;
} }
if (ret < 0) { if (ret < 0) {
if (errno == EINTR) { if (ret == -EINTR) {
continue; continue;
} }
if (errno == EINVAL) { if (ret == -EINVAL) {
jniThrowException(env, "java/io/IOException", "Event too short"); jniThrowException(env, "java/io/IOException", "Event too short");
} else if (errno != EAGAIN) { } else if (ret != -EAGAIN) {
jniThrowIOException(env, errno); // Will throw on return jniThrowIOException(env, -ret); // Will throw on return
} }
break; break;
} }