Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make BluetoothGattCallback.onServiceChanged public" am: 802503736d am: 531993dca1 am: 23c923d197 am: 41e6915dcd am: d69656a0b7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1439193

Change-Id: If481ce4165216b93c0c78ed070c757e9fc632d91
This commit is contained in:
Jakub Pawlowski
2020-09-27 07:35:49 +00:00
committed by Automerger Merge Worker
parent 79385e9039 d69656a0b7
commit da0e253c5b
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -8783,6 +8783,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);
}

5
core/java/android/bluetooth/BluetoothGattCallback.java
View File

@@ -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) {
}
}

1
non-updatable-api/current.txt
View File

@@ -8783,6 +8783,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);
}