Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 4ff2cc0898

* commit '4ff2cc0898891488dce3917d105f15264b7742ce':
  Map Errors.h's UNEXPECTED_NULL to NullPointerException
This commit is contained in:
Christopher Wiley
2015-12-03 17:54:08 +00:00
committed by android-build-merger
parent a9c2218940 4ff2cc0898
commit d295e94dad
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android_util_Binder.cpp
View File

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