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

Commit 039e79a2 authored by Sorin Basca's avatar Sorin Basca
Browse files

Using jniThrowErrnoException in android_os_SharedMemory 

Since libnativehelper now has an implementation of jniThrowErrnoException,
this method is now used when a system error occurs to avoid code
duplication.

Bug: 180958753
Test: m
Change-Id: I65d9b58d2cb2d94af97f77a15264137b0c7d0462
parent 719f9314

core/jni/android_os_SharedMemory.cpp

+1 −16
Original line number Diff line number Diff line
@@ -35,21 +35,6 @@ namespace { 
jclass errnoExceptionClass;

jmethodID errnoExceptionCtor;  // MethodID for ErrnoException.<init>(String,I)



void throwErrnoException(JNIEnv* env, const char* functionName, int error) {

    ScopedLocalRef<jstring> detailMessage(env, env->NewStringUTF(functionName));

    if (detailMessage.get() == NULL) {

        // Not really much we can do here. We're probably dead in the water,

        // but let's try to stumble on...

        env->ExceptionClear();

    }



    jobject exception = env->NewObject(errnoExceptionClass,

                                       errnoExceptionCtor,

                                       detailMessage.get(),

                                       error);

    env->Throw(reinterpret_cast<jthrowable>(exception));

}



jobject SharedMemory_nCreate(JNIEnv* env, jobject, jstring jname, jint size) {



    // Name is optional so we can't use ScopedUtfChars for this as it throws NPE on null
@@ -65,7 +50,7 @@ jobject SharedMemory_nCreate(JNIEnv* env, jobject, jstring jname, jint size) { 
    }



    if (fd < 0) {

        throwErrnoException(env, "SharedMemory_create", err);

        jniThrowErrnoException(env, "SharedMemory_create", err);

        return nullptr;

    }