commit a94fc5243721350787ad405a94a64eec5dc61f7c
author Christopher Wiley <wiley@google.com> Sun Nov 22 14:21:25 2015 -0800
committer Christopher Wiley <wiley@google.com> Sat Nov 28 14:25:35 2015 -0800
tree 1e11fbc4883708670517571d34bb86e5bb997769
parent 8e19803a6a10ac44ca59cf15a2ae1f2eedb13cf8

Map Errors.h's UNEXPECTED_NULL to NullPointerException

Many native services reject null references with this status_t.
Map it to an appropriate exception for Java Binder clients.

Bug: 25615695
Change-Id: I16a4f44da35839892fc4d332f95382f06485b2a7

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");