Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: ecc873d5ee

* commit 'ecc873d5ee8730833fe261e03b8b058c343d71db':
  Hide android.bluetooth.OobData
This commit is contained in:
Jakub Pawlowski
2016-03-01 22:30:25 +00:00
committed by android-build-merger
parent 39f8659d24 ecc873d5ee
commit 9a622515b7
4 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/current.txt
View File

@@ -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 {

9
api/system-current.txt
View File

@@ -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 {

9
api/test-current.txt
View File

@@ -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
core/java/android/bluetooth/OobData.java
View File

@@ -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;