OSDN Git Service

Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
authorMyles Watson <mylesgw@google.com>
Wed, 1 May 2019 18:31:36 +0000 (18:31 +0000)
committerMyles Watson <mylesgw@google.com>
Wed, 1 May 2019 22:40:22 +0000 (22:40 +0000)
commitcd7bdf4cc37c420623d0bd3fe137f35e21b28104
tree24e95511bb1f6bc1ee6f438803f38d7b926853a0
parent09894418589479875443037c45e596824da90928
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

This reverts commit 09894418589479875443037c45e596824da90928.

Bug: 79703832
Bug: 130553855
Reason for revert: Regression with cross-key pairing

Change-Id: Idb732736c250a8ed375cce4f7b27669542ea70e2
Merged-In: If8652936eb3b24b3d1b3fded0be200bb986b70e3
btif/src/btif_dm.cc