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

Commit 8849aa7f authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "[Pandora] Fix GATT server test that don't need data." am: bf3a2032... 

Merge "[Pandora] Fix GATT server test that don't need data." am: bf3a2032 am: 4f9b6b66 am: 57f19ad7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2243621



Change-Id: I8d999c5722e86d0772e3d5c5078948940129ab6e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 01bfdbdf 57f19ad7

android/pandora/server/src/com/android/pandora/GattServerManager.kt

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ class GattServerManager( 
  val callback =

    object : BluetoothGattServerCallback() {

      override fun onServiceAdded(status: Int, service: BluetoothGattService) {

        Log.i(TAG, "onServiceAdded")

        Log.i(TAG, "onServiceAdded status=$status")

        check(status == BluetoothGatt.GATT_SUCCESS)

        check(newServiceFlow.tryEmit(service))

      }
@@ -68,7 +68,7 @@ class GattServerManager( 
            ByteArray(negociatedMtu)

          )

        } else {

          server.sendResponse(device, requestId, BluetoothGatt.GATT_SUCCESS, offset, ByteArray(512))

          server.sendResponse(device, requestId, BluetoothGatt.GATT_SUCCESS, offset, ByteArray(0))

        }

      }