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

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

Browse Source 
am: 85f2ded23e

* commit '85f2ded23e0e77678f606dfa3ea4536d71c6edd2':
  Sometimes to step forward, we need to go back. [2/2]
This commit is contained in:
Jeff Sharkey
2016-03-02 01:50:25 +00:00
committed by android-build-merger
parent 24f4adb70f 85f2ded23e
commit d6a632bd2e
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

@@ -7336,15 +7336,6 @@ 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 {

9
api/system-current.txt
View File

@@ -7611,15 +7611,6 @@ 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 {

9
api/test-current.txt
View File

@@ -7338,15 +7338,6 @@ 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 {

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 class OobData implements Parcelable {
private byte[] securityManagerTk;