commit 43f226312d34edc17a6319f7d61a06d20e1850e7
author Martijn Coenen <maco@google.com> Mon Jul 23 09:44:37 2012 -0700
committer Martijn Coenen <maco@google.com> Wed Jul 25 09:09:41 2012 -0700
tree 387ae28327fc1567316592a6917f45d4d6171c60
parent 327d0e7c5a454b704bd37bae40cf20383d00cc63

Fix type of collision resolution record.

Bug: 6759842
Change-Id: I6d1e24472702007616c0be71aacda9e591a23620

src/com/android/nfc/handover/HandoverManager.java

diff --git a/src/com/android/nfc/handover/HandoverManager.java b/src/com/android/nfc/handover/HandoverManager.java
index 51b123c..f77f780 100644
--- a/src/com/android/nfc/handover/HandoverManager.java
+++ b/src/com/android/nfc/handover/HandoverManager.java
@@ -71,6 +71,8 @@
     static final byte[] TYPE_BT_OOB = "application/vnd.bluetooth.ep.oob".
             getBytes(Charset.forName("US_ASCII"));
 
+    static final byte[] RTD_COLLISION_RESOLUTION = {0x63, 0x72}; // "cr";
+
     static final String ACTION_BT_OPP_TRANSFER_PROGRESS =
             "android.btopp.intent.action.BT_OPP_TRANSFER_PROGRESS";
 
@@ -642,7 +644,7 @@
     static NdefRecord createCollisionRecord() {
         byte[] random = new byte[2];
         new Random().nextBytes(random);
-        return new NdefRecord(NdefRecord.TNF_WELL_KNOWN, NdefRecord.RTD_HANDOVER_REQUEST, null, random);
+        return new NdefRecord(NdefRecord.TNF_WELL_KNOWN, RTD_COLLISION_RESOLUTION, null, random);
     }
 
     NdefRecord createBluetoothAlternateCarrierRecord(boolean activating) {