diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2020-09-26 17:10:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-26 17:10:25 +0000 |
| commit | 037f58171f27e9a2e27f7fda85c006bc48e2378b (patch) | |
| tree | dcf7e794c2585c650da9ced7d06c9242d8b5c104 | |
| parent | 73f1a8429732ec29d0b528c98bec928ad5ef4215 (diff) | |
| parent | d6ebf0078329d1e3499112fa3c1af120973eeed4 (diff) | |
Merge "Make BluetoothGattCallback.onServiceChanged public" am: fbe538a16e am: 48ae6eedee am: a1553754cb am: d6ebf00783
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1439193
Change-Id: Id9945a11865c9e4ae0155eccc19cbbdc90dd5d48
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothGattCallback.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothGattCallback.java b/framework/java/android/bluetooth/BluetoothGattCallback.java index 9f6b8287e7..1c40cff076 100644 --- a/framework/java/android/bluetooth/BluetoothGattCallback.java +++ b/framework/java/android/bluetooth/BluetoothGattCallback.java @@ -16,6 +16,8 @@ package android.bluetooth; +import android.annotation.NonNull; + /** * This abstract class is used to implement {@link BluetoothGatt} callbacks. */ @@ -203,8 +205,7 @@ public abstract class BluetoothGattCallback { * called to re-discover the services. * * @param gatt GATT client involved - * @hide */ - public void onServiceChanged(BluetoothGatt gatt) { + public void onServiceChanged(@NonNull BluetoothGatt gatt) { } } |