drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of f4c3b7e9 to master

Browse Source 
Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
This commit is contained in:
Nick Pelly
2010-09-29 12:20:51 -07:00
parent 856f2859e8 f4c3b7e916
commit 4715bd91f5
44 changed files with 6762 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/jni/AndroidRuntime.cpp
View File

@ -170,6 +170,18 @@ extern int register_android_view_MotionEvent(JNIEnv* env);
extern int register_android_content_res_ObbScanner(JNIEnv* env);
extern int register_android_content_res_Configuration(JNIEnv* env);
#ifdef HAVE_NFC
extern int register_com_trustedlogic_trustednfc_android_internal_NativeNfcManager(JNIEnv *env);
extern int register_com_trustedlogic_trustednfc_android_internal_NativeNfcTag(JNIEnv *env);
extern int register_com_trustedlogic_trustednfc_android_internal_NativeNdefTag(JNIEnv *env);
extern int register_com_trustedlogic_trustednfc_android_NdefMessage(JNIEnv *env);
extern int register_com_trustedlogic_trustednfc_android_NdefRecord(JNIEnv *env);
extern int register_com_trustedlogic_trustednfc_android_internal_NativeP2pDevice(JNIEnv *env);
extern int register_com_trustedlogic_trustednfc_android_internal_NativeLlcpSocket(JNIEnv *env);
extern int register_com_trustedlogic_trustednfc_android_internal_NativeLlcpConnectionlessSocket(JNIEnv *env);
extern int register_com_trustedlogic_trustednfc_android_internal_NativeLlcpServiceSocket(JNIEnv *env);
#endif
static AndroidRuntime* gCurRuntime = NULL;
static void doThrow(JNIEnv* env, const char* exc, const char* msg = NULL)
@ -1287,6 +1299,18 @@ static const RegJNIRec gRegJNI[] = {
REG_JNI(register_android_content_res_ObbScanner),
REG_JNI(register_android_content_res_Configuration),
#ifdef HAVE_NFC
REG_JNI(register_com_trustedlogic_trustednfc_android_internal_NativeNfcManager),
REG_JNI(register_com_trustedlogic_trustednfc_android_internal_NativeNfcTag),
REG_JNI(register_com_trustedlogic_trustednfc_android_internal_NativeNdefTag),
REG_JNI(register_com_trustedlogic_trustednfc_android_NdefMessage),
REG_JNI(register_com_trustedlogic_trustednfc_android_NdefRecord),
REG_JNI(register_com_trustedlogic_trustednfc_android_internal_NativeP2pDevice),
REG_JNI(register_com_trustedlogic_trustednfc_android_internal_NativeLlcpSocket),
REG_JNI(register_com_trustedlogic_trustednfc_android_internal_NativeLlcpConnectionlessSocket),
REG_JNI(register_com_trustedlogic_trustednfc_android_internal_NativeLlcpServiceSocket),
#endif
};
/*