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

Commit aabfb6c2 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Don't throw in socket_read if socket_read_all returns < 0." am:...

Merge "Don't throw in socket_read if socket_read_all returns < 0." am: 92891b4b am: 26daabe1 am: 6185215f am: 2d3c9e84 am: 3e1560c9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2096720



Change-Id: I771789301ae30f0bd90404f7f97b00496f54c279
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14a1d201 3e1560c9
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static jint socket_read (JNIEnv *env, jobject object, jobject fileDescriptor)
    err = socket_read_all(env, object, fd, &buf, 1);

    if (err < 0) {
        jniThrowIOException(env, errno);
        // socket_read_all has already thrown
        return (jint)0;
    }