From fa6a1bc755e592ca649e0428f0866289d91df1ea Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 1 Mar 2016 17:36:23 -0700 Subject: [PATCH] Sometimes to step forward, we need to go back. [2/2] Change-Id: Iccabb95530a6e3c3950cb9a8dfe84e75354d2f5f --- api/current.txt | 9 --------- api/system-current.txt | 9 --------- api/test-current.txt | 9 --------- core/java/android/bluetooth/OobData.java | 1 + 4 files changed, 1 insertion(+), 27 deletions(-) diff --git a/api/current.txt b/api/current.txt index d8d2ac0c4781e..014ae3591a284 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 CREATOR; - } - } package android.bluetooth.le { diff --git a/api/system-current.txt b/api/system-current.txt index 7ad5345f2c43f..fc252cef3b888 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 CREATOR; - } - } package android.bluetooth.le { diff --git a/api/test-current.txt b/api/test-current.txt index 968aaad4f178d..580af72ad57da 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 CREATOR; - } - } package android.bluetooth.le { diff --git a/core/java/android/bluetooth/OobData.java b/core/java/android/bluetooth/OobData.java index 01f72efb22ac4..70d47ee20b2ed 100644 --- a/core/java/android/bluetooth/OobData.java +++ b/core/java/android/bluetooth/OobData.java @@ -23,6 +23,7 @@ import android.util.Log; /** * Out Of Band Data for Bluetooth device. + * @hide */ public class OobData implements Parcelable { private byte[] securityManagerTk;