Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdadaa25 authored by Christopher Wiley's avatar Christopher Wiley Committed by android-build-merger
Browse files

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

am: d295e94d

* commit 'd295e94d':
  Map Errors.h's UNEXPECTED_NULL to NullPointerException
parents cf7021e8 d295e94d

core/jni/android_util_Binder.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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");