Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41e6915d authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Merge "Make BluetoothGattCallback.onServiceChanged public" am: 80250373 am:... 

Merge "Make BluetoothGattCallback.onServiceChanged public" am: 80250373 am: 531993dc am: 23c923d1

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

Change-Id: Ie2a9777fbc9a4c5861e07748dfb7596bc547c931
parents 9a11a4c5 23c923d1

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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);

  }

























core/java/android/bluetooth/BluetoothGattCallback.java



+3
−2




























Original line number
Diff line number
Diff line








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















    }















}
























non-updatable-api/current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -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);















  }