diff options
| author | Nick Pelly <npelly@google.com> | 2011-06-15 16:56:39 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-06-15 18:00:51 -0700 |
| commit | 2083287b83a587d8f6e9ad829ea18041dc17d842 (patch) | |
| tree | c882720be41fc1bd75356b7ca163cebb3c321a4a /jni | |
| parent | 7a89585090cbb4db53546a93e260b3d3d2ab6b35 (diff) | |
| parent | 8bda4f3eb1e87aa967caed38e21274c6deb40ee6 (diff) | |
| download | packages_apps_nfc-2083287b83a587d8f6e9ad829ea18041dc17d842.tar.gz packages_apps_nfc-2083287b83a587d8f6e9ad829ea18041dc17d842.tar.bz2 packages_apps_nfc-2083287b83a587d8f6e9ad829ea18041dc17d842.zip | |
resolved conflicts for merge of 8bda4f3e to master
Change-Id: I558cc850a3d799271c733807ca63a66487db2839
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/com_android_nfc_NativeNfcManager.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/jni/com_android_nfc_NativeNfcManager.cpp b/jni/com_android_nfc_NativeNfcManager.cpp index a6f130e..f239513 100644 --- a/jni/com_android_nfc_NativeNfcManager.cpp +++ b/jni/com_android_nfc_NativeNfcManager.cpp @@ -2325,6 +2325,11 @@ static jint com_android_nfc_NfcManager_doGetLastError(JNIEnv *e, jobject o) } } +static void com_android_nfc_NfcManager_doAbort(JNIEnv *e, jobject o) +{ + emergency_recovery(NULL); +} + /* * JNI registration. */ @@ -2377,6 +2382,9 @@ static JNINativeMethod gMethods[] = {"doResetTimeouts", "()V", (void *)com_android_nfc_NfcManager_doResetTimeouts}, + + {"doAbort", "()V", + (void *)com_android_nfc_NfcManager_doAbort}, }; |