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

Merge "Add LE Secure Connection data parsing (1/4)"

Browse Source
This commit is contained in:
Jakub Pawlowski
2016-08-11 22:32:22 +00:00
committed by Gerrit Code Review
parent d0197ac340 747711ce9b
commit 5671277d2a
3 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -6999,7 +6999,11 @@ package android.bluetooth {
public class OobData implements android.os.Parcelable { public class OobData implements android.os.Parcelable {
ctor public OobData(); ctor public OobData();
method public int describeContents(); method public int describeContents();
method public byte[] getLeSecureConnectionsConfirmation();
method public byte[] getLeSecureConnectionsRandom();
method public byte[] getSecurityManagerTk(); method public byte[] getSecurityManagerTk();
method public void setLeSecureConnectionsConfirmation(byte[]);
method public void setLeSecureConnectionsRandom(byte[]);
method public void setSecurityManagerTk(byte[]); method public void setSecurityManagerTk(byte[]);
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.bluetooth.OobData> CREATOR; field public static final android.os.Parcelable.Creator<android.bluetooth.OobData> CREATOR;

4
api/system-current.txt
View File

@@ -7220,7 +7220,11 @@ package android.bluetooth {
public class OobData implements android.os.Parcelable { public class OobData implements android.os.Parcelable {
ctor public OobData(); ctor public OobData();
method public int describeContents(); method public int describeContents();
method public byte[] getLeSecureConnectionsConfirmation();
method public byte[] getLeSecureConnectionsRandom();
method public byte[] getSecurityManagerTk(); method public byte[] getSecurityManagerTk();
method public void setLeSecureConnectionsConfirmation(byte[]);
method public void setLeSecureConnectionsRandom(byte[]);
method public void setSecurityManagerTk(byte[]); method public void setSecurityManagerTk(byte[]);
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.bluetooth.OobData> CREATOR; field public static final android.os.Parcelable.Creator<android.bluetooth.OobData> CREATOR;

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

@@ -26,6 +26,8 @@ import android.util.Log;
*/ */
public class OobData implements Parcelable { public class OobData implements Parcelable {
private byte[] securityManagerTk; private byte[] securityManagerTk;
private byte[] leSecureConnectionsConfirmation;
private byte[] leSecureConnectionsRandom;
public byte[] getSecurityManagerTk() { public byte[] getSecurityManagerTk() {
return securityManagerTk; return securityManagerTk;
@@ -35,10 +37,28 @@ public class OobData implements Parcelable {
this.securityManagerTk = securityManagerTk; this.securityManagerTk = securityManagerTk;
} }
public byte[] getLeSecureConnectionsConfirmation() {
return leSecureConnectionsConfirmation;
}
public void setLeSecureConnectionsConfirmation(byte[] leSecureConnectionsConfirmation) {
this.leSecureConnectionsConfirmation = leSecureConnectionsConfirmation;
}
public byte[] getLeSecureConnectionsRandom() {
return leSecureConnectionsRandom;
}
public void setLeSecureConnectionsRandom(byte[] leSecureConnectionsRandom) {
this.leSecureConnectionsRandom = leSecureConnectionsRandom;
}
public OobData() { } public OobData() { }
private OobData(Parcel in) { private OobData(Parcel in) {
securityManagerTk = in.createByteArray(); securityManagerTk = in.createByteArray();
leSecureConnectionsConfirmation = in.createByteArray();
leSecureConnectionsRandom = in.createByteArray();
} }
public int describeContents() { public int describeContents() {
@@ -48,6 +68,8 @@ public class OobData implements Parcelable {
@Override @Override
public void writeToParcel(Parcel out, int flags) { public void writeToParcel(Parcel out, int flags) {
out.writeByteArray(securityManagerTk); out.writeByteArray(securityManagerTk);
out.writeByteArray(leSecureConnectionsConfirmation);
out.writeByteArray(leSecureConnectionsRandom);
} }
public static final Parcelable.Creator<OobData> CREATOR public static final Parcelable.Creator<OobData> CREATOR