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

Merge changes from topic "bluetooth_oob_api" am: 2e67798711 am: 8411b5d7b3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315

Change-Id: I3158af61bd86f2be7f602510ee0ec30b0418b2f5
This commit is contained in:
Martin Brabham
2021-04-29 21:10:28 +00:00
committed by Automerger Merge Worker
parent 2d3dbcab8f 8411b5d7b3
commit 50e294ad9b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -3063,7 +3063,7 @@ 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)
*/
void onOobData(@Transport int transport, @Nullable OobData oobData);
void onOobData(@Transport int transport, @NonNull OobData oobData);
/**
* Provides feedback when things don't go as expected.
@@ -3104,7 +3104,7 @@ public final class BluetoothAdapter {
*
* @hide
*/
public void onOobData(@Transport int transport, OobData oobData) {
public void onOobData(@Transport int transport, @NonNull OobData oobData) {
mExecutor.execute(new Runnable() {
public void run() {
mCallback.onOobData(transport, oobData);