Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5671277d authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Gerrit Code Review
Browse files

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

parents d0197ac3 747711ce

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -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<android.bluetooth.OobData> CREATOR;

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -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<android.bluetooth.OobData> CREATOR;

core/java/android/bluetooth/OobData.java

+22 −0
Original line number Diff line number Diff line
@@ -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<OobData> CREATOR