OSDN Git Service
Andre Eisenbach [Tue, 29 Jul 2014 20:31:33 +0000 (20:31 +0000)]
am
f705b738: am
5fb6df1f: Merge "LE: Fix problem where pending command is not sent after pairing" into lmp-dev
* commit '
f705b738356e330760fcc01cffaedaa9a13d7289':
LE: Fix problem where pending command is not sent after pairing
Andre Eisenbach [Tue, 29 Jul 2014 20:27:44 +0000 (20:27 +0000)]
am
5fb6df1f: Merge "LE: Fix problem where pending command is not sent after pairing" into lmp-dev
* commit '
5fb6df1f90de6e69f712a07c819468b74a6233ef':
LE: Fix problem where pending command is not sent after pairing
Satya Calloji [Tue, 29 Jul 2014 19:01:16 +0000 (19:01 +0000)]
am
4e367aa3: am
efaddcb2: Bug
16498557 Inconsistent energy reporting
* commit '
4e367aa328d8d4dde0e51dd831214492437a4719':
Bug
16498557 Inconsistent energy reporting
Satya Calloji [Tue, 29 Jul 2014 18:37:57 +0000 (18:37 +0000)]
am
efaddcb2: Bug
16498557 Inconsistent energy reporting
* commit '
efaddcb2cec21bfcdcadfa86720d3ca720a4253d':
Bug
16498557 Inconsistent energy reporting
Satya Calloji [Tue, 29 Jul 2014 06:22:05 +0000 (23:22 -0700)]
Bug
16498557 Inconsistent energy reporting
Fix for inconsistent energy reporting
Change-Id: Iddd77354624a631ca8db52f12086d3afa5751d36
Nitin Shivpure [Mon, 28 Jul 2014 23:35:41 +0000 (23:35 +0000)]
am
cc37fe4c: (-s ours) am
e85eb5a7: Bluetooth: Cleaning up pan_conn DB, if connection is not successful. - do not merge
* commit '
cc37fe4c41d35d152a8b6ef5e3b240bb920f47e9':
Bluetooth: Cleaning up pan_conn DB, if connection is not successful. - do not merge
Hemant Gupta [Mon, 28 Jul 2014 23:34:50 +0000 (23:34 +0000)]
am
c8743760: (-s ours) am
76f645ea: Bluetooth: Update security for HID Devices to Encrypt on BT On. - do not merge
* commit '
c87437601294d74a7758471fc09cb5d16b37645b':
Bluetooth: Update security for HID Devices to Encrypt on BT On. - do not merge
Hemant Gupta [Mon, 28 Jul 2014 23:34:04 +0000 (23:34 +0000)]
am
e5c905f0: (-s ours) am
554485a6: Bluetooth: Getbuf returning invalid buffer pointer - do not merge
* commit '
e5c905f0afad8a48f20d23a773b85851b556d2ee':
Bluetooth: Getbuf returning invalid buffer pointer - do not merge
Matthew Xie [Mon, 28 Jul 2014 23:34:03 +0000 (23:34 +0000)]
am
1b5dd19d: (-s ours) am
68732140: Merge "PM: Stop Power Manager Timer if in sniff mode - do not merge" into lmp-dev
* commit '
1b5dd19dbd524754e0d53476b8df76cafa177095':
PM: Stop Power Manager Timer if in sniff mode - do not merge
Nitin Shivpure [Mon, 28 Jul 2014 23:16:20 +0000 (23:16 +0000)]
am
e85eb5a7: Bluetooth: Cleaning up pan_conn DB, if connection is not successful. - do not merge
* commit '
e85eb5a7c3ea7eaca09cbb33920435d809b4dd3d':
Bluetooth: Cleaning up pan_conn DB, if connection is not successful. - do not merge
Hemant Gupta [Mon, 28 Jul 2014 22:53:22 +0000 (22:53 +0000)]
am
76f645ea: Bluetooth: Update security for HID Devices to Encrypt on BT On. - do not merge
* commit '
76f645ea6f5cd22e464dcbdb1e73ecb50c5ea87c':
Bluetooth: Update security for HID Devices to Encrypt on BT On. - do not merge
Hemant Gupta [Mon, 28 Jul 2014 22:00:25 +0000 (22:00 +0000)]
am
554485a6: Bluetooth: Getbuf returning invalid buffer pointer - do not merge
* commit '
554485a60e73aa5ce6e05242f817b3c05bc45eb3':
Bluetooth: Getbuf returning invalid buffer pointer - do not merge
Matthew Xie [Mon, 28 Jul 2014 22:00:24 +0000 (22:00 +0000)]
am
68732140: Merge "PM: Stop Power Manager Timer if in sniff mode - do not merge" into lmp-dev
* commit '
68732140f7a0b3b982eaee6065eabd201fa94286':
PM: Stop Power Manager Timer if in sniff mode - do not merge
Nitin Shivpure [Thu, 3 Oct 2013 13:36:12 +0000 (19:06 +0530)]
Bluetooth: Cleaning up pan_conn DB, if connection is not successful. - do not merge
A case where DUT is paired with remoteDeviceA & remoteDeviceB.
remoteDeviceA is not pagable(turned off or some other reason).
DUT(PANU) try to connect remoteDeviceA(NAP). But connection is
unsuccessful, Because remoteDeviceA is not pagable, In this scenario
btpan_conn Database is not cleaning up at btif layer. Later
remoteDeviceB(PANU) connect to DUT(NAP) & connection is succesful,
When remoteDeviceB disconnect existing connection. As database
still has remoteDeviceA BD address at Btif layer. remoteDeviceA
BD address is passed instead of remoteDeviceB BD address from Btif
to UI. So remoteDeviceB still shows connected on UI. Cleaning up
pan_conn database for particular pan connection at BTIF layer,
whichever connection is not successful will solve this issue.
Change-Id: I31dfe3ef46295e74bbfb57563e4fd4fc7155f006
Hemant Gupta [Thu, 29 Aug 2013 10:16:49 +0000 (15:46 +0530)]
Bluetooth: Update security for HID Devices to Encrypt on BT On. - do not merge
This patch updates HID Devices security mask to BTA_SEC_ENCRYPT from
BTA_SEC_NONE. Without this change it was observed that on BT Reset,
authentication and encryption were not initiated by DUT for incoming
HID Control L2CAP Connection Request from remote HID Keyboard device.
Change-Id: I484fbae1294fde386bd7959467214f9968e381e9
Hemant Gupta [Fri, 12 Jul 2013 14:35:54 +0000 (20:05 +0530)]
Bluetooth: Getbuf returning invalid buffer pointer - do not merge
Getbuff is checking for the pool which can accommodate
requested size, but is changing the pool with a restricted
check and not checking for the free memory size in that pool.
Added a check to avoid returng the wrong pool free buf pointer.
Without this patch, SDP Codenomicon TestSuite crash is observed
on Bluedroid stack.
Change-Id: Id66d460c5a40d8c3208438d7cfaf729e9b355184
Eric Laurent [Mon, 28 Jul 2014 21:12:34 +0000 (21:12 +0000)]
am
07b560f1: am
ac7e0423: Merge "audio HAL: add parameters to open stream functions" into lmp-dev
* commit '
07b560f1de507bcfbf6ee1ea22eba8449dfbe252':
audio HAL: add parameters to open stream functions
Eric Laurent [Mon, 28 Jul 2014 21:05:22 +0000 (21:05 +0000)]
am
ac7e0423: Merge "audio HAL: add parameters to open stream functions" into lmp-dev
* commit '
ac7e04235b3a6d54be8bbc6901ca0ad4a5d18f68':
audio HAL: add parameters to open stream functions
Andre Eisenbach [Tue, 29 Jul 2014 20:18:30 +0000 (20:18 +0000)]
Merge "LE: Fix problem where pending command is not sent after pairing" into lmp-dev
Andre Eisenbach [Fri, 25 Jul 2014 22:46:21 +0000 (15:46 -0700)]
LE: Fix problem where pending command is not sent after pairing
If a read/write or other operation triggers SMP pairing with a remote
device, the operation should complete once pairing has finished. This
patch fixes a bug where the pending command was not sent after pairing.
Bug:
16405565
Change-Id: Idb2e54931c71b0a9e009cac318712eb9f5c7e15a
Adam Hampson [Mon, 28 Jul 2014 15:59:12 +0000 (15:59 +0000)]
am
8a3e9c70: am
9b57f080: Bluetooth: DIS: Only read the requested DIS characteristics
* commit '
8a3e9c70a1149885c47e5d0d0168db0b8f5bb939':
Bluetooth: DIS: Only read the requested DIS characteristics
Adam Hampson [Mon, 28 Jul 2014 15:52:44 +0000 (15:52 +0000)]
am
9b57f080: Bluetooth: DIS: Only read the requested DIS characteristics
* commit '
9b57f0802ec52f9169ebbd164c6f104724190ec1':
Bluetooth: DIS: Only read the requested DIS characteristics
Adam Hampson [Fri, 25 Jul 2014 20:39:11 +0000 (13:39 -0700)]
Bluetooth: DIS: Only read the requested DIS characteristics
The BLE HID code only uses the PNP_ID characteristic from DIS.
Previously the DIS client would read all DIS characteristics
when a read request was made. This change allows the DIS user to
request certain DIS characteristics.
Bug:
16521059
Change-Id: I09c24718bb2e2da73c518b64c3cbdd07e7d6cf27
Signed-off-by: Adam Hampson <ahampson@google.com>
Satya Calloji [Fri, 25 Jul 2014 23:21:32 +0000 (23:21 +0000)]
am
8d723699: am
6e2d9db5: Settings app does not show BLE devices
* commit '
8d723699e0291dd1fc976e82d1f957746b8946eb':
Settings app does not show BLE devices
Satya Calloji [Fri, 25 Jul 2014 23:16:52 +0000 (23:16 +0000)]
am
6e2d9db5: Settings app does not show BLE devices
* commit '
6e2d9db5148176d88d7f48c3b2ad5b27c57ca14d':
Settings app does not show BLE devices
Satya Calloji [Tue, 8 Jul 2014 23:18:58 +0000 (16:18 -0700)]
Settings app does not show BLE devices
Settings does not show all BLE devices when scan filter is set
Change-Id: I669ef3b87a9a21dfce26c1e22b5d984a5ea6f75c
Sharvil Nanavati [Thu, 24 Jul 2014 23:51:52 +0000 (23:51 +0000)]
am
a65c5ac4: am
fb3fca63: Merge "Work around race condition between thread shutdown and vendor lib shutdown." into lmp-dev
* commit '
a65c5ac45a0308959147a7d9137c77bf79c92b6e':
Work around race condition between thread shutdown and vendor lib shutdown.
Matthew Xie [Thu, 24 Jul 2014 23:51:51 +0000 (23:51 +0000)]
am
2c9e068e: am
f2c9280a: Merge "Increase BLE background scan window for faster re-connection" into lmp-dev
* commit '
2c9e068e3ef1038bf4b0dd806b9a5a014e0ce866':
Increase BLE background scan window for faster re-connection
Sharvil Nanavati [Thu, 24 Jul 2014 23:35:16 +0000 (23:35 +0000)]
am
fb3fca63: Merge "Work around race condition between thread shutdown and vendor lib shutdown." into lmp-dev
* commit '
fb3fca6325b07604790475612189438325b2cd59':
Work around race condition between thread shutdown and vendor lib shutdown.
Matthew Xie [Thu, 24 Jul 2014 23:34:09 +0000 (23:34 +0000)]
am
f2c9280a: Merge "Increase BLE background scan window for faster re-connection" into lmp-dev
* commit '
f2c9280a1c7647c06278f31738575caf1b85027e':
Increase BLE background scan window for faster re-connection
Matthew Xie [Mon, 28 Jul 2014 21:36:50 +0000 (21:36 +0000)]
Merge "PM: Stop Power Manager Timer if in sniff mode - do not merge" into lmp-dev
Hemant Gupta [Thu, 12 Jun 2014 07:49:15 +0000 (13:19 +0530)]
PM: Stop Power Manager Timer if in sniff mode - do not merge
Power manager timer is started when ACL link is in active mode
depending on profile connected. This timer was never stopped
when link was put in sniff mode by remote device preventing
system from going to sleep since timer is still active resulting
in extra power consumption.
Change-Id: I7569eed3ad7e0487e411377977b4f0671f24df12
Eric Laurent [Mon, 28 Jul 2014 20:57:10 +0000 (20:57 +0000)]
Merge "audio HAL: add parameters to open stream functions" into lmp-dev
Eric Laurent [Mon, 28 Jul 2014 00:27:35 +0000 (17:27 -0700)]
audio HAL: add parameters to open stream functions
Pass device address (and audio source for inputs) to
open_output_stream() and open_input_stream() audio HAL functions.
Bug:
14815883.
Change-Id: I4f66478606349ab64d880923c53de00a11d74d25
Prerepa Viswanadham [Thu, 24 Jul 2014 20:00:33 +0000 (20:00 +0000)]
am
4608e564: am
81b03192: Fix build for non BLE supported targets(nakasi and manta)
* commit '
4608e564714cb1ee5cd960649f2a1add4fb856db':
Fix build for non BLE supported targets(nakasi and manta)
Prerepa Viswanadham [Thu, 24 Jul 2014 19:47:17 +0000 (19:47 +0000)]
am
81b03192: Fix build for non BLE supported targets(nakasi and manta)
* commit '
81b03192d4284acc7c9903f5b183927797dceca4':
Fix build for non BLE supported targets(nakasi and manta)
Sharvil Nanavati [Thu, 24 Jul 2014 21:08:55 +0000 (21:08 +0000)]
Merge "Work around race condition between thread shutdown and vendor lib shutdown." into lmp-dev
Sharvil Nanavati [Thu, 24 Jul 2014 16:07:36 +0000 (09:07 -0700)]
Work around race condition between thread shutdown and vendor lib shutdown.
This race condition occurs because of a structural bug - the userial
thread depends on the HCI thread and the HCI thread depends on the
userial thread but both are independently owned and torn down. This
change fixes a crash bug due to the race condition (NULL pointer
access in userial thread).
http://b/
16483216
Change-Id: I91ea274856ac72e9d72b92f0dc5c94e53aaf22f4
Matthew Xie [Thu, 24 Jul 2014 19:12:45 +0000 (19:12 +0000)]
Merge "Increase BLE background scan window for faster re-connection" into lmp-dev
Matthew Xie [Thu, 24 Jul 2014 18:20:50 +0000 (11:20 -0700)]
Increase BLE background scan window for faster re-connection
The scan window is increased from 11.25ms to 30ms.
The scan duty cycle is still very low at 2.34% while user experience
is greatly improved.
bug
16521059
Change-Id: Ice37c54fdc7d852fd19709112075e7492b6a1480
Prerepa Viswanadham [Thu, 24 Jul 2014 00:49:48 +0000 (17:49 -0700)]
Fix build for non BLE supported targets(nakasi and manta)
Change-Id: I0de46e1dfce3a51367bc0e2640e91cdefc8a21c6
Satya Calloji [Wed, 23 Jul 2014 19:12:25 +0000 (19:12 +0000)]
am
57e8def9: am
e5ba8841: LE energy info feature
* commit '
57e8def9fc74161c5cc52db744f5faf4a0643955':
LE energy info feature
Satya Calloji [Wed, 23 Jul 2014 19:05:47 +0000 (19:05 +0000)]
am
e5ba8841: LE energy info feature
* commit '
e5ba8841cd39e17c05aeb4ab65b5b761d41577da':
LE energy info feature
Satya Calloji [Fri, 4 Jul 2014 00:18:02 +0000 (17:18 -0700)]
LE energy info feature
Stack and BT-IF changes for LE energy feature
Change-Id: I671e63aaead210c6352b45a5e20ad5e4bbbb77b7
Andre Eisenbach [Tue, 22 Jul 2014 17:32:45 +0000 (17:32 +0000)]
am
98b097bc: am
25067c0a: Fix integer overflow in GKI timer calculation
* commit '
98b097bcd58bb54e4784a9a74b74a9ad408cdb1b':
Fix integer overflow in GKI timer calculation
Andre Eisenbach [Tue, 22 Jul 2014 17:17:47 +0000 (17:17 +0000)]
am
25067c0a: Fix integer overflow in GKI timer calculation
* commit '
25067c0afc4d3ed95181b91801d3d638d9aa3f8f':
Fix integer overflow in GKI timer calculation
Andre Eisenbach [Mon, 21 Jul 2014 23:52:28 +0000 (16:52 -0700)]
Fix integer overflow in GKI timer calculation
Fix an integer overflow in the GKI timer elapsed time calculation that
would cause Bluetooth Stereo Audio (A2DP) playback to stop suddenly
after a period of INT32_MAX microseconds (about 35 minutes) of
continuous uptime of the phone/tablet.
Bug:
16412377
Change-Id: I28cd3155a23444e41b26b3f3b8424cc2a3c5bf91
Andre Eisenbach [Mon, 21 Jul 2014 19:24:14 +0000 (19:24 +0000)]
am
bed76f2b: am
5904e099: Merge "Fix A2DP audio playback problem" into lmp-dev
* commit '
bed76f2b1a2c247e66c917d480cc7ae4caaae4e0':
Fix A2DP audio playback problem
Mike J. Chen [Mon, 21 Jul 2014 19:23:47 +0000 (19:23 +0000)]
am
1cf5df83: am
81cc400b: Merge "Make auto connect work for multiple known BLE devices" into lmp-dev
* commit '
1cf5df83cc081dd7f48a8d9de355c51d0a1b7341':
Make auto connect work for multiple known BLE devices
Elliott Hughes [Mon, 21 Jul 2014 18:21:56 +0000 (18:21 +0000)]
am
4de1d0da: am
e86822ea: Merge "Fix implicit declaration of function \'prctl\' in bluedroid." into lmp-dev
* commit '
4de1d0da21b18b3c6d8616b778cc811a09980aab':
Fix implicit declaration of function 'prctl' in bluedroid.
Prerepa Viswanadham [Mon, 21 Jul 2014 18:21:56 +0000 (18:21 +0000)]
am
2c28102a: am
4c94c5f9: Fix build: Revert the reversion done due to build failure. original commit id:
347a1d64c7a9c345793c61b03bdcaa31ad8e5678 revert commit id:
571c81ed119833b5e5cbd6bedffd7409a10be21d
* commit '
2c28102ab7ac9e54fb6023e67bca76ea7cfa3a6a':
Fix build: Revert the reversion done due to build failure. original commit id:
347a1d64c7a9c345793c61b03bdcaa31ad8e5678 revert commit id:
571c81ed119833b5e5cbd6bedffd7409a10be21d
Andre Eisenbach [Mon, 21 Jul 2014 18:10:19 +0000 (18:10 +0000)]
am
5904e099: Merge "Fix A2DP audio playback problem" into lmp-dev
* commit '
5904e0995c83bbfd094a8e26a0ae6eb41eb0de27':
Fix A2DP audio playback problem
Mike J. Chen [Mon, 21 Jul 2014 17:32:30 +0000 (17:32 +0000)]
am
81cc400b: Merge "Make auto connect work for multiple known BLE devices" into lmp-dev
* commit '
81cc400b75694d9ddccf740f73cfef15222983c6':
Make auto connect work for multiple known BLE devices
Andre Eisenbach [Mon, 21 Jul 2014 17:57:47 +0000 (17:57 +0000)]
Merge "Fix A2DP audio playback problem" into lmp-dev
Andre Eisenbach [Sat, 19 Jul 2014 01:43:18 +0000 (18:43 -0700)]
Fix A2DP audio playback problem
With some A2DP headphones/car kits an issue was observed where the SBC
codec could not be initialized correctly and thus no audio was heard
over A2DP. This change fixes a variable initialization issue that
prevented the request for capabilities from being sent to the remote
device.
Change-Id: Ic55da0dbe5abd1e5bb89c8305b0a4c1f06b60a65
Elliott Hughes [Sun, 20 Jul 2014 17:59:56 +0000 (17:59 +0000)]
am
e86822ea: Merge "Fix implicit declaration of function \'prctl\' in bluedroid." into lmp-dev
* commit '
e86822ea2f896b92cbb98af849cfbed8c7c49223':
Fix implicit declaration of function 'prctl' in bluedroid.
Prerepa Viswanadham [Sun, 20 Jul 2014 17:59:55 +0000 (17:59 +0000)]
am
4c94c5f9: Fix build: Revert the reversion done due to build failure. original commit id:
347a1d64c7a9c345793c61b03bdcaa31ad8e5678 revert commit id:
571c81ed119833b5e5cbd6bedffd7409a10be21d
* commit '
4c94c5f9fc2c3102c52706fd5bb4cd8d065e5716':
Fix build: Revert the reversion done due to build failure. original commit id:
347a1d64c7a9c345793c61b03bdcaa31ad8e5678 revert commit id:
571c81ed119833b5e5cbd6bedffd7409a10be21d
Matthew Xie [Sun, 20 Jul 2014 02:27:32 +0000 (02:27 +0000)]
am
3a7e2c2e: am
1ef4ba48: Merge "Bluetooth: fix the HOGP device(iBUFFALO BSMBB09DS) pair and reconnect problem." into lmp-dev
* commit '
3a7e2c2e982fed90e956377073d324eacac9844f':
Bluetooth: fix the HOGP device(iBUFFALO BSMBB09DS) pair and reconnect problem.
Matthew Xie [Sun, 20 Jul 2014 02:19:10 +0000 (02:19 +0000)]
am
1ef4ba48: Merge "Bluetooth: fix the HOGP device(iBUFFALO BSMBB09DS) pair and reconnect problem." into lmp-dev
* commit '
1ef4ba488d259f6523b6e650fb80820d3a363302':
Bluetooth: fix the HOGP device(iBUFFALO BSMBB09DS) pair and reconnect problem.
Elliott Hughes [Sat, 19 Jul 2014 00:19:54 +0000 (00:19 +0000)]
am
dca16562: am
3b404009: Merge "Fix implicit declaration of function \'prctl\' in bluedroid."
* commit '
dca1656289693afd75c886d2c2820c381964ffed':
Fix implicit declaration of function 'prctl' in bluedroid.
Elliott Hughes [Sat, 19 Jul 2014 00:16:02 +0000 (00:16 +0000)]
am
3b404009: Merge "Fix implicit declaration of function \'prctl\' in bluedroid."
* commit '
3b4040093ddf0e0025d0dd034aa65078bb695514':
Fix implicit declaration of function 'prctl' in bluedroid.
Prerepa Viswanadham [Fri, 18 Jul 2014 22:20:54 +0000 (15:20 -0700)]
Fix build: Revert the reversion done due to build failure.
original commit id:
347a1d64c7a9c345793c61b03bdcaa31ad8e5678
revert commit id:
571c81ed119833b5e5cbd6bedffd7409a10be21d
Fix builds: Revert "Added code to publish ble adv tx power in dBm""
This reverts commit
571c81ed119833b5e5cbd6bedffd7409a10be21d.
Change-Id: I2afeeaa4b52aa449e54115fd5f816a7a949d2ea8
Chris Manton [Fri, 18 Jul 2014 22:15:31 +0000 (22:15 +0000)]
am
227f6b08: Initialize stack variable to eliminate warning
* commit '
227f6b08abb4e786a8951dde128388cd025ee63f':
Initialize stack variable to eliminate warning
Chris Manton [Fri, 18 Jul 2014 22:15:31 +0000 (22:15 +0000)]
am
e2e1d88a: Remove extraneous field inherited from parent makefile
* commit '
e2e1d88a34e1d9d9e164136bdc6a5288fe78ffbf':
Remove extraneous field inherited from parent makefile
Chris Manton [Fri, 18 Jul 2014 20:41:32 +0000 (13:41 -0700)]
Initialize stack variable to eliminate warning
Change-Id: I4f4843da796d3c2b0aed3130b88d947491a341d0
Chris Manton [Fri, 18 Jul 2014 19:55:34 +0000 (12:55 -0700)]
Remove extraneous field inherited from parent makefile
Change-Id: I0d0bc0c5ed508f2d94c5644cb3b0f823bae5d83a
Andre Eisenbach [Fri, 18 Jul 2014 19:42:45 +0000 (19:42 +0000)]
am
52a2cd60: LE: Add connection parameter update request API (2/4)
* commit '
52a2cd609897c04bb6440e14ef2ec8871143d028':
LE: Add connection parameter update request API (2/4)
Andre Eisenbach [Thu, 17 Jul 2014 05:59:45 +0000 (22:59 -0700)]
LE: Add connection parameter update request API (2/4)
Change-Id: I131bfa7fb0a8cc970e1ac3e26e9d86ed2bee80a7
Matthew Xie [Fri, 18 Jul 2014 23:26:52 +0000 (23:26 +0000)]
Merge "Bluetooth: fix the HOGP device(iBUFFALO BSMBB09DS) pair and reconnect problem." into lmp-dev
Thomas.TT_Lin [Fri, 18 Jul 2014 04:10:59 +0000 (12:10 +0800)]
Bluetooth: fix the HOGP device(iBUFFALO BSMBB09DS) pair and reconnect problem.
in bta_hh_le.c (fix reconnect issue)
Since new LE security flags are import, (BTM_SEC_LE_AUTHENTICATED, BTM_SEC_LE_ENCRYPTED,
BTM_SEC_LE_NAME_KNOWN, BTM_SEC_LE_LINK_KEY_KNOWN, BTM_SEC_LE_LINK_KEY_AUTHED),
we have to use new BTM_GetSecurityFlagsByTransport() function with LE transport to get right sec_flag,
or will cause cannot correctly add to white list and cause reconnect fail.
in btif_dm.c (fix HOGP mouse pair issue)
the HOGP mouse will become abnormal if we update connection parameter too many times.
Therefore the is_hid case is not suitable for HOGP mouse,
it will trigger call to L2CA_EnableUpdateBleConnParams() several times due to service discovery and bonded state.
L2CA_EnableUpdateBleConnParams() update connection cause mouse abnormal.
The change will make the flow: complete bonding procedure first, then do service discovery, connect to mouse.
in gap_ble.c (fix HOGP device pair issue)
After pairing status is bonded, host start to create ATT layer to get some information from HOGP device.
If host send "disconnect" command during period. Device will stop to feedback anything.
Suggest to delete it.
in smp_act.c (fix HOGP device pair issue)
update connection parameter too many times may cause mouse abnormal,
so remove this code since this will be called again after service discovery.
Suggest to delete it.
Change-Id: I4b722343c2b08d33530bc6b928bc9ffe89fd09e9
Signed-off-by: Thomas.TT_Lin <Thomas.TT_Lin@htc.com>
Ed Heyl [Fri, 18 Jul 2014 13:13:53 +0000 (13:13 +0000)]
am
571c81ed: Fix builds: Revert "Added code to publish ble adv tx power in dBm"
* commit '
571c81ed119833b5e5cbd6bedffd7409a10be21d':
Fix builds: Revert "Added code to publish ble adv tx power in dBm"
Ed Heyl [Fri, 18 Jul 2014 08:05:38 +0000 (08:05 +0000)]
Fix builds: Revert "Added code to publish ble adv tx power in dBm"
This reverts commit
347a1d64c7a9c345793c61b03bdcaa31ad8e5678.
Change-Id: If62571a3f5bd87d04e5643855c9fea1b8048aa5a
git-zhenye.broadcom.com [Fri, 18 Jul 2014 02:57:58 +0000 (02:57 +0000)]
am
347a1d64: Added code to publish ble adv tx power in dBm
* commit '
347a1d64c7a9c345793c61b03bdcaa31ad8e5678':
Added code to publish ble adv tx power in dBm
Sharvil Nanavati [Fri, 18 Jul 2014 02:57:57 +0000 (02:57 +0000)]
am
e0cdd339: Fix build warning about unused argument.
* commit '
e0cdd3399119823e2f1ec75161c1cf67829651bf':
Fix build warning about unused argument.
Michael Wright [Fri, 18 Jul 2014 00:37:50 +0000 (00:37 +0000)]
am
1afbe154: Fix string format error for 64-bit builds
* commit '
1afbe154a89ad462de739704ce70eed0e32cbc00':
Fix string format error for 64-bit builds
Sharvil Nanavati [Thu, 17 Jul 2014 23:53:24 +0000 (23:53 +0000)]
am
696791a3: Merge "A simple, thread-safe timer API for bluedroid." into lmp-dev
* commit '
696791a3d97e97d4f13c27fa7df302b4cd030d46':
A simple, thread-safe timer API for bluedroid.
Sharvil Nanavati [Thu, 17 Jul 2014 23:53:24 +0000 (23:53 +0000)]
am
2fbe6fab: Merge "Revert "Revert "Clean up messy dispatch in bt_hci_bdroid by using new primitives.""" into lmp-dev
* commit '
2fbe6fabe75e4c7967d2645797353ba1394f3a20':
Revert "Revert "Clean up messy dispatch in bt_hci_bdroid by using new primitives.""
git-zhenye.broadcom.com [Wed, 16 Jul 2014 00:32:21 +0000 (17:32 -0700)]
Added code to publish ble adv tx power in dBm
Bug
15412969
Sharvil Nanavati [Thu, 17 Jul 2014 22:45:40 +0000 (15:45 -0700)]
Fix build warning about unused argument.
Change-Id: I3ae26dfc4ffd97d039386f55e3290a6cf36ae17d
Elliott Hughes [Sat, 19 Jul 2014 00:09:05 +0000 (00:09 +0000)]
Merge "Fix implicit declaration of function 'prctl' in bluedroid."
Elliott Hughes [Sat, 19 Jul 2014 00:07:51 +0000 (17:07 -0700)]
Fix implicit declaration of function 'prctl' in bluedroid.
Change-Id: I288dd19bd478a3ff716d4f7f4179cc2b7574473a
Michael Wright [Thu, 17 Jul 2014 21:45:58 +0000 (14:45 -0700)]
Fix string format error for 64-bit builds
Change-Id: Idefad9d9ea3a54f7f412e80c4998137d15a1b23c
Elliott Hughes [Sat, 19 Jul 2014 00:11:17 +0000 (00:11 +0000)]
Merge "Fix implicit declaration of function 'prctl' in bluedroid." into lmp-dev
Elliott Hughes [Sat, 19 Jul 2014 00:07:51 +0000 (17:07 -0700)]
Fix implicit declaration of function 'prctl' in bluedroid.
(cherry picked from commit
d356ffbf6f6095489c73266e6e591b1167cfa5e6)
Change-Id: Icc160c758c126e48fd6490cd14211a8685e4cdba
Mike J. Chen [Mon, 21 Jul 2014 17:22:28 +0000 (17:22 +0000)]
Merge "Make auto connect work for multiple known BLE devices" into lmp-dev
Mike J. Chen [Sat, 19 Jul 2014 00:40:12 +0000 (17:40 -0700)]
Make auto connect work for multiple known BLE devices
Due to a bug with wl_state not ever setting WL_INIT,
auto connect was not working for more than one known
BLE device after a reboot. The fix is to set the WL_INIT
flag when in initiator state.
I also added code to set the WL_SCAN flag when in
scanning state. Not sure if that fixes any bug but
it looks like it should have been done too.
WL_ADV was the only state flag previously being set.
Bug
16404692
Change-Id: Id42907c0d8301e347e603684e2c03e4905bfec49
Signed-off-by: Mike J. Chen <mjchen@google.com>
Glenn Kasten [Thu, 17 Jul 2014 18:23:28 +0000 (18:23 +0000)]
am
b62769de: Merge "Add audio_input_flags_t to HAL open_input_stream" into lmp-dev
* commit '
b62769de1683b58eb23a1bb5ca7106e77a642f37':
Add audio_input_flags_t to HAL open_input_stream
Andre Eisenbach [Thu, 17 Jul 2014 18:23:15 +0000 (18:23 +0000)]
am
0eb7f497: Merge "Fix GKI_add_to_timer_list to handle middle-of-list insertions correctly" into lmp-dev
* commit '
0eb7f49738d2d6c12f3db77b74d9e404180e9a3f':
Fix GKI_add_to_timer_list to handle middle-of-list insertions correctly
Svetoslav Ganov [Thu, 17 Jul 2014 18:23:14 +0000 (18:23 +0000)]
am
dd29f036: Revert "Clean up messy dispatch in bt_hci_bdroid by using new primitives."
* commit '
dd29f036a8cde94b3c296fb08ee3e9b2d65c15e0':
Revert "Clean up messy dispatch in bt_hci_bdroid by using new primitives."
Sharvil Nanavati [Thu, 17 Jul 2014 18:15:42 +0000 (18:15 +0000)]
am
3f9fbe74: Clean up messy dispatch in bt_hci_bdroid by using new primitives.
* commit '
3f9fbe74c1d6e774d3f21275515c7b895715aec5':
Clean up messy dispatch in bt_hci_bdroid by using new primitives.
Sharvil Nanavati [Thu, 17 Jul 2014 18:15:42 +0000 (18:15 +0000)]
am
94347a59: Extend the threading library to back thread with an event queue.
* commit '
94347a59972868cf6d74f92cf793eb0b4b97c45a':
Extend the threading library to back thread with an event queue.
Sharvil Nanavati [Thu, 17 Jul 2014 18:15:41 +0000 (18:15 +0000)]
am
ab606b5e: Expose enqueue/dequeue file descriptors for fixed_queue.
* commit '
ab606b5ecd59ab9fd8a59cf4437993a44068a6ee':
Expose enqueue/dequeue file descriptors for fixed_queue.
Sharvil Nanavati [Thu, 17 Jul 2014 21:00:17 +0000 (21:00 +0000)]
Merge "Revert "Revert "Clean up messy dispatch in bt_hci_bdroid by using new primitives.""" into lmp-dev
Sharvil Nanavati [Thu, 17 Jul 2014 07:53:01 +0000 (00:53 -0700)]
Revert "Revert "Clean up messy dispatch in bt_hci_bdroid by using new primitives.""
Original code broke the build for razor-eng, updated the code to fix break.
This reverts commit
dd29f036a8cde94b3c296fb08ee3e9b2d65c15e0.
Change-Id: I2d2f9b5b51b923e3f0e8092b3169ea447193887d
Sharvil Nanavati [Thu, 17 Jul 2014 21:24:30 +0000 (21:24 +0000)]
Merge "A simple, thread-safe timer API for bluedroid." into lmp-dev
Sharvil Nanavati [Wed, 2 Jul 2014 01:42:56 +0000 (18:42 -0700)]
A simple, thread-safe timer API for bluedroid.
Change-Id: I5fa21b48506e4d1d65da4b8bedbbf39e03dad559
Sharvil Nanavati [Thu, 17 Jul 2014 06:37:09 +0000 (06:37 +0000)]
am
81173491: Merge "Bluetooth: Cleaning up pan_conn DB, if connection is not successful." into klp-wireless-dev
* commit '
81173491454e47a0a24ab30fae0b59248516e844':
Bluetooth: Cleaning up pan_conn DB, if connection is not successful.
Svetoslav Ganov [Thu, 17 Jul 2014 00:26:24 +0000 (00:26 +0000)]
Revert "Clean up messy dispatch in bt_hci_bdroid by using new primitives."
This change broke the build. Reverting to unblock people waiting for a green build to start working.
This reverts commit
3f9fbe74c1d6e774d3f21275515c7b895715aec5.
Change-Id: I58c3bdcc2f5f3fe744b8d3f80753566cf1d22bd1
Glenn Kasten [Thu, 17 Jul 2014 15:18:33 +0000 (15:18 +0000)]
Merge "Add audio_input_flags_t to HAL open_input_stream" into lmp-dev
Glenn Kasten [Thu, 17 Jul 2014 14:33:51 +0000 (07:33 -0700)]
Add audio_input_flags_t to HAL open_input_stream
Change-Id: I5023c0fdb8069668ca2b84096277d6abdbf7d729