commit 2b4fe5f5fe3da819d21b2c0c3df09a370854c47b
author Martijn Coenen <maco@google.com> Wed Mar 27 21:49:55 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 27 21:49:55 2013 +0000
tree 6d685a736dd124cb4768b495e1ab820c47acff45
parent cbe27470ef7e67324b9e8cbc32c25088d82e2a86
parent 218b2ef897289d3e6fd7818c6883809149f62f08

Merge "Update JNI to work with latest stack drop." into jb-mr2-dev

src/com/android/nfc/P2pLinkManager.java

diff --git a/src/com/android/nfc/P2pLinkManager.java b/src/com/android/nfc/P2pLinkManager.java
index b25b41d..3915892 100755
--- a/src/com/android/nfc/P2pLinkManager.java
+++ b/src/com/android/nfc/P2pLinkManager.java
@@ -34,9 +34,11 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.Uri;
+import android.nfc.BeamShareData;
 import android.nfc.INdefPushCallback;
 import android.nfc.NdefMessage;
 import android.nfc.NdefRecord;
+import android.nfc.NfcAdapter;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Message;
@@ -191,6 +193,7 @@
     boolean mIsReceiveEnabled;
     NdefMessage mMessageToSend;  // not valid in SEND_STATE_NOTHING_TO_SEND
     Uri[] mUrisToSend;  // not valid in SEND_STATE_NOTHING_TO_SEND
+    int mSendFlags; // not valid in SEND_STATE_NOTHING_TO_SEND
     INdefPushCallback mCallbackNdef;
     String[] mValidCallbackPackages;
     SendTask mSendTask;
@@ -299,9 +302,13 @@
                         // Alternatively, we could have used WKS as a hint to start
                         // the animation, but we are only correctly setting the WKS
                         // since Jelly Bean.
-                        mSendState = SEND_STATE_NEED_CONFIRMATION;
-                        if (DBG) Log.d(TAG, "onP2pSendConfirmationRequested()");
-                        mEventListener.onP2pSendConfirmationRequested();
+                        if ((mSendFlags & NfcAdapter.FLAG_NDEF_PUSH_NO_CONFIRM) != 0) {
+                            mSendState = SEND_STATE_SENDING;
+                        } else {
+                            mSendState = SEND_STATE_NEED_CONFIRMATION;
+                            if (DBG) Log.d(TAG, "onP2pSendConfirmationRequested()");
+                            mEventListener.onP2pSendConfirmationRequested();
+                        }
                         connectLlcpServices();
                     }
                     break;
@@ -367,8 +374,10 @@
 
                 if (callbackValid) {
                     try {
-                        mMessageToSend = mCallbackNdef.createMessage();
-                        mUrisToSend = mCallbackNdef.getUris();
+                        BeamShareData shareData = mCallbackNdef.createBeamShareData();
+                        mMessageToSend = shareData.ndefMessage;
+                        mUrisToSend = shareData.uris;
+                        mSendFlags = shareData.flags;
                         return;
                     } catch (Exception e) {
                         Log.e(TAG, "Failed NDEF callback: " + e.getMessage());