Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecdf9b19 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge "jni: liblog reading error API incorrect"

parents a6f5e79d b519aeca

core/jni/android_util_EventLog.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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;

        }