Merge "Don't throw in socket_read if socket_read_all returns < 0" into tm-dev (d2a905d5) · Commits · e / os / android_frameworks_base

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