diff options
| author | Sylvain Fonteneau <sylvain.fonteneau@trusted-logic.com> | 2010-11-17 10:07:53 +0100 |
|---|---|---|
| committer | Sylvain Fonteneau <sylvain.fonteneau@trusted-logic.com> | 2010-11-22 09:16:05 +0100 |
| commit | e18f86dad5a54eb4ed1c347a8b832f3fb24ed3b7 (patch) | |
| tree | 3375e31126f549c2c3dc0c8c3cf021e3e16f2504 | |
| parent | 0bd11735e8a28db1692f28abcc3e065abae0e8dd (diff) | |
| download | packages_apps_nfc-e18f86dad5a54eb4ed1c347a8b832f3fb24ed3b7.zip packages_apps_nfc-e18f86dad5a54eb4ed1c347a8b832f3fb24ed3b7.tar.gz packages_apps_nfc-e18f86dad5a54eb4ed1c347a8b832f3fb24ed3b7.tar.bz2 | |
Removed dead code.
Change-Id: Ia543f55135701154d2c639639b2183bfa07c9fd9
| -rw-r--r-- | jni/com_android_nfc_NativeNfcManager.cpp | 15 | ||||
| -rwxr-xr-x | src/com/android/nfc/NativeNfcManager.java | 2 |
2 files changed, 0 insertions, 17 deletions
diff --git a/jni/com_android_nfc_NativeNfcManager.cpp b/jni/com_android_nfc_NativeNfcManager.cpp index 17a24ab..dfb8715 100644 --- a/jni/com_android_nfc_NativeNfcManager.cpp +++ b/jni/com_android_nfc_NativeNfcManager.cpp @@ -1614,18 +1614,6 @@ clean_and_return: CONCURRENCY_UNLOCK(); } - -static void com_android_nfc_NfcManager_doCancel(JNIEnv *e, jobject o) -{ - struct nfc_jni_native_data *nat; - - /* Retrieve native structure address */ - nat = nfc_jni_get_nat(e, o); - - nat->status = NFCSTATUS_FAILED; - sem_post(nfc_jni_open_sem); -} - /* Llcp methods */ static jboolean com_android_nfc_NfcManager_doCheckLlcp(JNIEnv *e, jobject o) @@ -2116,9 +2104,6 @@ static JNINativeMethod gMethods[] = {"doDeselectSecureElement", "(I)V", (void *)com_android_nfc_NfcManager_doDeselectSecureElement}, - {"doCancel", "()V", - (void *)com_android_nfc_NfcManager_doCancel}, - {"doCheckLlcp", "()Z", (void *)com_android_nfc_NfcManager_doCheckLlcp}, diff --git a/src/com/android/nfc/NativeNfcManager.java b/src/com/android/nfc/NativeNfcManager.java index a2b6d51..4230c51 100755 --- a/src/com/android/nfc/NativeNfcManager.java +++ b/src/com/android/nfc/NativeNfcManager.java @@ -80,8 +80,6 @@ public class NativeNfcManager { public native void doSetProperties(int param, int value); - public native void doCancel(); - public native NativeLlcpConnectionlessSocket doCreateLlcpConnectionlessSocket(int nSap); public native NativeLlcpServiceSocket doCreateLlcpServiceSocket(int nSap, String sn, int miu, |