From 9ad443f59c3aaff699fa094efa6855bdf28b7743 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 1 Mar 2016 17:28:36 -0700 Subject: [PATCH] Sometimes to step forward, we need to go back. [1/2] Change-Id: Ibff95298dc2e6c09675018ad0c45506589b6312a --- api/current.txt | 9 +++++++++ api/system-current.txt | 9 +++++++++ api/test-current.txt | 9 +++++++++ core/java/android/bluetooth/OobData.java | 3 +-- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 014ae3591a284..d8d2ac0c4781e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 CREATOR; + } + } package android.bluetooth.le { diff --git a/api/system-current.txt b/api/system-current.txt index fc252cef3b888..7ad5345f2c43f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 CREATOR; + } + } package android.bluetooth.le { diff --git a/api/test-current.txt b/api/test-current.txt index 580af72ad57da..968aaad4f178d 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 CREATOR; + } + } package android.bluetooth.le { diff --git a/core/java/android/bluetooth/OobData.java b/core/java/android/bluetooth/OobData.java index 71949381a4eb8..01f72efb22ac4 100644 --- a/core/java/android/bluetooth/OobData.java +++ b/core/java/android/bluetooth/OobData.java @@ -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() {