summaryrefslogtreecommitdiff
path: root/core/java/android/nfc/NfcAdapter.java
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2014-07-01 15:52:19 -0700
committerMartijn Coenen <maco@google.com>2014-07-01 23:01:04 +0000
commitdbedb4cc0f6c64705c16396bdd34445dd8191cad (patch)
treec95b5bd45825f447d489cfb662faf9f628cd566d /core/java/android/nfc/NfcAdapter.java
parentcc32bd83e4d420c1adaeb3ea40f8986471e54590 (diff)
Add new IPC for direct Beam invoke.
Used by BeamShareActivity when Beam is invoked through the share menu. Also made these IPCs one-way as they can run asynchronously. Bug: 15939863 Change-Id: I7d048947c96c697e6b04bbda2ec3fbf28cccc29b
Diffstat (limited to 'core/java/android/nfc/NfcAdapter.java')
-rw-r--r--core/java/android/nfc/NfcAdapter.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java
index be098a8ae392..b0397d5a6981 100644
--- a/core/java/android/nfc/NfcAdapter.java
+++ b/core/java/android/nfc/NfcAdapter.java
@@ -29,6 +29,7 @@ import android.content.IntentFilter;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.net.Uri;
+import android.nfc.BeamShareData;
import android.nfc.tech.MifareClassic;
import android.nfc.tech.Ndef;
import android.nfc.tech.NfcA;
@@ -1274,6 +1275,21 @@ public final class NfcAdapter {
}
/**
+ * @hide
+ */
+ public boolean invokeBeam(BeamShareData shareData) {
+ try {
+ Log.e(TAG, "invokeBeamInternal()");
+ sService.invokeBeamInternal(shareData);
+ return true;
+ } catch (RemoteException e) {
+ Log.e(TAG, "invokeBeam: NFC process has died.");
+ attemptDeadServiceRecovery(e);
+ return false;
+ }
+ }
+
+ /**
* Enable NDEF message push over NFC while this Activity is in the foreground.
*
* <p>You must explicitly call this method every time the activity is