Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "OOB generateLocalOobData"

Browse Source
This commit is contained in:
Treehugger Robot
2021-04-15 20:00:44 +00:00
committed by Gerrit Code Review
parent 6b5e6bba9b 76a512f958
commit 3a4f319145
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -1502,6 +1502,8 @@ package android.bluetooth {
} }
public static interface BluetoothAdapter.OobDataCallback { 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 { public final class BluetoothDevice implements android.os.Parcelable {

4
core/java/android/bluetooth/BluetoothAdapter.java
View File

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