summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nick Pelly <npelly@google.com> 2010-10-13 10:18:58 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-13 10:18:58 -0700
commit67fc4af9765d15c4e011c8127f9c06dfd0368bbe (patch)
tree030dbcb510bbbd6f3980198c56e7e746ced81327
parenta127c07c42b8961881f460eb8e6a6b722139e3b9 (diff)
parent527d8bbd79c1ff2b6e24d19fe9e7a1ecdb72891a (diff)
am 527d8bbd: Merge "Add missing native methods to fix boot." into gingerbread
Merge commit '527d8bbd79c1ff2b6e24d19fe9e7a1ecdb72891a' into gingerbread-plus-aosp * commit '527d8bbd79c1ff2b6e24d19fe9e7a1ecdb72891a': Add missing native methods to fix boot.
-rw-r--r--core/java/com/trustedlogic/trustednfc/android/internal/NativeNfcManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/com/trustedlogic/trustednfc/android/internal/NativeNfcManager.java b/core/java/com/trustedlogic/trustednfc/android/internal/NativeNfcManager.java
index 4632794662dd..5ff348a92ef4 100644
--- a/core/java/com/trustedlogic/trustednfc/android/internal/NativeNfcManager.java
+++ b/core/java/com/trustedlogic/trustednfc/android/internal/NativeNfcManager.java
@@ -96,6 +96,10 @@ public class NativeNfcManager {
*/
public native void enableDiscovery(int mode);
+ public native void disableDiscovery();
+
+ public native void readerDiscovery();
+
/**
* Disables an NFCManager mode of operation. Allows to disable tag reader,
* peer to peer initiator or target modes.