OSDN Git Service
Maggie_Lee [Tue, 7 Oct 2014 22:27:52 +0000 (22:27 +0000)]
am
9c9c4bf7: am
c1ccb0d9: (-s ours) anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer
* commit '
9c9c4bf7b879c5f5580cba02ffe6649ff433b806':
anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer
Maggie_Lee [Tue, 7 Oct 2014 22:22:58 +0000 (22:22 +0000)]
am
c1ccb0d9: (-s ours) anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer
* commit '
c1ccb0d9854cea4b2cd09bbd57fc1e1081eb96b9':
anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer
Wei Wang [Mon, 6 Oct 2014 19:19:52 +0000 (19:19 +0000)]
am
de898558: Merge "Fix an "array index out of bound" bug for RPA." into lmp-dev
* commit '
de898558badd0d575829c4011fdffd33c548c1d6':
Fix an "array index out of bound" bug for RPA.
Wei Wang [Mon, 6 Oct 2014 19:16:26 +0000 (19:16 +0000)]
Merge "Fix an "array index out of bound" bug for RPA." into lmp-dev
Andre Eisenbach [Mon, 6 Oct 2014 01:42:35 +0000 (01:42 +0000)]
am
19a8f456: Merge "Raise A2DP threat priority to avoid music breaks" into lmp-dev
* commit '
19a8f456d4a38694eaec270eabc5ff9aa639c86d':
Raise A2DP threat priority to avoid music breaks
Satya Calloji [Mon, 6 Oct 2014 01:42:34 +0000 (01:42 +0000)]
am
d5aa2475: LE: Peer device\'s latest RPA is not being applied
* commit '
d5aa24750c2202ce944560c2c27ead0214e8350d':
LE: Peer device's latest RPA is not being applied
Andre Eisenbach [Mon, 6 Oct 2014 01:28:18 +0000 (01:28 +0000)]
Merge "Raise A2DP threat priority to avoid music breaks" into lmp-dev
Satya Calloji [Wed, 24 Sep 2014 01:27:09 +0000 (18:27 -0700)]
LE: Peer device's latest RPA is not being applied
The latest discovered address is not used when reconnecting to devices
using resolvable private addresses, if RPA resolution offloadin is not
supported in the controller.
This patch also address the exception case where BT off is memseting
all control value while the IRK list is still being cleaned up.
Bug:
17187661
Change-Id: Ifeb5b8297e7eadb0e34ec1afbd41f46bdd836cf3
Author: Chaojing Sun <cjsun@broadcom.com>
Mattias Agren [Thu, 2 Oct 2014 07:43:04 +0000 (09:43 +0200)]
Raise A2DP threat priority to avoid music breaks
* Ensure all a2dp audiopath threads are configured to high
priority when actively streaming.
* For now set bt hc worker thread always to URGENT_AUDIO
until new thread api can adjust thread priority dynamically.
Bug:
17520043
Change-Id: I10e314085329278bcfcc4e8bc5ce899b03d22e2b
Wei Wang [Fri, 3 Oct 2014 17:58:03 +0000 (10:58 -0700)]
Fix an "array index out of bound" bug for RPA.
Also returns no more than BTM_BLE_MULTI_ADV_MAX for max advertise
instances.
Bug:
17810619
Change-Id: If655e207b641fd4cd1590ae47b28185dc9f7cbbb
Matthew Xie [Thu, 25 Sep 2014 17:40:55 +0000 (17:40 +0000)]
am
4baec1a8: Merge "Remove HOGP device from background connection list" into lmp-dev
* commit '
4baec1a8b7987f6d46351ea17d359e23d0e17eb2':
Remove HOGP device from background connection list
Priti Aghera [Thu, 25 Sep 2014 17:40:54 +0000 (17:40 +0000)]
am
1cd92393: Null check for irk entry
* commit '
1cd92393c162afe68b01aafcf7a1d41ab1d21e7b':
Null check for irk entry
Matthew Xie [Thu, 25 Sep 2014 17:29:56 +0000 (17:29 +0000)]
Merge "Remove HOGP device from background connection list" into lmp-dev
Priti Aghera [Wed, 24 Sep 2014 17:06:40 +0000 (10:06 -0700)]
Null check for irk entry
When BT is turning off btm_ble_vendor control block is cleaned up.
So irk_entry which points to the first element of irk_list is NULL
Included a null check for irk_entry to prevent stack crash.
Bug
17399097
Change-Id: Ib129f7dd06f9db61cc54257aa4a563fe2c9f41f2
Maggie_Lee [Wed, 24 Sep 2014 00:17:02 +0000 (17:17 -0700)]
anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer
b/
17623865
Getbuff is checking for the pool which can accommodate
requested size, but it changing the pool with a restricted
check and not checking for the free memory size in that pool.
Added a check to avoid return the wrong pool free buf pointer
and avoid gki get_buffer overflow.
Change-Id: I142870c989fc37f49c2d9b411d5eddbfba59bd9d
Matthew Xie [Tue, 23 Sep 2014 06:26:03 +0000 (06:26 +0000)]
am
03cb1ad1: Merge "Enable flow control when tx buffer is full and peer stuck in receiving" into lmp-dev
* commit '
03cb1ad1e063f7353c5098527bbf13ae7d563a7e':
Enable flow control when tx buffer is full and peer stuck in receiving
Matthew Xie [Tue, 23 Sep 2014 06:05:59 +0000 (06:05 +0000)]
Merge "Enable flow control when tx buffer is full and peer stuck in receiving" into lmp-dev
Nitin Arora [Fri, 6 Dec 2013 05:11:26 +0000 (21:11 -0800)]
Remove HOGP device from background connection list
This adds logic to remove the device from whitelist when user unpairs or
disconnects device.
Bug:
17318494
Change-Id: I43c06dd16c665f9ce2e71a0e031c4f0f11a4012e
Elliott Hughes [Fri, 19 Sep 2014 17:45:01 +0000 (17:45 +0000)]
am
8b52f5f2: Merge "Suppress the warning compiled with gcc-4.9"
* commit '
8b52f5f2f0eb1e3748a19af4438147872cba1cd2':
Suppress the warning compiled with gcc-4.9
Elliott Hughes [Fri, 19 Sep 2014 17:20:51 +0000 (17:20 +0000)]
Merge "Suppress the warning compiled with gcc-4.9"
Elliott Hughes [Fri, 19 Sep 2014 16:41:26 +0000 (16:41 +0000)]
am
94c31e55: Merge "Fix of memset usage"
* commit '
94c31e5518de3cfb610aae74835d5cc0a6d092d2':
Fix of memset usage
Elliott Hughes [Fri, 19 Sep 2014 16:27:43 +0000 (16:27 +0000)]
Merge "Fix of memset usage"
Satya Calloji [Fri, 19 Sep 2014 16:09:18 +0000 (16:09 +0000)]
am
3f24f460: All 00 mac address with advt
* commit '
3f24f460ec3efedde25723e6a4297efc10873cd2':
All 00 mac address with advt
Arseniy Antonov [Fri, 19 Sep 2014 13:08:23 +0000 (17:08 +0400)]
Fix of memset usage
Build process failed following error (GCC 5.0):
btif_storage.c:1503:9: error: 'memset' used with constant zero length parameter; this could be due to transposed parameters [-Werror=memset-transposed-args]
Change-Id: I46e0d8bd6fcd9439b50b4f0aed5391c808b9eb73
Signed-off-by: Arseniy Antonov <arseniy.antonov@intel.com>
Lai Wei-Chih [Fri, 19 Sep 2014 07:39:49 +0000 (15:39 +0800)]
Suppress the warning compiled with gcc-4.9
Fix the warning below:
gatt_sr.c: In function 'gatt_sr_process_app_rsp':
gatt_sr.c:175:27: warning: 'p_rsp' may be used uninitialized in this function [-Wmaybe-uninitialized]
p_rsp = (tGATTS_RSP *)GKI_getnext (p_rsp);
^
gatt_sr.c:125:23: note: 'p_rsp' was declared here
tGATTS_RSP *p_rsp;
^
Change-Id: I894495ed7893e958f009778e629525b85d56b2f6
Satya Calloji [Wed, 17 Sep 2014 05:44:43 +0000 (22:44 -0700)]
All 00 mac address with advt
Read the controller features before local name read
Bug
17505545
Change-Id: I7995a8c714ebec6e1751af5371edfd29c74b12ea
Chris Manton [Fri, 19 Sep 2014 04:41:20 +0000 (04:41 +0000)]
am
d1e6922c: Check userial fd before reading
* commit '
d1e6922ce963c90d19e81abdc1d305ccd0e65d7e':
Check userial fd before reading
Zhenye Zhu [Wed, 17 Sep 2014 23:59:52 +0000 (16:59 -0700)]
Enable flow control when tx buffer is full and
peer stuck in receiving
bug
17525124
Change-Id:Ic67e9c0aab7e64afc9679733e6c3de10a28078d7
Chris Manton [Mon, 15 Sep 2014 15:48:35 +0000 (08:48 -0700)]
Check userial fd before reading
The userial read loop uses one global flag
to condition the serial port read and a
second global file descriptor variable that
may change from another thread underneath it.
Check the validity of the serial port file
descriptor by making a copy immediately before
the read and only proceeding if it's a valid fd.
bug:
17552690
Change-Id: Iaaf1b8476fdee462ddc178d2a31ef8f55cb33e52
Andre Eisenbach [Thu, 18 Sep 2014 00:16:22 +0000 (00:16 +0000)]
am
13e916d7: Merge "Add ability to preserve existing snoop log" into lmp-dev
* commit '
13e916d7e120796a45f3bf109ff959d7f4c42f0f':
Add ability to preserve existing snoop log
Andre Eisenbach [Wed, 17 Sep 2014 23:55:58 +0000 (23:55 +0000)]
Merge "Add ability to preserve existing snoop log" into lmp-dev
Andre Eisenbach [Wed, 17 Sep 2014 23:40:53 +0000 (16:40 -0700)]
Add ability to preserve existing snoop log
Currently a stack restart or device reboot will overwrite existing snoop
logs when the stack restarts. This patch adds a new configuration file
parameter "BtSnoopSaveLog" that, if enabled, will cause an existing
snoop log to be renamed to "<snoop_file_name>.last" before a new snoop
log is created.
This will allow for easier debugging of crashes that involve a reboot or
stack restart.
Change-Id: I4f56204d31a6bf2e96058938e8616eb6dee7360b
Matthew Xie [Wed, 17 Sep 2014 21:13:15 +0000 (21:13 +0000)]
am
303d4ac5: Merge "For pairing over le transport, set default device type and address type" into lmp-dev
* commit '
303d4ac5ff7758ab2cdde4040cb8db6cf37552f5':
For pairing over le transport, set default device type and address type
Matthew Xie [Wed, 17 Sep 2014 20:50:55 +0000 (20:50 +0000)]
Merge "For pairing over le transport, set default device type and address type" into lmp-dev
Matthew Xie [Tue, 16 Sep 2014 07:55:03 +0000 (00:55 -0700)]
For pairing over le transport, set default device type and address type
When the LE pairing is initiated over NFC, skipping device scan, there is
no device type or address type info. We set the default as le and public.
bug
17497942
Change-Id: I3dcbb9029ead6ea0f7c48e62f46c8a055f1bc293
Andre Eisenbach [Wed, 17 Sep 2014 16:48:50 +0000 (16:48 +0000)]
am
c918d087: Document LE IO capabilities and use BR/EDR constant for LE
* commit '
c918d08763ec547f7f226553ab75ca885db357ac':
Document LE IO capabilities and use BR/EDR constant for LE
Andre Eisenbach [Wed, 17 Sep 2014 15:45:56 +0000 (08:45 -0700)]
Document LE IO capabilities and use BR/EDR constant for LE
This removes a hack to set LE IO capabilities and reuses the existing
constant defined in bt_target.h.
Change-Id: I3c97629bd092ac78bd673afc29458775b2bce836
Priti Aghera [Mon, 15 Sep 2014 00:00:39 +0000 (00:00 +0000)]
am
24adb37e: host cannot recover when connection exceed controller capability
* commit '
24adb37e4106bf8544c7729d34451fdf2777c4dc':
host cannot recover when connection exceed controller capability
Priti Aghera [Wed, 10 Sep 2014 18:42:10 +0000 (11:42 -0700)]
host cannot recover when connection exceed controller capability
Host can not initiate new connection when exceed controller capability
and connection then drop back to lower than the max. Controller will not
generate connection complete event when initaite LE ll connection request
failed, and host is dead loop waiting for the connection complete
then can not recover. Included a connection complete callback with failure
status when controller capability is exceeded.
bug
17326529
Change-Id: I9b863578dc868456e092f1d060e50d2c9fdcb441
Matthew Xie [Sun, 14 Sep 2014 21:16:18 +0000 (21:16 +0000)]
am
e3b1d0da: Merge "Correct the OBEX OPP Profile version"
* commit '
e3b1d0da533fbb01da67f7ccfa976a9e3d54ed94':
Correct the OBEX OPP Profile version
Matthew Xie [Sun, 14 Sep 2014 20:49:31 +0000 (20:49 +0000)]
Merge "Correct the OBEX OPP Profile version"
Prerepa Viswanadham [Sat, 13 Sep 2014 02:30:59 +0000 (02:30 +0000)]
am
7ae25156: Avoid premature LE connection notifaction to app
* commit '
7ae25156f4250af9d0e8cd8d559d916cfb847feb':
Avoid premature LE connection notifaction to app
Wei Wang [Fri, 12 Sep 2014 23:22:48 +0000 (23:22 +0000)]
am
976990f8: Merge "Fix issues with manufacturer ID prefix scan filter." into lmp-dev
* commit '
976990f872bb0873fedbb74649d0bf704bb70d05':
Fix issues with manufacturer ID prefix scan filter.
Wei Wang [Fri, 12 Sep 2014 23:22:47 +0000 (23:22 +0000)]
am
1a5f8105: Merge "Fix ADV data exceeding max adv packet length" into lmp-dev
* commit '
1a5f8105337cd41efad09d4ec8812311e8adaaec':
Fix ADV data exceeding max adv packet length
Prerepa Viswanadham [Thu, 11 Sep 2014 00:08:11 +0000 (17:08 -0700)]
Avoid premature LE connection notifaction to app
To avoid premature connection notification to app, always wait for
LE read remote feature complete with success before the connection
event is sent to application.
This patch also deprecates the BTA_SKIP_BLE_READ_REMOTE_FEAT flag.
Since the remote feature request is now serialized and start encryption
won't be called until the connection is up, this flag is no longer
necessary and interferes with the new behaviour.
This is an extension of previous CL
Bug:
17326529
Change-Id: Icfd4c5dfdd9f89d1318ef429e132eb005abb1f64
Wei Wang [Fri, 12 Sep 2014 22:15:26 +0000 (22:15 +0000)]
Merge "Fix issues with manufacturer ID prefix scan filter." into lmp-dev
Wei Wang [Fri, 12 Sep 2014 22:14:16 +0000 (22:14 +0000)]
Merge "Fix ADV data exceeding max adv packet length" into lmp-dev
Andre Eisenbach [Fri, 12 Sep 2014 19:20:10 +0000 (19:20 +0000)]
am
a015a834: LE: Use random address when initiating background connections
* commit '
a015a8348b9e09caf5261689f4c288a4d2ff6acd':
LE: Use random address when initiating background connections
Andre Eisenbach [Thu, 11 Sep 2014 21:09:40 +0000 (14:09 -0700)]
LE: Use random address when initiating background connections
When re-connecting to HID devices, the first reconnection immediately
after a reboot incorrectly uses the static, public Bluetooth address of
the phone/tablet as the own address.
This patch fixes the Bluetooth initialization sequence to make sure
privacy is enabled before any Bluetooth services are started.
Bug:
16952502
Change-Id: I43e595ddc7e347fab972b059382b512fb03e9459
Satya Calloji [Sat, 6 Sep 2014 00:16:33 +0000 (17:16 -0700)]
Fix ADV data exceeding max adv packet length
Fixed the 128-bit UUID handling during setting up
of adv data/scan response
Bug:
16799331
Change-Id: I81e4ab0a80a5c1b7abf012dccc29eead54229b21
Andre Eisenbach [Wed, 10 Sep 2014 17:48:51 +0000 (17:48 +0000)]
am
53c9fd05: Merge "LE link_xmit_quota is not correctly allocated" into lmp-dev
* commit '
53c9fd05c28d035cf3d2530b586d3d02b68a9866':
LE link_xmit_quota is not correctly allocated
Andre Eisenbach [Wed, 10 Sep 2014 17:48:50 +0000 (17:48 +0000)]
am
8dedc069: Merge "SMP doesn\'t detect the event of local processing taking more than SMP timeout (30 sec)" into lmp-dev
* commit '
8dedc069c0b9183ae386d2cc413b0116720ef879':
SMP doesn't detect the event of local processing taking more than SMP timeout (30 sec)
Andre Eisenbach [Wed, 10 Sep 2014 17:28:15 +0000 (17:28 +0000)]
Merge "LE link_xmit_quota is not correctly allocated" into lmp-dev
Andre Eisenbach [Wed, 10 Sep 2014 17:27:47 +0000 (17:27 +0000)]
Merge "SMP doesn't detect the event of local processing taking more than SMP timeout (30 sec)" into lmp-dev
Andre Eisenbach [Wed, 10 Sep 2014 00:50:00 +0000 (00:50 +0000)]
am
000abb5e: Merge "LE: Remove stored link key if encryption fails due to missing key (remote)" into lmp-dev
* commit '
000abb5e7be8c60c66d5ac7319362be448078121':
LE: Remove stored link key if encryption fails due to missing key (remote)
Mudumba Ananth [Fri, 11 Jul 2014 07:05:54 +0000 (00:05 -0700)]
LE link_xmit_quota is not correctly allocated
LE link transmit quota should be calculated based on the total LE
buffer available and number of LE link that shares the buffer. Currently
it's been calculated based on the ACL buffer number and total physical
links(BR and LE), that cause the LE link transmit quota not being
done right.
Modify the link transmit quota allocation, and keep track of LE link
seperately, also keep track of round robin scheme for LE links
solving the problem.
Bug:
16560957
Change-Id: I70f91827b96f2c10421e91311ea34cc81a5ef4b8
Andre Eisenbach [Tue, 9 Sep 2014 22:34:51 +0000 (22:34 +0000)]
Merge "LE: Remove stored link key if encryption fails due to missing key (remote)" into lmp-dev
Andre Eisenbach [Tue, 9 Sep 2014 21:55:44 +0000 (21:55 +0000)]
am
d8f8e85d: Merge "If L2CA_ConnectFixedChnl fails, free L2CAP lcb for the attempted connection" into lmp-dev
* commit '
d8f8e85df529864286cfc31be8bd34dc2dcb4dae':
If L2CA_ConnectFixedChnl fails, free L2CAP lcb for the attempted connection
Andre Eisenbach [Tue, 9 Sep 2014 19:56:07 +0000 (19:56 +0000)]
Merge "If L2CA_ConnectFixedChnl fails, free L2CAP lcb for the attempted connection" into lmp-dev
Priti Aghera [Tue, 9 Sep 2014 19:08:23 +0000 (19:08 +0000)]
am
98283bb8: Fixed SMP pairing failure due to race condition
* commit '
98283bb879d26d0c29a76988e1bffebd6f730fc5':
Fixed SMP pairing failure due to race condition
Priti Aghera [Tue, 9 Sep 2014 18:30:25 +0000 (11:30 -0700)]
Fixed SMP pairing failure due to race condition
SMP pairing failure if remote send security request before master
side receive LE link connection callback. The racing condition will
cause master side bonding failure upon ignoring remote security request
and flush out all SMP information. Retain SMP information when a
locally initiated pairing is in process solves the problem.
Bug:
17412687
Change-Id: Ia2256160c866413f93c6f49e5db82b4c6489d9d2
Mudumba Ananth [Fri, 4 Jul 2014 10:15:37 +0000 (03:15 -0700)]
SMP doesn't detect the event of local processing taking more than SMP timeout (30 sec)
Bug:
16560957
Change-Id: I1113f367187a30e01fa3d5d2a5ccb0243580e06b
Mudumba Ananth [Fri, 4 Jul 2014 06:14:43 +0000 (23:14 -0700)]
If L2CA_ConnectFixedChnl fails, free L2CAP lcb for the attempted connection
Bug:
16560957
Change-Id: I91fd2cc90435d0b899474b555b4a4ab00306c156
Andre Eisenbach [Tue, 9 Sep 2014 05:14:28 +0000 (05:14 +0000)]
am
f5140468: Merge "LE: Disable background connections if RPA offloading is not supported" into lmp-dev
* commit '
f5140468dc83dafcd75ffe607e1a56c514b9a8a4':
LE: Disable background connections if RPA offloading is not supported
Andre Eisenbach [Tue, 9 Sep 2014 01:48:20 +0000 (01:48 +0000)]
Merge "LE: Disable background connections if RPA offloading is not supported" into lmp-dev
Andre Eisenbach [Mon, 18 Aug 2014 18:20:06 +0000 (11:20 -0700)]
LE: Disable background connections if RPA offloading is not supported
If the local device does not support RPA offloading, background
connections to a resolvable random address will not work. Added callback
to indicate to the application writer that the requested operation is
not supported.
Bug:
16831527
Change-Id: I083d66b16704e997f52a40ea4daced3056b50ad5
Satya Calloji [Wed, 3 Sep 2014 17:01:44 +0000 (10:01 -0700)]
Fix issues with manufacturer ID prefix scan filter.
Handled the case of no manufacturer data in filter configuration
Bug:
17324059
Change-Id: I87c2c44644f808bd88f4d8681ff53e2d92815658
Priti Aghera [Fri, 29 Aug 2014 18:21:28 +0000 (11:21 -0700)]
LE: Remove stored link key if encryption fails due to missing key (remote)
Remove the link key if encryption fails due to missing key or
authentication error. When a remote device loses the bond, all
HOGP services cached should be discarded and all client configuration
descriptors needs to be re-enabled. This will ensure successful
re-connection.
Bug:
15022622
Change-Id: Ie1730830c0cbbc294e2cd579d7dca69d16cf8218
Priti Aghera [Mon, 8 Sep 2014 21:22:24 +0000 (21:22 +0000)]
am
7bf480e3: Notify that link is up after LE read remote features completes
* commit '
7bf480e3e3e1df04c0be6d466d8dffac5abaae40':
Notify that link is up after LE read remote features completes
Priti Aghera [Mon, 8 Sep 2014 20:04:29 +0000 (13:04 -0700)]
Notify that link is up after LE read remote features completes
ACL link up notifaction was not sent after LE read remote features was successful.
Thus, total ACL link up count was not updated. Included a link up notification
after LE read remote features is successfull.
Bug:
17410697
Change-Id: I41fc640e76fa99354cb63d9b0b3031582178c057
Matthew Xie [Mon, 8 Sep 2014 18:36:49 +0000 (18:36 +0000)]
am
c8eddb5a: Make sure conn_id is valid before using it
* commit '
c8eddb5ae46da76552d3cd3d9fff8d33c1880a52':
Make sure conn_id is valid before using it
Matthew Xie [Sun, 7 Sep 2014 23:08:59 +0000 (16:08 -0700)]
Make sure conn_id is valid before using it
Bug:
17401266
Change-Id: I5f36e13b3ccb327f191db33123fff98858f07c5f
Priti Aghera [Fri, 5 Sep 2014 18:10:23 +0000 (18:10 +0000)]
am
9c29d08b: Avoid premature LE connection notifaction to app
* commit '
9c29d08bc7c6da33db5cfc777404354c6dca845c':
Avoid premature LE connection notifaction to app
Priti Aghera [Tue, 2 Sep 2014 22:41:56 +0000 (15:41 -0700)]
Avoid premature LE connection notifaction to app
To avoid premature connection notification to app, always wait for
LE read remote feature complete with success before the connection
event is sent to application.
bug
17326529
Change-Id: Id731bf02e8d5d5a68db12e0478b8eb74723eb95d
Priti Aghera [Thu, 4 Sep 2014 23:12:46 +0000 (23:12 +0000)]
am
2bfa490a: Set random address before connection request
* commit '
2bfa490a23a3b8ad6c992db4bb74f560a6a059e3':
Set random address before connection request
Priti Aghera [Thu, 4 Sep 2014 20:29:28 +0000 (13:29 -0700)]
Set random address before connection request
Send Set_Random_Address when privacy is enabled. If Set_Random_Address
is not sent to controller, Connection request will be sent with host
address as all 0's
Bug:
17386986
Change-Id: I59877e52bf76a56696800ff0e75487c633adde3c
Fred Quintana [Thu, 4 Sep 2014 22:02:04 +0000 (22:02 +0000)]
am
2a03e1e3: Merge "Add an override for entering sniff mode after idle on FTS and OTP" into lmp-dev
* commit '
2a03e1e36ad251eb269d3411ecc11950cfdf393a':
Add an override for entering sniff mode after idle on FTS and OTP
Fred Quintana [Thu, 4 Sep 2014 21:43:04 +0000 (21:43 +0000)]
Merge "Add an override for entering sniff mode after idle on FTS and OTP" into lmp-dev
Andre Eisenbach [Thu, 4 Sep 2014 20:06:50 +0000 (20:06 +0000)]
am
e752b1ba: Merge "Fix error in tick calculation when timer is removed" into lmp-dev
* commit '
e752b1baf0f3ae4c5ee750c802e630ca25a3d95f':
Fix error in tick calculation when timer is removed
Andre Eisenbach [Thu, 4 Sep 2014 19:48:19 +0000 (19:48 +0000)]
Merge "Fix error in tick calculation when timer is removed" into lmp-dev
Andre Eisenbach [Thu, 4 Sep 2014 19:43:05 +0000 (12:43 -0700)]
Fix error in tick calculation when timer is removed
A previous changed introduced an error in the timer tick calculation
when removing a timer. This could lead to timers expiring sooner than
expected.
Bug:
17390240
Change-Id: Id3291aaf492a7178782e6f804dad71387c3c9382
Andre Eisenbach [Thu, 4 Sep 2014 18:28:36 +0000 (18:28 +0000)]
am
5e02098d: Merge "Limit the time PAN can occupy the BTU stack thread" into lmp-dev
* commit '
5e02098d563a7a8ff62ab71413d9878b88b7d484':
Limit the time PAN can occupy the BTU stack thread
Andre Eisenbach [Thu, 4 Sep 2014 18:11:39 +0000 (18:11 +0000)]
Merge "Limit the time PAN can occupy the BTU stack thread" into lmp-dev
Fred Quintana [Wed, 3 Sep 2014 23:23:14 +0000 (16:23 -0700)]
Add an override for entering sniff mode after idle on FTS and OTP
Change-Id: I5e3d164898563478ddf5d21197e682600f8cc33f
Andre Eisenbach [Thu, 4 Sep 2014 00:41:59 +0000 (00:41 +0000)]
am
ae13ec98: Avoid race condition in SBC encoder initialization
* commit '
ae13ec986e188d66eaad3c69bb916ea18c142fef':
Avoid race condition in SBC encoder initialization
Matthew Xie [Wed, 3 Sep 2014 23:46:13 +0000 (23:46 +0000)]
am
f355749b: Merge "Clean up fd when failed to add monitor thread" into lmp-dev
* commit '
f355749bf564763aeb1858060e1a196059cb0cf3':
Clean up fd when failed to add monitor thread
Chris Manton [Wed, 3 Sep 2014 23:45:20 +0000 (23:45 +0000)]
am
2172d0a7: Bluetooth: Properly initialize UART fds
* commit '
2172d0a76ae046ab366c651a3d6161b295952d96':
Bluetooth: Properly initialize UART fds
Andre Eisenbach [Wed, 3 Sep 2014 19:48:44 +0000 (12:48 -0700)]
Avoid race condition in SBC encoder initialization
In the A2DP media task, btif_a2dp_encoder_update() relies on the fact
that btif_a2dp_encoder_init() is called beforehand. Otherwise division
by zero errors will occur.
Since _init() called after the audio stream is opened, and _update() is
called in resonse the the audio stream being opened, a race condition
could ensue where _update() was called before open.
This patch changes the A2DP stream start sequence to ensure the SBC
encoder is initialized before the updated parameters are calculated.
Bug:
17339248
Change-Id: I6ed36a7fff0e4aa672a8866727030681eb4b3dfc
Zhenye Zhu [Tue, 26 Aug 2014 21:26:56 +0000 (14:26 -0700)]
Limit the time PAN can occupy the BTU stack thread
Also make sure tap read/write are non-blocking and PAN does not use the
complete shared buffer pool to avoid GKI buffer overruns.
Bug:
16374840
Change-Id: I6f96d1c8d2804d253d33fe37ff87275e03e55ddd
Matthew Xie [Wed, 3 Sep 2014 19:28:34 +0000 (19:28 +0000)]
Merge "Clean up fd when failed to add monitor thread" into lmp-dev
Matthew Xie [Wed, 3 Sep 2014 06:39:43 +0000 (23:39 -0700)]
Clean up fd when failed to add monitor thread
Bug:
10773872
Change-Id: I7f5b5f976ee7fa522e02b9ee4369b8f152b15cfb
Chris Manton [Wed, 3 Sep 2014 16:40:10 +0000 (09:40 -0700)]
Bluetooth: Properly initialize UART fds
If the vendor library is unable to open the UART,
the passed in file descriptor array is unchanged.
This array was uninitialized stack memory which
may miss the illegal fd check and barrel ahead
forking a userial read thread causing FD_SET
problems should the uninitialized stack memory be
bogus fds outside the processes boundaries.
Verify that the vendor library was actually opening
exactly one uart.
Bug:
16651586
Change-Id: I24e700cdb0b0f3ed107f56b94b5b535abba66806
lungtsai_lin [Wed, 3 Sep 2014 05:50:02 +0000 (05:50 +0000)]
am
d6fc0515: Bluetooth: Trigger bta_dm_disable_timer_cback() again if remove ACL failed
* commit '
d6fc0515124cf5b7ebc93d926565a10295548de5':
Bluetooth: Trigger bta_dm_disable_timer_cback() again if remove ACL failed
lungtsai_lin [Mon, 25 Aug 2014 05:19:56 +0000 (13:19 +0800)]
Bluetooth: Trigger bta_dm_disable_timer_cback() again if remove ACL failed
To avoid trun off BT failed, stack have to send out BTA_DM_DISABLE_EVT
even disconnect ACL failed during turning of BT procedire. Trigger
bta_dm_disable_timer_cback() again after 1.5 sec.
Bug:
17158327
Change-Id: I096d535603faf7b302febea7cfff7a3364d4b048
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Thomas.TT_Lin [Fri, 29 Aug 2014 23:43:47 +0000 (23:43 +0000)]
am
29bfd63d: Automatically determine transport to used to read RSSI.
* commit '
29bfd63d650c25f6858df4c542f37bf4215870d2':
Automatically determine transport to used to read RSSI.
Thomas.TT_Lin [Tue, 26 Aug 2014 06:38:27 +0000 (14:38 +0800)]
Automatically determine transport to used to read RSSI.
Determine the transport to use for BTM_ReadRSSI based on the
device type of the remote device.
Bug:
16694076
Change-Id: I5a591f9d629547b63a750cefd7feb72899922595
Signed-off-by: Thomas.TT_Lin <Thomas.TT_Lin@htc.com>
Wei Wang [Fri, 29 Aug 2014 19:07:25 +0000 (19:07 +0000)]
am
9717638d: Merge "onBatchScanStorageConfigured returns status 12" into lmp-dev
* commit '
9717638d8dda467a6c0aba6afdab176bbb4a840c':
onBatchScanStorageConfigured returns status 12
Andre Eisenbach [Fri, 29 Aug 2014 19:07:13 +0000 (19:07 +0000)]
am
e9ff1332: Merge "Add LE device to inquiry DB before pairing" into lmp-dev
* commit '
e9ff1332e0c74c01be43cbff6daff48a271bcf03':
Add LE device to inquiry DB before pairing
Wei Wang [Fri, 29 Aug 2014 18:49:59 +0000 (18:49 +0000)]
am
6982ce28: Merge "GKI_exception on running longer batch scans" into lmp-dev
* commit '
6982ce28d4f154a7bca453ee6fcae20d94cda78c':
GKI_exception on running longer batch scans
Satya Calloji [Fri, 29 Aug 2014 18:49:58 +0000 (18:49 +0000)]
am
6480b8e3: scanWindow and interval are reversed
* commit '
6480b8e3ec5806083ca16b8a05a37f70b343bf33':
scanWindow and interval are reversed