From b0d691b3a1c007249fc1fa56134ce3e645dcf93b Mon Sep 17 00:00:00 2001 From: Martin Brabham Date: Mon, 26 Apr 2021 15:23:45 -0700 Subject: [PATCH] Convert onOobData parameter for OobData from @Nullable to @NonNull Bug: 185603183 Test: Compiles, test app works Tag: #feature Change-Id: I52636769f50f50b5ad2d135f54472bdeb1c25ee5 --- core/api/system-current.txt | 2 +- core/java/android/bluetooth/BluetoothAdapter.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 21cc1c337bf15..039c6b154c15f 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -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 { diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 3802289dd6d64..63221c5d89410 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);