summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/api/system-current.txt2
-rw-r--r--core/java/android/bluetooth/BluetoothAdapter.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 21cc1c337bf1..039c6b154c15 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 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);