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

Merge "Remove unused JNITest class"

Browse Source
This commit is contained in:
Narayan Kamath
2014-02-21 15:02:30 +00:00
committed by Gerrit Code Review
parent 22c6663909 42f06b0e22
commit 4a642ee5e6
4 changed files with 0 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
core/java/android/debug/JNITest.java
View File

@@ -1,48 +0,0 @@
/*
* Copyright (C) 2006 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.debug;
/**
* Simple JNI verification test.
*/
public class JNITest {
public JNITest() {
}
public int test(int intArg, double doubleArg, String stringArg) {
int[] intArray = { 42, 53, 65, 127 };
return part1(intArg, doubleArg, stringArg, intArray);
}
private native int part1(int intArg, double doubleArg, String stringArg,
int[] arrayArg);
private int part2(double doubleArg, int fromArray, String stringArg) {
int result;
System.out.println(stringArg + " : " + (float) doubleArg + " : " +
fromArray);
result = part3(stringArg);
return result + 6;
}
private static native int part3(String stringArg);
}

1
core/jni/Android.mk
View File

@@ -134,7 +134,6 @@ LOCAL_SRC_FILES:= \
android_hardware_UsbDevice.cpp \
android_hardware_UsbDeviceConnection.cpp \
android_hardware_UsbRequest.cpp \
android_debug_JNITest.cpp \
android_util_FileObserver.cpp \
android/opengl/poly_clip.cpp.arm \
android/opengl/util.cpp.arm \

2
core/jni/AndroidRuntime.cpp
View File

@@ -131,7 +131,6 @@ extern int register_android_database_CursorWindow(JNIEnv* env);
extern int register_android_database_SQLiteConnection(JNIEnv* env);
extern int register_android_database_SQLiteGlobal(JNIEnv* env);
extern int register_android_database_SQLiteDebug(JNIEnv* env);
extern int register_android_debug_JNITest(JNIEnv* env);
extern int register_android_nio_utils(JNIEnv* env);
extern int register_android_text_format_Time(JNIEnv* env);
extern int register_android_os_Debug(JNIEnv* env);
@@ -1093,7 +1092,6 @@ static void register_jam_procs(const RegJAMProc array[], size_t count)
}
static const RegJNIRec gRegJNI[] = {
REG_JNI(register_android_debug_JNITest),
REG_JNI(register_com_android_internal_os_RuntimeInit),
REG_JNI(register_android_os_SystemClock),
REG_JNI(register_android_util_EventLog),

119
core/jni/android_debug_JNITest.cpp
View File

@@ -1,119 +0,0 @@
/* //device/libs/android_runtime/android_debug_JNITest.cpp
**
** Copyright 2006, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
#define LOG_TAG "DebugJNI"
#include "jni.h"
#include "nativehelper/JNIHelp.h"
#include "utils/Log.h"
#include "utils/misc.h"
//#include "android_runtime/AndroidRuntime.h"
namespace android {
/*
* Implements:
* native int part1(int intArg, double doubleArg, String stringArg,
* int[] arrayArg)
*/
static jint android_debug_JNITest_part1(JNIEnv* env, jobject object,
jint intArg, jdouble doubleArg, jstring stringArg, jobjectArray arrayArg)
{
jclass clazz;
jmethodID part2id;
jsize arrayLen;
jint arrayVal;
int result = -2;
ALOGI("JNI test: in part1, intArg=%d, doubleArg=%.3f\n", intArg, doubleArg);
/* find "int part2(double doubleArg, int fromArray, String stringArg)" */
clazz = env->GetObjectClass(object);
part2id = env->GetMethodID(clazz,
"part2", "(DILjava/lang/String;)I");
if (part2id == NULL) {
ALOGE("JNI test: unable to find part2\n");
return -1;
}
/* get the length of the array */
arrayLen = env->GetArrayLength(arrayArg);
ALOGI(" array size is %d\n", arrayLen);
/*
* Get the last element in the array.
* Use the Get<type>ArrayElements functions instead if you need access
* to multiple elements.
*/
arrayVal = (int) env->GetObjectArrayElement(arrayArg, arrayLen-1);
ALOGI(" array val is %d\n", arrayVal);
/* call this->part2 */
result = env->CallIntMethod(object, part2id,
doubleArg, arrayVal, stringArg);
return result;
}
/*
* Implements:
* private static native int part3(String stringArg);
*/
static jint android_debug_JNITest_part3(JNIEnv* env, jclass clazz,
jstring stringArg)
{
const char* utfChars;
jboolean isCopy;
ALOGI("JNI test: in part3\n");
utfChars = env->GetStringUTFChars(stringArg, &isCopy);
ALOGI(" String is '%s', isCopy=%d\n", (const char*) utfChars, isCopy);
env->ReleaseStringUTFChars(stringArg, utfChars);
return 2000;
}
/*
* JNI registration.
*/
static JNINativeMethod gMethods[] = {
/* name, signature, funcPtr */
{ "part1", "(IDLjava/lang/String;[I)I",
(void*) android_debug_JNITest_part1 },
{ "part3", "(Ljava/lang/String;)I",
(void*) android_debug_JNITest_part3 },
};
int register_android_debug_JNITest(JNIEnv* env)
{
return jniRegisterNativeMethods(env, "android/debug/JNITest",
gMethods, NELEM(gMethods));
}
#if 0
/* trampoline into C++ */
extern "C"
int register_android_debug_JNITest_C(JNIEnv* env)
{
return android::register_android_debug_JNITest(env);
}
#endif
}; // namespace android