Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "OobData documentation" into nyc-dev

Browse Source 
am: 75760e6

* commit '75760e6b62e46fc9abcde523878459b08558f9d1':
  OobData documentation

Change-Id: I60f7b59f5a7ebeeb1d3c3c522da8e85e7673aab5
This commit is contained in:
Jakub Pawlowski
2016-04-20 03:20:12 +00:00
committed by android-build-merger
parent a0ac7a13be 75760e6b62
commit a08c14d05c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/bluetooth/OobData.java
View File

@@ -22,7 +22,11 @@ import android.os.Parcelable;
import android.util.Log; import android.util.Log;
/** /**
* Out Of Band Data for Bluetooth device. * Out Of Band Data for Bluetooth device pairing.
*
* <p>This object represents optional data obtained from a remote device through
* an out-of-band channel (eg. NFC).
*
* @hide * @hide
*/ */
public class OobData implements Parcelable { public class OobData implements Parcelable {
@@ -32,6 +36,11 @@ public class OobData implements Parcelable {
return securityManagerTk; return securityManagerTk;
} }
/**
* Sets the Temporary Key value to be used by the LE Security Manager during
* LE pairing. The value shall be 16 bytes. Please see Bluetooth CSSv6,
* Part A 1.8 for a detailed description.
*/
public void setSecurityManagerTk(byte[] securityManagerTk) { public void setSecurityManagerTk(byte[] securityManagerTk) {
this.securityManagerTk = securityManagerTk; this.securityManagerTk = securityManagerTk;
} }