summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Martin Brabham <optedoblivion@google.com> 2021-04-14 11:45:35 -0700
committer Martin Brabham <optedoblivion@google.com> 2021-04-14 18:53:04 +0000
commitba2c904f8d2c6a0325e8764b9f6ab605d142ec74 (patch)
treee297e18c81acd3f46e340372f319c637b3d664a9
parent5a71c4f7fac83d6d5e332a5164fb8728f64c6ffb (diff)
OOB generateLocalOobData
unhide @SystemApi callback methods CTS-Coverage-Bug: 184395281 Bug: 178007935 Tag: #feature Test: compiles Change-Id: I2d4167a6c92ee0cc24da12df206838161c8f3318
-rw-r--r--core/api/system-current.txt2
-rw-r--r--core/java/android/bluetooth/BluetoothAdapter.java4
2 files changed, 2 insertions, 4 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index bd36d2c6ca8e..3c6a08d60506 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -1948,6 +1948,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 {
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
index 79fd8072f9f0..236185e2a28d 100644
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -3095,8 +3095,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);
@@ -3104,8 +3102,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);
}