OSDN Git Service
Matthew Xie [Wed, 14 Aug 2013 07:33:46 +0000 (07:33 +0000)]
Merge "LE: Do not generate an error if a device is already whitelisted" into klp-dev
Matthew Xie [Wed, 14 Aug 2013 07:33:20 +0000 (07:33 +0000)]
Merge "LE: Fix for back-to-back GATT connection request issues" into klp-dev
Matthew Xie [Wed, 14 Aug 2013 07:32:50 +0000 (07:32 +0000)]
Merge "LE: Memory leak when caching GATT service change" into klp-dev
Matthew Xie [Wed, 14 Aug 2013 07:32:25 +0000 (07:32 +0000)]
Merge "LE: Check encryption state before starting encryption" into klp-dev
Matthew Xie [Wed, 14 Aug 2013 07:30:41 +0000 (07:30 +0000)]
Merge "LE: Add instance ID to descriptors (2/4)" into klp-dev
Andre Eisenbach [Mon, 22 Jul 2013 05:55:20 +0000 (22:55 -0700)]
LE: Do not generate an error if a device is already whitelisted
If a device is added to the whitelist that is already listed, no error
should be generated.
Change-Id: I81ad47eec47157d5ab2b5b25db3ed15bf873794e
Andre Eisenbach [Tue, 23 Jul 2013 22:57:27 +0000 (15:57 -0700)]
LE: Fix for back-to-back GATT connection request issues
When two GATT client connections were sent back to back, the first
connection will not be processed due to an address comparison error.
This patch corrects the error.
Change-Id: I8eb97cd2a34a81da460f448dc71445b2898a5d32
Andre Eisenbach [Tue, 23 Jul 2013 00:42:18 +0000 (17:42 -0700)]
LE: Memory leak when caching GATT service change
When a GATT connection is disconnected, a bonded device will be added
into service change pending list. But if the device is already in the
list, a duplicate record will be added and one buffer is lost.
This change ensures that devices are only added if they are not already
in the list.
Change-Id: Ied6872b145ed28bde8044444cb6c9cbee525943d
Andre Eisenbach [Fri, 12 Jul 2013 19:49:33 +0000 (12:49 -0700)]
LE: Check encryption state before starting encryption
Previously, the btif layer kept track of when a link was encrypted using
an internal list to track encryptino callbacks. This change switches to
querying the stack for the actual encryption state, since the btif layer
may not receive all encryption related callbacks.
Bug: BLTH02382147
Change-Id: I426b87d77e9a18531c2d42733a7e736a73bb116f
Matthew Xie [Wed, 14 Aug 2013 03:05:34 +0000 (20:05 -0700)]
Move bta_dm_remove_sec_dev_entry declaration out of BLE ifdef
The method applies to non-BLE cases.
Change-Id: I57508d09015e4ec4a74edf2d1fbc607fd692b402
Andre Eisenbach [Tue, 9 Jul 2013 07:01:49 +0000 (00:01 -0700)]
LE: Add instance ID to descriptors (2/4)
If a remote devices offers multiple descriptors with the same UUID, the
instance ID is used to differentiate between them.
Change-Id: I1f3c284d714719fe9fb9cbb297c70a061c62a96d
Andre Eisenbach [Mon, 5 Aug 2013 23:55:38 +0000 (16:55 -0700)]
LE: UPF 45 bug fixes
This change fixes the following issues:
- Second GATT-over-BR/EDR channel cannot be established when there
already is an existing GATT-over-BR/EDR channel
- If encryption fails for an LE connection due to a missing key,
the security state is not being cleared and blocks all further
security processing
- When DM discovery of an LE Peripheral device fails with a
connection timeout, no further discovery requests can be made
- GATT service discovery can get into endless loop when duplicate descriptor
definitions are found on the remote device
- When GATT over BR/EDR fails, BTA does not give a connection
callback to the application initiating the connection
- BR/EDR connection to remote platform does not generate API callbacks
- Stack crash discovered during UPF after remote disconnects
- The host is sending HCI disconnect to invalid HCI handle when
SMP fails because of a connection timeout
- Possible race condition:
If a disconnect is immediately followed by a connection complete,
the connection complete cannot be processed in the BTA GATT state
machine
- Write Complete event is not triggered for Prepare Write requests
Change-Id: I539cdedd68007818ff4f0d0213cee1c913f72d0f
Conflicts:
bta/gatt/bta_gatts_act.c
Andre Eisenbach [Tue, 2 Jul 2013 21:47:03 +0000 (14:47 -0700)]
LE: Add NULL check for GATT client callback
Change-Id: I1087102d8a740969fb0a98b409b58230a3236aeb
Andre Eisenbach [Mon, 24 Jun 2013 20:19:13 +0000 (13:19 -0700)]
LE: Fix crash on LE mouse reconnect
Sometimes, a GKI exception may be observed when re-connecting to an LE
mouse. This patch properly handles the encryption state change, avoiding
a possible race condition leading to the exception.
Change-Id: I4cf139c1ac22e71b598272fccebf645cd73fdf6a
Andre Eisenbach [Fri, 14 Jun 2013 20:22:25 +0000 (13:22 -0700)]
LE: Limit minimum MTU size
Check requested MTU sizes to ensure a minimum MTU size. Otherwise remote
devices may request an MTU that's too small, preventing any further
communication with the remote device.
Change-Id: I3ba97cf6e6c464825778a8c8902f99f6662c3762
Andre Eisenbach [Tue, 11 Jun 2013 21:18:21 +0000 (14:18 -0700)]
LE: Send correct device name during SMP pairing
During SMP pairing the device name is not properly copied to the upper
Java layers, causing a potentially wrong device name to be displayed to
the user.
Change-Id: Iab43871defc7df52b0cd9c64f52208879abb50f2
Andre Eisenbach [Tue, 28 May 2013 06:11:43 +0000 (15:11 +0900)]
LE: Integrate power table for GATT
No power table exists for GATT, causing the device to never enter sniff
mode while using GATT over BR/EDR.
Change-Id: I0db539c1814a61af620f3dba560da64481291beb
Andre Eisenbach [Wed, 15 May 2013 11:55:08 +0000 (04:55 -0700)]
LE: Add GATT disable functions
This patch adds required disable functions to the GATT sub-system to
properly unregister with the stack. Without the disable functions in
place, turning Bluetooth off with a GATT device connected may lead to
unexpected behaviour and cause GATT to fail on sub-sequent stack
restarts.
Change-Id: I7cb80e96109e2c09882991298d0487b506f5ffdd
Andre Eisenbach [Wed, 29 May 2013 17:21:39 +0000 (10:21 -0700)]
LE: Fix GKI exception for 0 length values
When a remote device responds to a read request with a 0 length value, a
GKI exception will occur. This patch checks for 0 length values to avoid
the exception and return the correct status to the application
requesting the read.
Change-Id: Idce61c3d2be7072dafe429ab978763b0ee61aed2
Andre Eisenbach [Fri, 24 May 2013 05:53:51 +0000 (14:53 +0900)]
LE: Only copy UUID for callback on success
When a GATT client application registers with the stack, the UUID is
always copied into the callback buffer, even if the registration failed.
This patch adds a check to make sure an invalid UUID is not passed back
to the application.
Change-Id: I53ddc7939c096a33a64b00a8902bedba00b61e7d
Andre Eisenbach [Fri, 17 May 2013 20:39:51 +0000 (13:39 -0700)]
LE: Add NULL pointer check in deep copy function
Adds a NULL pointer check for the GATT read event deep copy function.
Change-Id: Ia8d31e851589612009e1038c11b7b113e5367c6d
Andre Eisenbach [Tue, 14 May 2013 04:26:30 +0000 (13:26 +0900)]
LE: Initialize return status when registering client
Initialize status to BTA_GATT_NO_RESOURCES. If cl_rcb is full, the
wrong status could be returned to the client.
Change-Id: I45d147242c9f24c7636671ffca2f9429c175b8cf
Andre Eisenbach [Wed, 17 Apr 2013 10:10:33 +0000 (19:10 +0900)]
LE: Deep copy buffers when transfering client context
Certain BTA client event types require a deep copy of the request
data buffers when transfering context. Shallow copy of the pointers
involved may cause a crash when overlapping read and write requests
are received.
Change-Id: Id59b034d7fdd28087695a0688caff66b4cef4a4d
zzy [Sat, 10 Aug 2013 00:52:52 +0000 (17:52 -0700)]
Fixed issue that failed to update rfc credit to peer when host can not handle the incoming packets fast enough
Bug
10233699: Bluetooth sockets block indefinitely on read(...)
Matthew Xie [Fri, 19 Jul 2013 00:37:04 +0000 (17:37 -0700)]
Bluetooth MAP profile - sms and mms support initial check-in
bug:
10116530
Change-Id: I3bff487fdc0ee1256afa8d704a2cfa788081208c
Andre Eisenbach [Mon, 5 Aug 2013 16:19:16 +0000 (09:19 -0700)]
Support for 128-bit UUID service discovery
Support the discovery of custom 128-bit UUIDs. This is mainly needed for
GATT service discovery to find custom services.
Bug:
10116729
Change-Id: I8669111dfb8806f5632b7ea8ad02f0e38dded66f
Ajay Dudani [Sat, 27 Jul 2013 16:11:08 +0000 (09:11 -0700)]
Fix check for BTIF_HL_CCH_OP_MDEP_FILTERING in btif_hl_upstreams_evt
Change-Id: If080fad6ba4b42944dc5ee8bf1d8f0586dbd05f8
Zhihai Xu [Fri, 26 Jul 2013 18:32:18 +0000 (18:32 +0000)]
Merge "Add debug menu to enable btsnoop"
The Android Open Source Project [Mon, 1 Jul 2013 14:47:46 +0000 (07:47 -0700)]
am
4a5fc696: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
4a5fc6964313a606abd89268b8a53036b14b4ad7':
The Android Open Source Project [Mon, 1 Jul 2013 14:42:42 +0000 (07:42 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib88a72e7473f38fd079a12658875dec71352c19a
The Android Automerger [Sun, 30 Jun 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Andre Eisenbach [Fri, 28 Jun 2013 21:47:45 +0000 (14:47 -0700)]
am
2e1880d4: am
98657a36: LE: Release transmit buffer credits
* commit '
2e1880d46eeb8fe1a53ac9e387a07ac802491ad7':
LE: Release transmit buffer credits
Andre Eisenbach [Fri, 28 Jun 2013 21:46:29 +0000 (14:46 -0700)]
am
98657a36: LE: Release transmit buffer credits
* commit '
98657a365c7230b84a005c63ce5bcf036d69f6eb':
LE: Release transmit buffer credits
Andre Eisenbach [Tue, 25 Jun 2013 23:44:56 +0000 (16:44 -0700)]
LE: Release transmit buffer credits
When an ACL link goes down, some controllers do not send a "number of
completed packets" update for the last ACL packets sent from the host to
the controller. This could result in incorrect L2CAP transmit window
calculations and no transmit credit to be available to send data to the
controller.
This patch restores transmit buffer creedits regardless of the
controller behaviour.
bug
9474159
Change-Id: I2540131034271a0269fa50698f370bceb7747e2d
The Android Open Source Project [Wed, 26 Jun 2013 19:34:20 +0000 (12:34 -0700)]
am
2f6542da: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
2f6542daa3362e99bf0d09777b3c9913cb0fd85c':
The Android Open Source Project [Wed, 26 Jun 2013 19:33:30 +0000 (12:33 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I6e7a1cf99db622b61d2e35c1bc27eece9ec9dcc7
The Android Automerger [Wed, 26 Jun 2013 19:17:08 +0000 (12:17 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Wed, 26 Jun 2013 00:02:17 +0000 (17:02 -0700)]
am
72912851: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
72912851ec38b96570ab60d19c175db1c73d53b5':
Do not abort bonding if link disconnects during SDP after Auth cmplt
Ganesh Ganapathi Batta [Wed, 26 Jun 2013 00:01:57 +0000 (17:01 -0700)]
am
29a69a11: am
ec7e2c8e: Do not abort bonding if link disconnects during SDP after Auth cmplt
* commit '
29a69a1144fc42d3742bacb9acee89a612cbf8b3':
Do not abort bonding if link disconnects during SDP after Auth cmplt
The Android Open Source Project [Tue, 25 Jun 2013 23:11:45 +0000 (16:11 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I3582cf75047d93865faeb93e56a8dd10c6f83f8e
Ganesh Ganapathi Batta [Thu, 20 Jun 2013 18:00:28 +0000 (11:00 -0700)]
Do not abort bonding if link disconnects during SDP after Auth cmplt
If ACL link gets dropped during service search after bonding,
re-attempt service search instead of setting bond state to BOND_NONE
Bug
8611134
Change-Id: I77672d9f4feab634b3795a41e0d4e58903b5d275
Ganesh Ganapathi Batta [Tue, 25 Jun 2013 21:54:32 +0000 (14:54 -0700)]
am
ec7e2c8e: Do not abort bonding if link disconnects during SDP after Auth cmplt
* commit '
ec7e2c8e06396101c6b26187995db7c105ed3c3f':
Do not abort bonding if link disconnects during SDP after Auth cmplt
Ganesh Ganapathi Batta [Thu, 20 Jun 2013 18:00:28 +0000 (11:00 -0700)]
Do not abort bonding if link disconnects during SDP after Auth cmplt
If ACL link gets dropped during service search after bonding,
re-attempt service search instead of setting bond state to BOND_NONE
Bug
8611134
Change-Id: I77672d9f4feab634b3795a41e0d4e58903b5d275
Ganesh Ganapathi Batta [Thu, 16 May 2013 00:58:35 +0000 (17:58 -0700)]
Removed COD check for unbond and UNPAIRED_EVT
PC supporting HID Device would not have Peripheral as
its MAJOR COD. So COD check for major peripheral device was removed
in case of UNBOND and while receiving UNPAIRED_EVT. Additonal checking
is done when virtual unplug evt is received to remove bonding only for
HID Devic with MAJOR COD as Peripheral or if its a locally initiated
VUP.
Change-Id: I5343919463e48babc9cd03e05ff92a3f93f6d26d
Zhihai Xu [Wed, 5 Jun 2013 01:21:25 +0000 (18:21 -0700)]
Add debug menu to enable btsnoop
bug:
8059358
Change-Id: I232f6d47e7fb7e9c4d71c119394fce3e72cd02fc
The Android Open Source Project [Thu, 30 May 2013 21:24:15 +0000 (14:24 -0700)]
am
ebfa4720: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
ebfa47201fcac5d4f5772ac49bef186f8fc27f89':
The Android Open Source Project [Thu, 30 May 2013 14:31:27 +0000 (07:31 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ib7391931437918b090222401b2ef7c3c26f0b667
The Android Automerger [Thu, 30 May 2013 12:55:24 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Kausik Sinnaswamy [Wed, 29 May 2013 22:56:58 +0000 (15:56 -0700)]
am
67f5817f: am
77d1cb6f: Fix for AV lockup on local and remote start collision
* commit '
67f5817f1526faa64d3720c2c3d471117c520de8':
Fix for AV lockup on local and remote start collision
Kausik Sinnaswamy [Wed, 29 May 2013 22:56:04 +0000 (15:56 -0700)]
am
77d1cb6f: Fix for AV lockup on local and remote start collision
* commit '
77d1cb6ff904b48ee85c09a06c5e05dd0ed049b9':
Fix for AV lockup on local and remote start collision
Kausik Sinnaswamy [Wed, 22 May 2013 10:48:31 +0000 (16:18 +0530)]
Fix for AV lockup on local and remote start collision
Bug:
7002859
Change-Id: I6170be864b44011b98e08d7e2599021a3eec70a3
The Android Open Source Project [Wed, 22 May 2013 14:27:41 +0000 (07:27 -0700)]
am
d970d9e5: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
d970d9e56173111f9e016a5a0c9f5e532758eefb':
The Android Open Source Project [Wed, 22 May 2013 14:22:49 +0000 (07:22 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I0497c8b9687906dfa54125cd9298a2474f423e3e
The Android Automerger [Wed, 22 May 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Zhihai Xu [Tue, 21 May 2013 17:17:37 +0000 (10:17 -0700)]
am
b5de2bb1: am
5ae72cf0: Media profile drop on ending the outgoing video call and music is heard locally
* commit '
b5de2bb12924525804f7569a1d6ac0af4e0d278d':
Media profile drop on ending the outgoing video call and music is heard locally
Zhihai Xu [Tue, 21 May 2013 17:14:22 +0000 (10:14 -0700)]
am
5ae72cf0: Media profile drop on ending the outgoing video call and music is heard locally
* commit '
5ae72cf049004ac3c0f2f2bc048d1638a3b13d55':
Media profile drop on ending the outgoing video call and music is heard locally
Zhihai Xu [Thu, 16 May 2013 00:29:44 +0000 (17:29 -0700)]
Media profile drop on ending the outgoing video call and music is heard locally
receive AVDTP_Suspend response rejection which cause the A2DP disocnnected.
There is collision of AVDTP_Suspend request:
We send AVDTP_Suspend request and the headset send AVDTP_Suspend request also at the same time.
then We send AVDTP_Suspend response, but the headset send AVDTP_Suspend response rejection
with error code bad state after it receive the AVDTP_Suspend response from us.
we call bta_av_suspend_cfm twice in this case:
the first time we will call bta_av_suspend_cfm without error after receive AVDTP_Suspend request from headset.
the second time we will call bta_av_suspend_cfm with error bad state after receive AVDTP_Suspend response rejection from headset.
To fix this problem, we should ignore the AVDTP_Suspend response rejection from headset
after receive AVDTP_Suspend request from headset.
After we receive AVDTP_Suspend request from headset, the scb state will be changed to AVDT_SCB_OPEN_ST from AVDT_SCB_STREAM_ST.
but when we receive AVDTP_Suspend response rejection from headset, we should ignore it when we are in AVDT_SCB_OPEN_ST.
and also currently we already ignore AVDTP_Suspend response when we are in AVDT_SCB_OPEN_ST,
I don't know why we didn't do it for AVDTP Suspend rejection.
issue
8735903
Change-Id: I8db3ea6e7e4edfea41f255e7e29b8c7255cf3d96
The Android Open Source Project [Thu, 16 May 2013 12:44:31 +0000 (05:44 -0700)]
am
d49bbba5: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
d49bbba51d8d6a3aaed65715b87d251e3d181728':
Solve compilation problem when BLE/GATT/SMP features are false
Audio glitches while playing songs over MOTO S305 headset
The Android Open Source Project [Thu, 16 May 2013 12:43:22 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If30a4d2103f4851f0faa1a8cf5ccf685b18e0664
The Android Automerger [Wed, 15 May 2013 12:55:18 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
YK Jeffrey Chao [Tue, 14 May 2013 23:23:12 +0000 (16:23 -0700)]
am
2fca6e54: am
48ebe2c6: Preload timeout and retry mechanism (1/3)
* commit '
2fca6e548ff48988e63d3550d807b016192e0a77':
Preload timeout and retry mechanism (1/3)
YK Jeffrey Chao [Tue, 14 May 2013 23:21:52 +0000 (16:21 -0700)]
am
48ebe2c6: Preload timeout and retry mechanism (1/3)
* commit '
48ebe2c6928d8fd4dc97c8adb138c3440714dc89':
Preload timeout and retry mechanism (1/3)
YK Jeffrey Chao [Wed, 24 Apr 2013 18:38:06 +0000 (11:38 -0700)]
Preload timeout and retry mechanism (1/3)
If the Preload process was stuck due to unknown hardware init failure,
a 8-second ENABLE_TIMEOUT timeout would be eventually expired in Java layer
at AdapterState and attempted to set BT state back to STATE_OFF.
However BluetoothManagerService did not handle this case accordingly and led
to state mis-matching between Java layer and BTIF at the end.
Add a timeout and retry mechanism to manage Preload process.
Clean up native space resource and explicitly report STATE_OFF back to Java
space when Preload did not go through.
bug
7566317
Change-Id: I99a225e524f2b951249618990a2d0a8a39b43ff3
zzy [Tue, 14 May 2013 20:25:21 +0000 (13:25 -0700)]
am
7cc4a7e9: am
ebef4763: Added available size check to fix zero byte data available issue
* commit '
7cc4a7e9c97eba4990af3c4cecb0b950f7eca204':
Added available size check to fix zero byte data available issue
zzy [Tue, 14 May 2013 20:23:29 +0000 (13:23 -0700)]
am
ebef4763: Added available size check to fix zero byte data available issue
* commit '
ebef4763b36b05370d13dfd27c4fcaa9095dbeff':
Added available size check to fix zero byte data available issue
zzy [Tue, 14 May 2013 00:34:41 +0000 (17:34 -0700)]
Added available size check to fix zero byte data available issue
Bug
8950703
rfcomm connection failed in case zero byte data available
The Android Automerger [Mon, 13 May 2013 12:55:20 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mattias Agren [Fri, 10 May 2013 22:16:50 +0000 (15:16 -0700)]
am
83ecfd88: am
5fd74f06: Stability fixes for a2dp hal control path
* commit '
83ecfd882bec4f5761c4114c571b170c5a9376db':
Stability fixes for a2dp hal control path
Mattias Agren [Fri, 10 May 2013 19:48:44 +0000 (12:48 -0700)]
am
5fd74f06: Stability fixes for a2dp hal control path
* commit '
5fd74f06caab4324d0ba69df86ad5170c072ec64':
Stability fixes for a2dp hal control path
Mattias Agren [Fri, 5 Apr 2013 17:04:35 +0000 (19:04 +0200)]
Stability fixes for a2dp hal control path
Ensure av statemachine is preventing a2dp hal to restart the stream
when not ready. This prevents ending up in a scenario where a2dp hal
locks up. Code cleanup.
bug
7002859
Change-Id: I3f3eeaab4ca185733b8b0042ed2cfa701f76a203
Matthew Xie [Fri, 10 May 2013 00:09:28 +0000 (17:09 -0700)]
am
e1405531: am
e915116a: Merge "Solve compilation problem when BLE/GATT/SMP features are false" into jb-mr2-dev
* commit '
e1405531f637a3851371a2a2c624ff3db5e074fa':
Solve compilation problem when BLE/GATT/SMP features are false
Matthew Xie [Thu, 9 May 2013 23:23:34 +0000 (16:23 -0700)]
am
e915116a: Merge "Solve compilation problem when BLE/GATT/SMP features are false" into jb-mr2-dev
* commit '
e915116a24142955edbc40a0e380b4828957c762':
Solve compilation problem when BLE/GATT/SMP features are false
Matthew Xie [Tue, 7 May 2013 03:51:02 +0000 (20:51 -0700)]
Solve compilation problem when BLE/GATT/SMP features are false
bug
8664724
Change-Id: I582846ccf4b8995f298d8db533488fceb7993ae3
YK Jeffrey Chao [Thu, 9 May 2013 21:19:58 +0000 (14:19 -0700)]
am
f71a3f66: am
67e4077c: New call-in/-back functions for Controller to do vendor-specific shutdown (1/2)
* commit '
f71a3f6695cf7f8c605c0ee5fb3623990c9d2e9b':
New call-in/-back functions for Controller to do vendor-specific shutdown (1/2)
Matthew Xie [Thu, 9 May 2013 21:10:48 +0000 (21:10 +0000)]
Merge "Solve compilation problem when BLE/GATT/SMP features are false" into jb-mr2-dev
YK Jeffrey Chao [Thu, 9 May 2013 19:46:32 +0000 (12:46 -0700)]
am
67e4077c: New call-in/-back functions for Controller to do vendor-specific shutdown (1/2)
* commit '
67e4077c23bb9cc045885ae01cc83b38faecb71b':
New call-in/-back functions for Controller to do vendor-specific shutdown (1/2)
YK Jeffrey Chao [Tue, 7 May 2013 23:28:52 +0000 (16:28 -0700)]
New call-in/-back functions for Controller to do vendor-specific shutdown (1/2)
A pair of asynchronous call-in and call-back API are added into the Host
Controller Vendor Lib interface (bt_vendor_lib.h). The caller calls this new
call-in function to inform the vendor module to perform vendor-specific
shutdown process (e.g. send HCI_RESET to BT Controller) before the caller calls
for interface cleanup() function. The vendor module is responsible for calling
call-back function to notify the caller completion of vendor-specific shutdown
process.
bug
7390787
Change-Id: I29e3c94ff78e17cdd7a06b44ae537e3b0ad1516d
Matthew Xie [Tue, 7 May 2013 03:51:02 +0000 (20:51 -0700)]
Solve compilation problem when BLE/GATT/SMP features are false
bug
8664724
Change-Id: I582846ccf4b8995f298d8db533488fceb7993ae3
Ganesh Ganapathi Batta [Wed, 8 May 2013 22:03:18 +0000 (15:03 -0700)]
am
ca6f7b39: am
ed049d78: Remove role adjustment logic from Conn busy/idle handler
* commit '
ca6f7b39b499811667f475d7e967b9e454ecb863':
Remove role adjustment logic from Conn busy/idle handler
Matthew Xie [Wed, 8 May 2013 22:03:13 +0000 (15:03 -0700)]
am
2731808c: am
88c66598: Merge "Fix a bug on jv and stack port handle conversion" into jb-mr2-dev
* commit '
2731808c048bb9f2d9f8a911971f018bfa2e243b':
Fix a bug on jv and stack port handle conversion
The Android Automerger [Wed, 8 May 2013 12:55:17 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ganesh Ganapathi Batta [Tue, 7 May 2013 22:10:08 +0000 (15:10 -0700)]
am
ed049d78: Remove role adjustment logic from Conn busy/idle handler
* commit '
ed049d78633d33d4fbb3178dacfa6edbb756ae45':
Remove role adjustment logic from Conn busy/idle handler
Ganesh Ganapathi Batta [Fri, 12 Apr 2013 18:57:50 +0000 (11:57 -0700)]
Remove role adjustment logic from Conn busy/idle handler
Each call into connection busy/idle handler should not result in
Role adjustments except for AV profiles.
Bug:
8322094
Change-Id: I1eba2c428e877772614052396315c6f0467d3378
Matthew Xie [Tue, 7 May 2013 21:30:48 +0000 (14:30 -0700)]
am
88c66598: Merge "Fix a bug on jv and stack port handle conversion" into jb-mr2-dev
* commit '
88c665988c7ae5e1a6dadd4df944b49cff1d1fca':
Fix a bug on jv and stack port handle conversion
Matthew Xie [Tue, 7 May 2013 21:28:22 +0000 (21:28 +0000)]
Merge "Fix a bug on jv and stack port handle conversion" into jb-mr2-dev
Matthew Xie [Mon, 6 May 2013 07:55:08 +0000 (00:55 -0700)]
Fix a bug on jv and stack port handle conversion
bug
8755557
Change-Id: Id639677aa4bc6322fed0eb1a842d1155cdcdd5fc
The Android Automerger [Tue, 7 May 2013 12:55:10 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Kausik Sinnaswamy [Mon, 6 May 2013 23:20:37 +0000 (16:20 -0700)]
am
91409af5: am
95664a9a: Fix for SDP data structure leak during pairing
* commit '
91409af50ebd2e7590b8e2463e1d06ac13f00e18':
Fix for SDP data structure leak during pairing
Kausik Sinnaswamy [Mon, 6 May 2013 18:12:05 +0000 (11:12 -0700)]
am
95664a9a: Fix for SDP data structure leak during pairing
* commit '
95664a9acc57b5e51365454f26d2fac0f2e1ecd4':
Fix for SDP data structure leak during pairing
Kausik Sinnaswamy [Fri, 3 May 2013 09:32:50 +0000 (15:02 +0530)]
Fix for SDP data structure leak during pairing
During pairing, bluedroid initiates a SDP request to search services.
Upon SDP completion, some data structure buffers were not returned to
the pool resulting in leak.
Bug :
8797456
Change-Id: Ic512fd22ca6b8b748c5b92c02e24016fe785c0b1
The Android Automerger [Thu, 2 May 2013 12:55:11 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Zhihai Xu [Wed, 1 May 2013 17:35:50 +0000 (10:35 -0700)]
am
53914252: am
2154e12e: BT problems in Acura MDX
* commit '
53914252237e0d07c94ff7e90f0bc0f85df15e56':
BT problems in Acura MDX
Zhihai Xu [Wed, 1 May 2013 17:33:02 +0000 (10:33 -0700)]
am
2154e12e: BT problems in Acura MDX
* commit '
2154e12efeec88780933d47b3c3686ff9f6fe84d':
BT problems in Acura MDX
Zhihai Xu [Wed, 1 May 2013 01:29:53 +0000 (18:29 -0700)]
BT problems in Acura MDX
problem2 unexpected beep from carkit during ringing.
The root cause is
the interval between the ring alert is 10 seconds. it is too long
for the carkit which trigger the beep from the carkit. After I
change the inteval to 5 seconds, no unexpected beep from the carkit.
issue
8720373
Change-Id: I6f1cc1faba27e61c80b31c63b6673436e003b117
Matthew Xie [Tue, 30 Apr 2013 15:54:25 +0000 (08:54 -0700)]
am
f431832b: am
b05c0190: Merge "LE: Fix shared ACL buffer allocation" into jb-mr2-dev
* commit '
f431832b9d03cf9fc44dfcb7a0d2848228007a05':
LE: Fix shared ACL buffer allocation
Andre Eisenbach [Tue, 30 Apr 2013 15:54:24 +0000 (08:54 -0700)]
am
9427be7e: am
2d41fe1c: LE: Disable L2CAP connection parameter update during pairing
* commit '
9427be7ee2996e46d0a4b52252ad17e1c2f149c7':
LE: Disable L2CAP connection parameter update during pairing
The Android Automerger [Tue, 30 Apr 2013 12:55:57 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Matthew Xie [Mon, 29 Apr 2013 23:08:47 +0000 (16:08 -0700)]
am
b05c0190: Merge "LE: Fix shared ACL buffer allocation" into jb-mr2-dev
* commit '
b05c0190b55369618c968b27ea406f9660bfa4ed':
LE: Fix shared ACL buffer allocation
Andre Eisenbach [Mon, 29 Apr 2013 23:08:47 +0000 (16:08 -0700)]
am
2d41fe1c: LE: Disable L2CAP connection parameter update during pairing
* commit '
2d41fe1c5dbac701a074eec272545439168930a7':
LE: Disable L2CAP connection parameter update during pairing
Matthew Xie [Mon, 29 Apr 2013 23:06:32 +0000 (23:06 +0000)]
Merge "LE: Fix shared ACL buffer allocation" into jb-mr2-dev