diff options
| author | Martijn Coenen <maco@google.com> | 2012-07-25 11:32:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-25 11:32:20 -0700 |
| commit | 69369b773d2ea675aa5a18582c82e2ba65dc3a42 (patch) | |
| tree | 41a4d2cb4e0ea055bff787566dfcab2d5ad6c89c | |
| parent | afa30410182f83efbd12eeca1fb12413da573543 (diff) | |
| parent | 43f226312d34edc17a6319f7d61a06d20e1850e7 (diff) | |
| download | packages_apps_nfc-69369b773d2ea675aa5a18582c82e2ba65dc3a42.zip packages_apps_nfc-69369b773d2ea675aa5a18582c82e2ba65dc3a42.tar.gz packages_apps_nfc-69369b773d2ea675aa5a18582c82e2ba65dc3a42.tar.bz2 | |
am 43f22631: Fix type of collision resolution record.
* commit '43f226312d34edc17a6319f7d61a06d20e1850e7':
Fix type of collision resolution record.
| -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) { |