OSDN Git Service
Andre Eisenbach [Wed, 17 Sep 2014 17:11:32 +0000 (17:11 +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
Wei Wang [Fri, 29 Aug 2014 18:29:03 +0000 (18:29 +0000)]
Merge "onBatchScanStorageConfigured returns status 12" into lmp-dev
Andre Eisenbach [Fri, 29 Aug 2014 18:17:40 +0000 (18:17 +0000)]
Merge "Add LE device to inquiry DB before pairing" into lmp-dev
lungtsai_lin [Fri, 29 Aug 2014 05:47:47 +0000 (13:47 +0800)]
Add LE device to inquiry DB before pairing
There is no remote device type info wgeb OOB pairing LE
devices. Add device type according to transport.
Bug:
17156993
Change-Id: I29182ca13f801f8a7f2c3a95969d6ae23312dd7e
Satya Calloji [Thu, 21 Aug 2014 01:28:13 +0000 (18:28 -0700)]
onBatchScanStorageConfigured returns status 12
Stack changes for handling the API call sequence changes. Please refer buganizer for more details on the API sequence changes
Bug:
16850169
Change-Id: Iabef8247a290d163c1fe03cb853d12678b559664
Wei Wang [Fri, 29 Aug 2014 07:18:02 +0000 (07:18 +0000)]
Merge "GKI_exception on running longer batch scans" into lmp-dev
Satya Calloji [Fri, 22 Aug 2014 00:09:35 +0000 (17:09 -0700)]
scanWindow and interval are reversed
Corrected the byte position for HCI Command
- Set Batch Scan Param sub cmd
bug
17182636
Change-Id: I45045a6e548ed2539d5e43695725883ca1e4ed7a
Satya Calloji [Wed, 13 Aug 2014 20:57:27 +0000 (13:57 -0700)]
GKI_exception on running longer batch scans
Fixed GKI memory leak in btif_gatt_client.c file
besides few needed logic improvements which will
help in preventing leaks on exception conditions
Bug:
16829603
Change-Id: Id39267fbedeb7435cdc2c3a9eda25d4b3cd82c2f
Andre Eisenbach [Tue, 26 Aug 2014 04:55:18 +0000 (04:55 +0000)]
am
f2488f0b: Merge "Protect against potential endless loop in BTU task timer handling" into lmp-dev
* commit '
f2488f0b11720c42fdadec7d9e24a3357c6868db':
Protect against potential endless loop in BTU task timer handling
Andre Eisenbach [Mon, 25 Aug 2014 22:26:35 +0000 (22:26 +0000)]
Merge "Protect against potential endless loop in BTU task timer handling" into lmp-dev
Matthew Xie [Mon, 25 Aug 2014 18:01:54 +0000 (18:01 +0000)]
am
eebf155a: Merge "MAP: SDP corruption" into lmp-dev
* commit '
eebf155a282baedbeb2579cde4e7fafc58d991ab':
MAP: SDP corruption
Matthew Xie [Mon, 25 Aug 2014 17:46:00 +0000 (17:46 +0000)]
Merge "MAP: SDP corruption" into lmp-dev
Matthew Xie [Thu, 21 Aug 2014 06:23:01 +0000 (06:23 +0000)]
am
95450675: Merge "use correct trace debug level" into lmp-dev
* commit '
9545067575252d4d994aef2d090409d6fb32908e':
use correct trace debug level
Matthew Xie [Thu, 21 Aug 2014 06:05:24 +0000 (06:05 +0000)]
Merge "use correct trace debug level" into lmp-dev
Matthew Xie [Wed, 20 Aug 2014 22:40:42 +0000 (15:40 -0700)]
use correct trace debug level
Change-Id: I997f5f9395af6c5da0403dc496317b2bad1683e6
Andre Eisenbach [Wed, 20 Aug 2014 02:10:31 +0000 (19:10 -0700)]
Protect against potential endless loop in BTU task timer handling
Fix potential bug where stale timer list entry causes endless loops in
BTU task. Also added return parameter to GKI_remove_from_timer_list() to
allow breaking out of the BTU timer task look in case the timer list
becomes corrupted.
Bug:
16897789
Change-Id: Ic70cf4346efbb063bbb952ebe7c2f7d0bf395493
Andre Eisenbach [Wed, 20 Aug 2014 00:09:50 +0000 (00:09 +0000)]
am
414a46ae: Merge "LE: Remove general/limited discoverability bits for non-connectable adv" into lmp-dev
* commit '
414a46ae5196b03f62d783cf4a68548991bf0fd0':
LE: Remove general/limited discoverability bits for non-connectable adv
Andre Eisenbach [Tue, 19 Aug 2014 23:49:55 +0000 (23:49 +0000)]
Merge "LE: Remove general/limited discoverability bits for non-connectable adv" into lmp-dev
Casper Bonde [Mon, 18 Aug 2014 10:40:53 +0000 (12:40 +0200)]
MAP: SDP corruption
Terminate strings before parsing to values.
Might be related to:
bug:
16877287
Change-Id: I0c46861229a90f37e266bd06bcba9ac78e3fc155
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
Robert Chiras [Tue, 19 Aug 2014 13:43:26 +0000 (16:43 +0300)]
Correct the OBEX OPP Profile version
Currently, the OPP Profile is registered using version 0x0100 (1.0), but
the initial version of this profile was 1.1. Since, there is no version
1.0, correct the version or this profile to 0x0101 (1.1).
Change-Id: I0befafb3656be5e33a8c9a0853207e53b46851a4
Signed-off-by: Robert Chiras <robert.chiras@intel.com>
Jeff Deng [Mon, 18 Aug 2014 19:33:54 +0000 (19:33 +0000)]
am
8f011bbf: am
390d5386: (-s ours) am
e68188f8: Bluetooth: Restarting PM timer during incoming rfcomm data.
* commit '
8f011bbfa1c8c2fb2d4641860b943c3c55a8afcd':
Bluetooth: Restarting PM timer during incoming rfcomm data.
Andre Eisenbach [Sun, 17 Aug 2014 19:31:13 +0000 (12:31 -0700)]
LE: Remove general/limited discoverability bits for non-connectable adv
According to the Bluetooth spec, section 9.1.1.2, "A device in the
broadcast mode shall not set the ‘LE General Discoverable Mode’
flag or the ‘LE Limited Discoverable Mode’ flag in the Flags AD Type.
This patch masks out the specific bits for non-connectable
advertisements.
Bug:
16924631
Change-Id: Ia2c0011fb31de3e4166a8bd2c2732e50aad3a610
Jeff Deng [Mon, 18 Aug 2014 18:05:56 +0000 (18:05 +0000)]
am
390d5386: (-s ours) am
e68188f8: Bluetooth: Restarting PM timer during incoming rfcomm data.
* commit '
390d53864515a53e177de08ecd3130c89adad87a':
Bluetooth: Restarting PM timer during incoming rfcomm data.
Andre Eisenbach [Sun, 17 Aug 2014 23:48:51 +0000 (23:48 +0000)]
am
7c39dfe3: Fix userial build error for Razor/Mako/Flo
* commit '
7c39dfe3974f8de55d9a3e4410659547ed133c08':
Fix userial build error for Razor/Mako/Flo
Andre Eisenbach [Sun, 17 Aug 2014 23:32:26 +0000 (16:32 -0700)]
Fix userial build error for Razor/Mako/Flo
Change-Id: Ia4ecf38de8a017f5624ab7b32f8ac398de15dee4
Andre Eisenbach [Sun, 17 Aug 2014 22:14:13 +0000 (22:14 +0000)]
am
3313de78: LE: Fix build for devices not support BLE/Privacy
* commit '
3313de78a750e858bea50c5bf54074c551b3137d':
LE: Fix build for devices not support BLE/Privacy
Andre Eisenbach [Sun, 17 Aug 2014 21:58:32 +0000 (14:58 -0700)]
LE: Fix build for devices not support BLE/Privacy
Change-Id: I00951bb14384be4fdc946410f1082963af8ad569
Andre Eisenbach [Sun, 17 Aug 2014 21:12:45 +0000 (21:12 +0000)]
am
a71b1c5a: Merge "Remove IRK entry from controller when LE device is unpaired" into lmp-dev
* commit '
a71b1c5ad79fef103e793e94e9b99b930c03a8a5':
Remove IRK entry from controller when LE device is unpaired
Andre Eisenbach [Sun, 17 Aug 2014 19:13:49 +0000 (19:13 +0000)]
am
c7c4f2a3: Merge "Eliminate userial thread race condition" into lmp-dev
* commit '
c7c4f2a306812f74d771b2ee4dc4e80f8dedadb9':
Eliminate userial thread race condition
Andre Eisenbach [Sun, 17 Aug 2014 20:59:31 +0000 (20:59 +0000)]
Merge "Remove IRK entry from controller when LE device is unpaired" into lmp-dev
Andre Eisenbach [Sun, 17 Aug 2014 18:56:55 +0000 (18:56 +0000)]
Merge "Eliminate userial thread race condition" into lmp-dev
Fred Quintana [Sat, 16 Aug 2014 00:57:07 +0000 (00:57 +0000)]
am
b8e936ab: am
212ffc1d: (-s ours) am
39277ce1: enhance the "invalid rfc slot id" log to include the caller\'s name
* commit '
b8e936ab68d92e6d2720905a9a3b6259f703c8e0':
enhance the "invalid rfc slot id" log to include the caller's name
Fred Quintana [Sat, 16 Aug 2014 00:42:29 +0000 (00:42 +0000)]
am
212ffc1d: (-s ours) am
39277ce1: enhance the "invalid rfc slot id" log to include the caller\'s name
* commit '
212ffc1d3bda659c8da35e10a50091b08db187b6':
enhance the "invalid rfc slot id" log to include the caller's name
Jeff Deng [Sat, 16 Aug 2014 00:02:53 +0000 (00:02 +0000)]
am
e68188f8: Bluetooth: Restarting PM timer during incoming rfcomm data.
* commit '
e68188f83efc681a9a085359a473a2dab3bb94f1':
Bluetooth: Restarting PM timer during incoming rfcomm data.
Jeff Deng [Fri, 15 Aug 2014 23:00:06 +0000 (16:00 -0700)]
Bluetooth: Restarting PM timer during incoming rfcomm data.
During incoming rfcomm data, we were setting the pm mode to
active, thereby stopping timer and never restarting it again.
So it was never going to sniff , if the last packet is incoming
packet. Therefore add change to restart the PM timer during incoming
data.
Bug:
17044698
Change-Id: I4396bb2f267b12cb92a944c15609ddeaa13288ad
Nitin Arora [Wed, 30 Jul 2014 23:41:06 +0000 (16:41 -0700)]
Remove IRK entry from controller when LE device is unpaired
Change-Id: I04f3087a4fb3d715fafcfa91510a48b78d49f27f