Merge "OOB generateLocalOobData"

core/api/system-current.txt

@@ -1502,6 +1502,8 @@ package android.bluetooth {
   }
 
   public static interface BluetoothAdapter.OobDataCallback {
+    method public void onError(int);
+    method public void onOobData(int, @Nullable android.bluetooth.OobData);
   }
 
   public final class BluetoothDevice implements android.os.Parcelable {

core/java/android/bluetooth/BluetoothAdapter.java

@@ -3062,8 +3062,6 @@ public final class BluetoothAdapter {
          *
          * @param transport - whether the {@link OobData} is generated for LE or Classic.
          * @param oobData - data generated in the host stack(LE) or controller (Classic)
-         *
-         * @hide
          */
         void onOobData(@Transport int transport, @Nullable OobData oobData);
 
@@ -3071,8 +3069,6 @@ public final class BluetoothAdapter {
          * Provides feedback when things don't go as expected.
          *
          * @param errorCode - the code descibing the type of error that occurred.
-         *
-         * @hide
          */
         void onError(@OobError int errorCode);
     }