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

Commit ecc873d5 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Android (Google) Code Review
Browse files

Merge "Hide android.bluetooth.OobData" into nyc-dev

parents eca23784 b73ebc88
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -7332,15 +7332,6 @@ package android.bluetooth {
    field public static final int TYPE_SCO = 2; // 0x2
  }
  public final 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 {
+0 −9
Original line number Diff line number Diff line
@@ -7607,15 +7607,6 @@ package android.bluetooth {
    field public static final int TYPE_SCO = 2; // 0x2
  }
  public final 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 {
+0 −9
Original line number Diff line number Diff line
@@ -7336,15 +7336,6 @@ package android.bluetooth {
    field public static final int TYPE_SCO = 2; // 0x2
  }
  public final 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 {
+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.util.Log;

/**
 * Out Of Band Data for Bluetooth device.
 * @hide
 */
public final class OobData implements Parcelable {
    private byte[] securityManagerTk;