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. [1/2]" into nyc-dev

Browse Source 
am: 888de830ed

* commit '888de830edd037118e9f3a864e5930f2c7defa3c':
  Sometimes to step forward, we need to go back. [1/2]
This commit is contained in:
Jeff Sharkey
2016-03-02 01:48:30 +00:00
committed by android-build-merger
parent 82036dbe65 888de830ed
commit 24f4adb70f
4 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/current.txt
View File

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

9
api/system-current.txt
View File

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

9
api/test-current.txt
View File

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

3
core/java/android/bluetooth/OobData.java
View File

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