OSDN Git Service

DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
authorMyles Watson <mylesgw@google.com>
Wed, 1 May 2019 18:32:19 +0000 (18:32 +0000)
committerMyles Watson <mylesgw@google.com>
Wed, 1 May 2019 18:32:19 +0000 (18:32 +0000)
commit6d9d811e1ad6f89275a3202f295028e920af5bb0
treea8be80d73a6e26ab5cfe6bf4b6951ac55022f2b1
parentdc14eb8ba01ee20dc44bcba7b3c0a17550e756fa
DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

This reverts commit dc14eb8ba01ee20dc44bcba7b3c0a17550e756fa.

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

Change-Id: I2c8bf4f6c41f87bd6b7b217486260da4a084e4bd
btif/src/btif_dm.cc