diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-19 14:42:52 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-10-19 14:42:52 -0700 |
| commit | db723ea0f70392f712542edb1114fc15e782cdb7 (patch) | |
| tree | 290806765a3d5b81649933ffe6a60e2db8060a59 | |
| parent | fdb39feedd34087c9a5c7492ca31a38ec46bc2ed (diff) | |
| parent | 1fc4d880909362127af9873dbacae1d00eb39d8b (diff) | |
| download | frameworks_base-db723ea0f70392f712542edb1114fc15e782cdb7.zip frameworks_base-db723ea0f70392f712542edb1114fc15e782cdb7.tar.gz frameworks_base-db723ea0f70392f712542edb1114fc15e782cdb7.tar.bz2 | |
Merge "jni: Remove duplicated jniThrowException()"
| -rw-r--r-- | core/jni/android_text_AndroidBidi.cpp | 10 | ||||
| -rw-r--r-- | core/jni/android_text_AndroidCharacter.cpp | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/core/jni/android_text_AndroidBidi.cpp b/core/jni/android_text_AndroidBidi.cpp index 7696bb3..53028c3 100644 --- a/core/jni/android_text_AndroidBidi.cpp +++ b/core/jni/android_text_AndroidBidi.cpp @@ -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) { diff --git a/core/jni/android_text_AndroidCharacter.cpp b/core/jni/android_text_AndroidCharacter.cpp index 5d8d419..6b90541 100644 --- a/core/jni/android_text_AndroidCharacter.cpp +++ b/core/jni/android_text_AndroidCharacter.cpp @@ -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); |