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

Commit 888de830 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Sometimes to step forward, we need to go back. [1/2]" into nyc-dev

parents 5ae74b7f 9ad443f5

api/current.txt

+9 −0
Original line number Diff line number Diff line
@@ -7336,6 +7336,15 @@ package android.bluetooth { 
    field public static final int TYPE_SCO = 2; // 0x2

  }













  public class OobData implements android.os.Parcelable {













    ctor public OobData();













    method public int describeContents();













    method public byte[] getSecurityManagerTk();













    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;













  }



























}





























package android.bluetooth.le {

























api/system-current.txt



+9
−0




























Original line number
Diff line number
Diff line








@@ -7611,6 +7611,15 @@ package android.bluetooth {













    field public static final int TYPE_SCO = 2; // 0x2















  }



























  public class OobData implements android.os.Parcelable {













    ctor public OobData();













    method public int describeContents();













    method public byte[] getSecurityManagerTk();













    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;













  }



























}





























package android.bluetooth.le {

























api/test-current.txt



+9
−0




























Original line number
Diff line number
Diff line








@@ -7338,6 +7338,15 @@ package android.bluetooth {













    field public static final int TYPE_SCO = 2; // 0x2















  }



























  public class OobData implements android.os.Parcelable {













    ctor public OobData();













    method public int describeContents();













    method public byte[] getSecurityManagerTk();













    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;













  }



























}





























package android.bluetooth.le {

























core/java/android/bluetooth/OobData.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -23,9 +23,8 @@ import android.util.Log;





























/**















 * Out Of Band Data for Bluetooth device.













 * @hide















 */













public final class OobData implements Parcelable {













public class OobData implements Parcelable {















    private byte[] securityManagerTk;































    public byte[] getSecurityManagerTk() {