diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-13 23:35:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-13 23:35:22 +0000 |
| commit | 035a7b0235835e856f39623fc571668e2d6048da (patch) | |
| tree | c92382531acd72c7c8e03e3a8e2f7ab2c3d476d9 /core/jni/AndroidRuntime.cpp | |
| parent | aba61dc19d6f1566ba153746cabd63e689735418 (diff) | |
| parent | 0626ec58243c9dc7f4812a453ef9456b1f7ff1f4 (diff) | |
| download | frameworks_base-035a7b0235835e856f39623fc571668e2d6048da.zip frameworks_base-035a7b0235835e856f39623fc571668e2d6048da.tar.gz frameworks_base-035a7b0235835e856f39623fc571668e2d6048da.tar.bz2 | |
am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni"
* commit '0626ec58243c9dc7f4812a453ef9456b1f7ff1f4':
Frameworks/base: Wall Werror in core/jni
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 7dd5c57..73ea54d 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -191,12 +191,6 @@ extern int register_com_android_internal_util_VirtualRefBasePtr(JNIEnv *env); static AndroidRuntime* gCurRuntime = NULL; -static void doThrow(JNIEnv* env, const char* exc, const char* msg = NULL) -{ - if (jniThrowException(env, exc, msg) != 0) - assert(false); -} - /* * Code written in the Java Programming Language calls here from main(). */ @@ -1214,13 +1208,6 @@ static int register_jni_procs(const RegJNIRec array[], size_t count, JNIEnv* env return 0; } -static void register_jam_procs(const RegJAMProc array[], size_t count) -{ - for (size_t i = 0; i < count; i++) { - array[i](); - } -} - static const RegJNIRec gRegJNI[] = { REG_JNI(register_com_android_internal_os_RuntimeInit), REG_JNI(register_android_os_SystemClock), |