From 747711ce9b8d12d2454cbe3369741b8ab2979aa1 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Thu, 28 Jul 2016 05:21:36 -0700 Subject: [PATCH] Add LE Secure Connection data parsing (1/4) Bug: 30460956 Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37 --- api/current.txt | 4 ++++ api/system-current.txt | 4 ++++ core/java/android/bluetooth/OobData.java | 22 ++++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/api/current.txt b/api/current.txt index 514d32691b5cc..a219738ebf76a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6999,7 +6999,11 @@ package android.bluetooth { public class OobData implements android.os.Parcelable { ctor public OobData(); method public int describeContents(); + method public byte[] getLeSecureConnectionsConfirmation(); + method public byte[] getLeSecureConnectionsRandom(); method public byte[] getSecurityManagerTk(); + method public void setLeSecureConnectionsConfirmation(byte[]); + method public void setLeSecureConnectionsRandom(byte[]); method public void setSecurityManagerTk(byte[]); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; diff --git a/api/system-current.txt b/api/system-current.txt index d5427e0f61f16..9666f47da2588 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7220,7 +7220,11 @@ package android.bluetooth { public class OobData implements android.os.Parcelable { ctor public OobData(); method public int describeContents(); + method public byte[] getLeSecureConnectionsConfirmation(); + method public byte[] getLeSecureConnectionsRandom(); method public byte[] getSecurityManagerTk(); + method public void setLeSecureConnectionsConfirmation(byte[]); + method public void setLeSecureConnectionsRandom(byte[]); method public void setSecurityManagerTk(byte[]); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; diff --git a/core/java/android/bluetooth/OobData.java b/core/java/android/bluetooth/OobData.java index 01f72efb22ac4..53ca97417a629 100644 --- a/core/java/android/bluetooth/OobData.java +++ b/core/java/android/bluetooth/OobData.java @@ -26,6 +26,8 @@ import android.util.Log; */ public class OobData implements Parcelable { private byte[] securityManagerTk; + private byte[] leSecureConnectionsConfirmation; + private byte[] leSecureConnectionsRandom; public byte[] getSecurityManagerTk() { return securityManagerTk; @@ -35,10 +37,28 @@ public class OobData implements Parcelable { 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() { } private OobData(Parcel in) { securityManagerTk = in.createByteArray(); + leSecureConnectionsConfirmation = in.createByteArray(); + leSecureConnectionsRandom = in.createByteArray(); } public int describeContents() { @@ -48,6 +68,8 @@ public class OobData implements Parcelable { @Override public void writeToParcel(Parcel out, int flags) { out.writeByteArray(securityManagerTk); + out.writeByteArray(leSecureConnectionsConfirmation); + out.writeByteArray(leSecureConnectionsRandom); } public static final Parcelable.Creator CREATOR