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 | 50e294ad9bea01f6a8f8231d7f43a9546a3f7d0f (patch) | |
| tree | 81a0b2cb8f4cb7c5bd99403f2e71b236c15056c8 /core/java | |
| parent | 2d3dbcab8fb3620fd24bc76002a27821b2754770 (diff) | |
| parent | 8411b5d7b3d898080fc2c5c2287db481fbfda5d6 (diff) | |
Merge changes from topic "bluetooth_oob_api" am: 2e67798711 am: 8411b5d7b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315
Change-Id: I3158af61bd86f2be7f602510ee0ec30b0418b2f5
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 3802289dd6d6..63221c5d8941 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/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); |