diff options
| author | Martin Brabham <optedoblivion@google.com> | 2021-04-29 21:10:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-29 21:10:28 +0000 |
| commit | 79578466f42bfa06e6da3431d15e819a660d7505 (patch) | |
| tree | d6cfe37ea0bcc07e73d0cb18fd074b83c7909db1 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | e5564193cf81ffe29409dcfa2c1c0dd4118d285c (diff) | |
| parent | cf7843a0f7eff5082cfe742566e92f9fc48e7086 (diff) | |
Merge changes from topic "bluetooth_oob_api" am: 2e67798711 am: cf7843a0f7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315
Change-Id: I3158af61bd86f2be7f602510ee0ec30b0418b2f5
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); |