From 8fcff25c4fc2c76a64edb9efc285f8eae1b4c270 Mon Sep 17 00:00:00 2001
From: Jakub Pawlowski <jpawlowski@google.com>
Date: Thu, 28 Jul 2016 05:21:36 -0700
Subject: [PATCH] Add LE Secure Connection data parsing (1/4)

Bug: 30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
(cherry picked from commit 747711ce9b8d12d2454cbe3369741b8ab2979aa1)
---
 core/java/android/bluetooth/OobData.java | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/core/java/android/bluetooth/OobData.java b/core/java/android/bluetooth/OobData.java
index 8e659e04d7053..f53ca94a1d5c5 100644
--- a/core/java/android/bluetooth/OobData.java
+++ b/core/java/android/bluetooth/OobData.java
@@ -31,6 +31,8 @@ import android.util.Log;
  */
 public class OobData implements Parcelable {
     private byte[] securityManagerTk;
+    private byte[] leSecureConnectionsConfirmation;
+    private byte[] leSecureConnectionsRandom;
 
     public byte[] getSecurityManagerTk() {
         return securityManagerTk;
@@ -45,10 +47,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() {
@@ -58,6 +78,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<OobData> CREATOR