diff options
| author | Martin Brabham <optedoblivion@google.com> | 2021-04-29 21:33:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-29 21:33:10 +0000 |
| commit | 308948fd95f2611dd6d448d1103d44c3f70823d5 (patch) | |
| tree | 77ceeb4826ae482776b26b59ef937ac804f6eecb /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | bcd8df9bf39d969ebf230e7ca012d6cc88b29d8b (diff) | |
| parent | 79578466f42bfa06e6da3431d15e819a660d7505 (diff) | |
Merge changes from topic "bluetooth_oob_api" am: 2e67798711 am: cf7843a0f7 am: 79578466f4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315
Change-Id: I00dc7f393edb9b562c97147d053302159c12fcdb
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 8afc557ef8..1a1f1eb32f 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -3276,7 +3276,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. @@ -3317,7 +3317,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); |