summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jakub Pawlowski <jpawlowski@google.com> 2020-09-25 20:17:33 +0200
committer Jakub Pawlowski <jpawlowski@google.com> 2020-09-26 15:50:37 +0000
commit2c1d2c21cf5772d0b82124a580c8db8bafd0429a (patch)
treeb5bfda2ac089408396331275d7c7eb14cf7b2eda
parentf29902285a56562b8993a0cbce337bf4c895f406 (diff)
Make BluetoothGattCallback.onServiceChanged public
Bug: 154056389 Test: proper CTS test will be provided Change-Id: I2c9264910b65d62124c75c3ee3fd0b5bd18a2006
-rw-r--r--api/current.txt1
-rw-r--r--core/java/android/bluetooth/BluetoothGattCallback.java5
-rw-r--r--non-updatable-api/current.txt1
3 files changed, 5 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 167c2b4668af..d85e5cbcacfd 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -8771,6 +8771,7 @@ package android.bluetooth {
method public void onPhyUpdate(android.bluetooth.BluetoothGatt, int, int, int);
method public void onReadRemoteRssi(android.bluetooth.BluetoothGatt, int, int);
method public void onReliableWriteCompleted(android.bluetooth.BluetoothGatt, int);
+ method public void onServiceChanged(@NonNull android.bluetooth.BluetoothGatt);
method public void onServicesDiscovered(android.bluetooth.BluetoothGatt, int);
}
diff --git a/core/java/android/bluetooth/BluetoothGattCallback.java b/core/java/android/bluetooth/BluetoothGattCallback.java
index 9f6b8287e791..1c40cff076f6 100644
--- a/core/java/android/bluetooth/BluetoothGattCallback.java
+++ b/core/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) {
}
}
diff --git a/non-updatable-api/current.txt b/non-updatable-api/current.txt
index d6c74b1e24f6..ae336a211ce7 100644
--- a/non-updatable-api/current.txt
+++ b/non-updatable-api/current.txt
@@ -8771,6 +8771,7 @@ package android.bluetooth {
method public void onPhyUpdate(android.bluetooth.BluetoothGatt, int, int, int);
method public void onReadRemoteRssi(android.bluetooth.BluetoothGatt, int, int);
method public void onReliableWriteCompleted(android.bluetooth.BluetoothGatt, int);
+ method public void onServiceChanged(@NonNull android.bluetooth.BluetoothGatt);
method public void onServicesDiscovered(android.bluetooth.BluetoothGatt, int);
}