commit fdadaa25eb602ae4ee6fa8e51146fe2296f91cb3
author Christopher Wiley <wiley@google.com> Thu Dec 03 19:28:38 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 03 19:28:38 2015 +0000
tree 6da0e25086337286eef03f4a67087882be7d3db6
parent cf7021e827dde0047bd36d32b734893e98d988fe
parent d295e94dade5123354761c5f2577913799b5b2c5

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

core/jni/android_util_Binder.cpp

diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp
index c139cd7..ae109c6 100644
--- a/core/jni/android_util_Binder.cpp
+++ b/core/jni/android_util_Binder.cpp
@@ -711,6 +711,9 @@
             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");