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

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

Change-Id: I65300ccfbc2cf3c7932243f36b19818520fa52a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/jni/android_net_LocalSocketImpl.cpp

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