commit 85f2ded23e0e77678f606dfa3ea4536d71c6edd2
author Jeff Sharkey <jsharkey@google.com> Wed Mar 02 00:38:39 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 02 00:38:41 2016 +0000
tree 4457547077c5881408a94c6cd2b1c6ea5a5a3e20
parent 888de830edd037118e9f3a864e5930f2c7defa3c
parent fa6a1bc755e592ca649e0428f0866289d91df1ea

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

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index d8d2ac0..014ae35 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -7336,15 +7336,6 @@
     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 {

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 7ad5345..fc252ce 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -7611,15 +7611,6 @@
     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 {

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 968aaad..580af72 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -7338,15 +7338,6 @@
     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 {

core/java/android/bluetooth/OobData.java

diff --git a/core/java/android/bluetooth/OobData.java b/core/java/android/bluetooth/OobData.java
index 01f72ef..70d47ee 100644
--- a/core/java/android/bluetooth/OobData.java
+++ b/core/java/android/bluetooth/OobData.java
@@ -23,6 +23,7 @@
 
 /**
  * Out Of Band Data for Bluetooth device.
+ * @hide
  */
 public class OobData implements Parcelable {
     private byte[] securityManagerTk;