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

Commit 7bb23816 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't throw in socket_read if socket_read_all returns < 0" into tm-dev...

Merge "Don't throw in socket_read if socket_read_all returns < 0" into tm-dev am: d2a905d5 am: cb9d40ef

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



Change-Id: I471ff7d7d70f06d884cb1fee46d5fc569a0b367b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20108490 cb9d40ef
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;
    }