summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Pawlowski <jpawlowski@google.com>2016-09-15 08:02:05 -0700
committerAndre Eisenbach <eisenbach@google.com>2016-09-16 17:33:49 +0000
commit5f98c2410fd68bbf06f5a33e75036e9b10b2145d (patch)
treefffdb1a22ff76099ffe1fd5bda72e9529c960c92
parentb4a5ec958fbea79dc4603b1f0a2497009bc59983 (diff)
downloadandroid-system-bt-5f98c2410fd68bbf06f5a33e75036e9b10b2145d.tar.gz
android-system-bt-5f98c2410fd68bbf06f5a33e75036e9b10b2145d.tar.xz
Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT
Cancelling discovery was not handled properly in btif_dm_search_services_evt and was causing crashes due to assert in default case. Bug: 31442085 Change-Id: If9a2c203730c9b06df5ff8d8e251f0c35addcb82 (cherry picked from commit 7df43240c4a7cf5ecd58a39f03d235bf52929d79)
-rw-r--r--btif/src/btif_dm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c
index 49fa274..f70e4fa 100644
--- a/btif/src/btif_dm.c
+++ b/btif/src/btif_dm.c
@@ -1554,6 +1554,10 @@ static void btif_dm_search_services_evt(UINT16 event, char *p_param)
/* fixme */
break;
+ case BTA_DM_SEARCH_CANCEL_CMPL_EVT:
+ /* no-op */
+ break;
+
#if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE))
case BTA_DM_DISC_BLE_RES_EVT:
BTIF_TRACE_DEBUG("%s:, services 0x%x)", __FUNCTION__,