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

Commit 3317c6db authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 2cead908: am db723ea0: Merge "jni: Remove duplicated jniThrowException()" 

Merge commit '2cead908'

* commit '2cead908':
  jni: Remove duplicated jniThrowException()
parents 16f5d6ee 2cead908

core/jni/android_text_AndroidBidi.cpp

+1 −9
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


#define LOG_TAG "AndroidUnicode"



#include <jni.h>

#include "JNIHelp.h"

#include <android_runtime/AndroidRuntime.h>

#include "utils/misc.h"

#include "utils/Log.h"
@@ -25,14 +25,6 @@ 


namespace android {

    

static void jniThrowException(JNIEnv* env, const char* exc, const char* msg = NULL)

{

    jclass excClazz = env->FindClass(exc);

    LOG_ASSERT(excClazz, "Unable to find class %s", exc);



    env->ThrowNew(excClazz, msg);

}



static jint runBidi(JNIEnv* env, jobject obj, jint dir, jcharArray chsArray, 

                    jbyteArray infoArray, int n, jboolean haveInfo)

{

core/jni/android_text_AndroidCharacter.cpp

+1 −9
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


#define LOG_TAG "AndroidUnicode"



#include <jni.h>

#include "JNIHelp.h"

#include <android_runtime/AndroidRuntime.h>

#include "utils/misc.h"

#include "utils/Log.h"
@@ -50,14 +50,6 @@ static int directionality_map[U_CHAR_DIRECTION_COUNT] = { 


namespace android {

    

static void jniThrowException(JNIEnv* env, const char* exc, const char* msg = NULL)

{

    jclass excClazz = env->FindClass(exc);

    LOG_ASSERT(excClazz, "Unable to find class %s", exc);



    env->ThrowNew(excClazz, msg);

}



static void getDirectionalities(JNIEnv* env, jobject obj, jcharArray srcArray, jbyteArray destArray, int count)

{

    jchar* src = env->GetCharArrayElements(srcArray, NULL);