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

am: d295e94dad

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

1 files changed, 3 insertions, 0 deletions

diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp
index c139cd78b4c0..ae109c6566cb 100644
--- a/core/jni/android_util_Binder.cpp
+++ b/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");