Sometimes to step forward, we need to go back. [1/2]

Change-Id: Ibff95298dc2e6c09675018ad0c45506589b6312a

diff --git a/api/current.txt b/api/current.txt
index 014ae35..d8d2ac0 100644 (file)
--- 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<android.bluetooth.OobData> CREATOR;
+  }
+
 }
 
 package android.bluetooth.le {

diff --git a/api/system-current.txt b/api/system-current.txt
index fc252ce..7ad5345 100644 (file)
--- 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<android.bluetooth.OobData> CREATOR;
+  }
+
 }
 
 package android.bluetooth.le {

diff --git a/api/test-current.txt b/api/test-current.txt
index 580af72..968aaad 100644 (file)
--- 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<android.bluetooth.OobData> CREATOR;
+  }
+
 }
 
 package android.bluetooth.le {

diff --git a/core/java/android/bluetooth/OobData.java b/core/java/android/bluetooth/OobData.java
index 7194938..01f72ef 100644 (file)
--- 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() {