From: Srinu Jella <sjella@codeaurora.org>
Date: Wed, 8 Oct 2014 11:06:43 +0000 (+0530)
Subject: Handle pairing timeout during remote name request
X-Git-Tag: android-x86-7.1-r1~370^2~157
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=05bb84c6;p=android-x86%2Fsystem-bt.git

Handle pairing timeout during remote name request

If a remote name request is in progress and a pairing timeout is
triggered, the host needs to post the bond failure to the UI and
needs to reset the pairing cb state, otherwise the UI will be stuck
in pairing mode and scanning won't work until Bluetooth is cycled
OFF->ON.

Change-Id: I76d9a83b1db7236db51617da998b5857b0de39f0
---

diff --git a/stack/btm/btm_sec.c b/stack/btm/btm_sec.c
index db2d30073..0b5efc923 100644
--- a/stack/btm/btm_sec.c
+++ b/stack/btm/btm_sec.c
@@ -5054,6 +5054,7 @@ static void btm_sec_pairing_timeout (TIMER_LIST_ENT *p_tle)
             break;
 
         case BTM_PAIR_STATE_WAIT_AUTH_COMPLETE:
+        case BTM_PAIR_STATE_GET_REM_NAME:
             /* We need to notify the UI that timeout has happened while waiting for authentication*/
             btm_sec_change_pairing_state (BTM_PAIR_STATE_IDLE);
             if (btm_cb.api.p_auth_complete_callback)