Commit 6185215f authored May 16, 2022 by Lorenzo Colitti Committed by Automerger Merge Worker May 16, 2022

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

core/jni/android_net_LocalSocketImpl.cpp

+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;
		}