Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException" am: 0ded0da517

am: 4ff2cc0898

* commit '4ff2cc0898891488dce3917d105f15264b7742ce':
  Map Errors.h's UNEXPECTED_NULL to NullPointerException

core/jni/android_util_Binder.cpp

@@ -711,6 +711,9 @@ void signalExceptionForError(JNIEnv* env, jobject obj, status_t err,
             jniThrowException(env, "java/lang/RuntimeException",
                     "Not allowed to write file descriptors here");
             break;
+        case UNEXPECTED_NULL:
+            jniThrowNullPointerException(env, NULL);
+            break;
         case -EBADF:
             jniThrowException(env, "java/lang/RuntimeException",
                     "Bad file descriptor");