diff options
| author | Martin Brabham <optedoblivion@google.com> | 2021-04-29 20:56:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-29 20:56:21 +0000 |
| commit | cf7843a0f7eff5082cfe742566e92f9fc48e7086 (patch) | |
| tree | d6cfe37ea0bcc07e73d0cb18fd074b83c7909db1 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | e8638082e54ac9a290259bd00f8fbd8d81243378 (diff) | |
| parent | 08fa792031a529c1558250845e3d811ebcc0f6d0 (diff) | |
Merge changes from topic "bluetooth_oob_api" am: 2e67798711
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315
Change-Id: I5c7de78ec2e77a617daf90cdc45052865d03a037
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index 3802289dd6..63221c5d89 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -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); |