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

Commit 7ddcac5b authored by Charlie Boutier's avatar Charlie Boutier Committed by Automerger Merge Worker
Browse files

Merge "PandoraServer: Handle reject pairing on onPairing" am: 987b2ff9 

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



Change-Id: I919f735b6f0d79864835dccff5c0c7451043af07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d2a1c39 987b2ff9

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

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ class Security(private val context: Context) : SecurityImplBase(), Closeable { 
          )

          val device = answer.event.address.toBluetoothDevice(bluetoothAdapter)

          when (answer.answerCase!!) {

            PairingEventAnswer.AnswerCase.CONFIRM -> device.setPairingConfirmation(true)

            PairingEventAnswer.AnswerCase.CONFIRM -> device.setPairingConfirmation(answer.confirm)

            PairingEventAnswer.AnswerCase.PASSKEY ->

              device.setPin(answer.passkey.toString().padStart(6, '0'))

            PairingEventAnswer.AnswerCase.PIN -> device.setPin(answer.pin.toByteArray())