diff options
| author | Martijn Coenen <maco@google.com> | 2012-07-23 09:44:37 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2012-08-01 12:35:01 -0700 |
| commit | 25b0c5d26d58d7d0af200b315a840881001b544d (patch) | |
| tree | 31ff8bb14fcdc97100f8b5cb0c641661b979de3c /src | |
| parent | 721d01960285314178c9026f4cbca449a5f385a6 (diff) | |
| download | packages_apps_nfc-25b0c5d26d58d7d0af200b315a840881001b544d.zip packages_apps_nfc-25b0c5d26d58d7d0af200b315a840881001b544d.tar.gz packages_apps_nfc-25b0c5d26d58d7d0af200b315a840881001b544d.tar.bz2 | |
Fix type of collision resolution record. (DO NOT MERGE)
Bug: 6759842
Change-Id: I6d1e24472702007616c0be71aacda9e591a23620
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/nfc/handover/HandoverManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ public class HandoverManager implements BluetoothProfile.ServiceListener, 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 @@ public class HandoverManager implements BluetoothProfile.ServiceListener, 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) { |