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

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

Browse Source 
Merge commit 'db723ea0f70392f712542edb1114fc15e782cdb7' into gingerbread-plus-aosp

* commit 'db723ea0f70392f712542edb1114fc15e782cdb7':
  jni: Remove duplicated jniThrowException()
This commit is contained in:
Jean-Baptiste Queru
2010-10-19 15:22:13 -07:00
committed by Android Git Automerger
parent aefcdde4bd db723ea0f7
commit 2cead908f4
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/jni/android_text_AndroidBidi.cpp
View File

@@ -17,7 +17,7 @@
#define LOG_TAG "AndroidUnicode" #define LOG_TAG "AndroidUnicode"
#include <jni.h> #include "JNIHelp.h"
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
#include "utils/misc.h" #include "utils/misc.h"
#include "utils/Log.h" #include "utils/Log.h"
@@ -25,14 +25,6 @@
namespace android { 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, static jint runBidi(JNIEnv* env, jobject obj, jint dir, jcharArray chsArray,
jbyteArray infoArray, int n, jboolean haveInfo) jbyteArray infoArray, int n, jboolean haveInfo)
{ {

10
core/jni/android_text_AndroidCharacter.cpp
View File

@@ -17,7 +17,7 @@
#define LOG_TAG "AndroidUnicode" #define LOG_TAG "AndroidUnicode"
#include <jni.h> #include "JNIHelp.h"
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
#include "utils/misc.h" #include "utils/misc.h"
#include "utils/Log.h" #include "utils/Log.h"
@@ -50,14 +50,6 @@ static int directionality_map[U_CHAR_DIRECTION_COUNT] = {
namespace android { 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) static void getDirectionalities(JNIEnv* env, jobject obj, jcharArray srcArray, jbyteArray destArray, int count)
{ {
jchar* src = env->GetCharArrayElements(srcArray, NULL); jchar* src = env->GetCharArrayElements(srcArray, NULL);