OSDN Git Service
Hansong Zhang [Fri, 12 Jan 2018 19:59:29 +0000 (19:59 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd am:
40f7822e27 am:
98916aaef5 am:
932e2eb358 -s ours am:
7af6f1b8e8 -s ours am:
944510e511 -s ours am:
c1faf30a21 -s ours am:
36953b6d59 -s ours am:
b362d4a7c4 -s ours am:
a6e99393c0 -s ours
am:
bb1ae12d87 -s ours
Change-Id: I3819c04036936484c63834d92bf91015c21026b8
Hansong Zhang [Fri, 12 Jan 2018 19:53:57 +0000 (19:53 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd am:
40f7822e27 am:
98916aaef5 am:
932e2eb358 -s ours am:
7af6f1b8e8 -s ours am:
944510e511 -s ours am:
c1faf30a21 -s ours am:
36953b6d59 -s ours am:
b362d4a7c4 -s ours
am:
a6e99393c0 -s ours
Change-Id: I1a26164dff6597977b169df7aacb9944d7fa97bc
Hansong Zhang [Fri, 12 Jan 2018 19:48:44 +0000 (19:48 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd am:
40f7822e27 am:
98916aaef5 am:
932e2eb358 -s ours am:
7af6f1b8e8 -s ours am:
944510e511 -s ours am:
c1faf30a21 -s ours am:
36953b6d59 -s ours
am:
b362d4a7c4 -s ours
Change-Id: Ib18630193e0f5c2309864ab6062476f83833ea7a
Hansong Zhang [Fri, 12 Jan 2018 19:42:51 +0000 (19:42 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd am:
40f7822e27 am:
98916aaef5 am:
932e2eb358 -s ours am:
7af6f1b8e8 -s ours am:
944510e511 -s ours am:
c1faf30a21 -s ours
am:
36953b6d59 -s ours
Change-Id: I20a0e4275a33d1fee0e78c9c72cfe2147e9e373d
Hansong Zhang [Fri, 12 Jan 2018 19:38:53 +0000 (19:38 +0000)]
Merge "Fix unexpected behavior in reading BNEP packets" into oc-dev am:
1e2a61923b
am:
0c6cf602d2
Change-Id: Ie8c0ba790a96f01008596e79b36168dbd8a1157e
Hansong Zhang [Fri, 12 Jan 2018 19:38:33 +0000 (19:38 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev am:
6e677aab4a am:
bd83a19885 am:
956bb8e1fb am:
552786c50f am:
4b94d30c60 -s ours am:
e3614bb6d7
am:
a4f48e4e8d
Change-Id: Ic3ba5fe4ce4c157a568dd164ff3cf1a2fbbe4f1f
Hansong Zhang [Fri, 12 Jan 2018 19:38:12 +0000 (19:38 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd am:
40f7822e27 am:
98916aaef5 am:
932e2eb358 -s ours am:
7af6f1b8e8 -s ours am:
944510e511 -s ours
am:
c1faf30a21 -s ours
Change-Id: I0fa4e878a8a65889cce25d1c9f866a5e125cb06d
Hansong Zhang [Fri, 12 Jan 2018 19:38:06 +0000 (19:38 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am:
5755f66220 am:
88312931fd am:
0c8337c1e7 am:
0ebb1d7ac5 am:
f89d1d78f9 -s ours am:
ec7e954952 -s ours
am:
64baebf627 -s ours
Change-Id: Ifef382b53936d6db5dd340f7c7fac1433dbf1b6f
Hansong Zhang [Fri, 12 Jan 2018 19:32:51 +0000 (19:32 +0000)]
Merge "Fix unexpected behavior in reading BNEP packets" into oc-dev
am:
1e2a61923b
Change-Id: Ifc2aa877c9e243a5bd3ba447cda55fb77e3f039e
Hansong Zhang [Fri, 12 Jan 2018 19:32:46 +0000 (19:32 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd am:
40f7822e27 am:
98916aaef5 am:
932e2eb358 -s ours am:
7af6f1b8e8 -s ours
am:
944510e511 -s ours
Change-Id: I28a2b5e6667a6489e0311b589e11f907da769f8b
Hansong Zhang [Fri, 12 Jan 2018 19:32:36 +0000 (19:32 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev am:
6e677aab4a am:
bd83a19885 am:
956bb8e1fb am:
552786c50f am:
4b94d30c60 -s ours
am:
e3614bb6d7
Change-Id: Ia085dc761466af253818324e0d577c2155dcaa91
Hansong Zhang [Fri, 12 Jan 2018 19:32:18 +0000 (19:32 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am:
5755f66220 am:
88312931fd am:
0c8337c1e7 am:
0ebb1d7ac5 am:
f89d1d78f9 -s ours
am:
ec7e954952 -s ours
Change-Id: Id7bc496124c20d38cc54fd3c3c5437dd2b02fdd9
TreeHugger Robot [Fri, 12 Jan 2018 19:27:09 +0000 (19:27 +0000)]
Merge "Fix unexpected behavior in reading BNEP packets" into oc-dev
Hansong Zhang [Fri, 12 Jan 2018 19:26:52 +0000 (19:26 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev am:
6e677aab4a am:
bd83a19885 am:
956bb8e1fb am:
552786c50f
am:
4b94d30c60 -s ours
Change-Id: I3ed1c07f9ee15d3ae9127c9463fd587ee33d99ec
Hansong Zhang [Fri, 12 Jan 2018 19:26:43 +0000 (19:26 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd am:
40f7822e27 am:
98916aaef5 am:
932e2eb358 -s ours
am:
7af6f1b8e8 -s ours
Change-Id: Ifbb6e4f861a9359234200152721770320355949b
Hansong Zhang [Fri, 12 Jan 2018 19:26:39 +0000 (19:26 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am:
5755f66220 am:
88312931fd am:
0c8337c1e7 am:
0ebb1d7ac5
am:
f89d1d78f9 -s ours
Change-Id: I67a120b806fd7a4951a451248f279fd917dfc6cf
Hansong Zhang [Fri, 12 Jan 2018 19:22:09 +0000 (19:22 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev am:
6e677aab4a am:
bd83a19885 am:
956bb8e1fb
am:
552786c50f
Change-Id: I8741e34d6670e4ee4dcf8d6684a1ff11286d4c09
Hansong Zhang [Fri, 12 Jan 2018 19:22:07 +0000 (19:22 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd am:
40f7822e27 am:
98916aaef5
am:
932e2eb358 -s ours
Change-Id: Idfd8f956d46797228420c352c4fd4d7114863cd5
Hansong Zhang [Fri, 12 Jan 2018 19:21:52 +0000 (19:21 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am:
5755f66220 am:
88312931fd am:
0c8337c1e7
am:
0ebb1d7ac5
Change-Id: I44c647076510e6396e6141b5b5d94a3f1283fd0d
Hansong Zhang [Fri, 12 Jan 2018 19:17:30 +0000 (19:17 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev am:
6e677aab4a am:
bd83a19885
am:
956bb8e1fb
Change-Id: Iaa957284a29d1e101a7347e5e3c5fded62037e90
Hansong Zhang [Fri, 12 Jan 2018 19:17:14 +0000 (19:17 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd am:
40f7822e27
am:
98916aaef5
Change-Id: I40da0b8f6c127487fe5680cb8cec937b3725b083
Hansong Zhang [Fri, 12 Jan 2018 19:17:14 +0000 (19:17 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am:
5755f66220 am:
88312931fd
am:
0c8337c1e7
Change-Id: Ied3f18ad9151277c0929c291f34d7c192240f265
Hansong Zhang [Fri, 12 Jan 2018 19:11:54 +0000 (19:11 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev am:
6e677aab4a
am:
bd83a19885
Change-Id: Ie010a0be70337bca536e0f34075a4ff571c4f4ad
Hansong Zhang [Fri, 12 Jan 2018 19:11:40 +0000 (19:11 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am:
5755f66220
am:
88312931fd
Change-Id: Ie2eaf68551b3d36eefeb0c802317da5ecf430df5
Hansong Zhang [Fri, 12 Jan 2018 19:11:39 +0000 (19:11 +0000)]
Merge "Fix unexpected behavior in SDP" into oc-dev am:
02ee3ed2df
am:
dada4eefbc
Change-Id: I672f43f0f0c174aa1cb340356a7665ec8be2cfd0
Hansong Zhang [Fri, 12 Jan 2018 19:10:39 +0000 (19:10 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd
am:
40f7822e27
Change-Id: I2f6f6d64a86d91bdcd2ae672743be9cdc8d3c2d5
Hansong Zhang [Fri, 12 Jan 2018 19:06:07 +0000 (19:06 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP
am:
ed45f06fbd
Change-Id: Ia72f140ecc6f943c2b25a981d8528a00813eb0ff
Hansong Zhang [Fri, 12 Jan 2018 19:05:30 +0000 (19:05 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev
am:
6e677aab4a
Change-Id: I572e0effe9b6a1952378d320b403756486102897
Hansong Zhang [Fri, 12 Jan 2018 19:05:11 +0000 (19:05 +0000)]
Merge "Fix unexpected behavior in SDP" into oc-dev
am:
02ee3ed2df
Change-Id: If02f6da17d32d1a96b2fb9054e1ae955e84c3db2
Hansong Zhang [Fri, 12 Jan 2018 19:05:11 +0000 (19:05 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev
am:
5755f66220
Change-Id: I509364deeeb49d1c0e78bd5146edc04348cbc4fc
Hansong Zhang [Fri, 12 Jan 2018 18:59:31 +0000 (18:59 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev
Hansong Zhang [Fri, 12 Jan 2018 18:59:27 +0000 (18:59 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev
Hansong Zhang [Fri, 12 Jan 2018 18:59:26 +0000 (18:59 +0000)]
Merge "Fix unexpected behavior in SDP" into oc-dev
Pavlin Radoslavov [Fri, 12 Jan 2018 17:59:28 +0000 (17:59 +0000)]
Allocate/free the SDP connection timers only during stack startup/shutdown am:
0dbe21d88e
am:
f51db59dc4
Change-Id: I6fda9a621d422563e6bb25b2a06b52bf431b1547
Pavlin Radoslavov [Fri, 12 Jan 2018 17:52:55 +0000 (17:52 +0000)]
Allocate/free the SDP connection timers only during stack startup/shutdown
am:
0dbe21d88e
Change-Id: Ia44bc15836dc853b4f6d7a36ef975696b7dbf019
Pavlin Radoslavov [Fri, 12 Jan 2018 01:28:16 +0000 (17:28 -0800)]
Allocate/free the SDP connection timers only during stack startup/shutdown
This avoids freeing the sdp_conn_timer within the alarm callback itself.
Bug:
67110137
Test: Manual
Change-Id: I775b4b532cd42cf207258c53c6052a167a124627
Merged-In: I775b4b532cd42cf207258c53c6052a167a124627
(cherry picked from commit
ef6a4a0c9d9220a7d909863349d7a0c0b967d54c)
Hansong Zhang [Thu, 11 Jan 2018 00:59:48 +0000 (16:59 -0800)]
DO NOT MERGE Fix unexpected behavior in reading BNEP packets
Bug:
67863755
Bug:
69177251
Bug:
69177292
Bug:
69271284
Test: BNEP still works
Change-Id: I41b8bfe5e123a56b8812124178663735f2bf3372
Hansong Zhang [Wed, 10 Jan 2018 21:43:25 +0000 (13:43 -0800)]
Fix unexpected behavior in reading BNEP packets
Bug:
67863755
Bug:
69177251
Bug:
69177292
Bug:
69271284
Test: BNEP still works
Change-Id: I41b8bfe5e123a56b8812124178663735f2bf3372
Myles Watson [Thu, 11 Jan 2018 18:29:35 +0000 (18:29 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into oc-dev am:
42fc16e912
am:
685f122dd6
Change-Id: I1647550fb07b82131b954994313c8b2f8f1011a7
Myles Watson [Thu, 11 Jan 2018 18:27:34 +0000 (18:27 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into oc-dev
am:
42fc16e912
Change-Id: I9ca0f453f67a53f56ec86db47976fb28d6cbcf5e
TreeHugger Robot [Thu, 11 Jan 2018 18:23:24 +0000 (18:23 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into oc-dev
Pavlin Radoslavov [Thu, 11 Jan 2018 01:32:47 +0000 (01:32 +0000)]
Removed alarm callback execution statistics am:
b9ebb4ab26 am:
944a096f7c am:
484a8ff430 am:
dfe7791399 am:
bbe82d4017 -s ours am:
64480abff1 -s ours
am:
0dc97a5e67 -s ours
Change-Id: I42ad8c214d1f11fe407fe983fe8a028bcb7dec7c
Pavlin Radoslavov [Thu, 11 Jan 2018 01:30:43 +0000 (01:30 +0000)]
Removed alarm callback execution statistics am:
b9ebb4ab26 am:
944a096f7c am:
484a8ff430 am:
dfe7791399 am:
bbe82d4017 -s ours
am:
64480abff1 -s ours
Change-Id: I93ae08d51eefd921262316e39c4531ed21cbc4e6
Pavlin Radoslavov [Thu, 11 Jan 2018 01:26:46 +0000 (01:26 +0000)]
Removed alarm callback execution statistics am:
b9ebb4ab26 am:
944a096f7c am:
484a8ff430 am:
dfe7791399
am:
bbe82d4017 -s ours
Change-Id: Ice40110fbd607769f53dceaa111b61524c4820b7
Pavlin Radoslavov [Thu, 11 Jan 2018 01:23:09 +0000 (01:23 +0000)]
Removed alarm callback execution statistics am:
b9ebb4ab26 am:
944a096f7c am:
484a8ff430
am:
dfe7791399
Change-Id: I3f8f645bfdbb7c27d44dba115dc321a6ab51fc7a
Pavlin Radoslavov [Thu, 11 Jan 2018 01:21:14 +0000 (01:21 +0000)]
Removed alarm callback execution statistics am:
b9ebb4ab26 am:
944a096f7c
am:
484a8ff430
Change-Id: I7a2e3f2fd89c4c7df94f3650768c221f986b2c18
Pavlin Radoslavov [Thu, 11 Jan 2018 01:18:37 +0000 (01:18 +0000)]
Removed alarm callback execution statistics am:
b9ebb4ab26
am:
944a096f7c
Change-Id: I69a82dfa9cc6e3201ffed6cf6761a3a6c1f4ff70
Pavlin Radoslavov [Thu, 11 Jan 2018 01:16:06 +0000 (01:16 +0000)]
Removed alarm callback execution statistics
am:
b9ebb4ab26
Change-Id: I21f70a4a332f9335e609b763f26571c3f74991dd
Pavlin Radoslavov [Thu, 11 Jan 2018 00:40:16 +0000 (00:40 +0000)]
Removed alarm callback execution statistics am:
1772ba8319
am:
052c2ea0f4 -s ours
Change-Id: I3448db710b6195be5fa2656b230fd08ef0835f6d
Pavlin Radoslavov [Thu, 11 Jan 2018 00:33:43 +0000 (00:33 +0000)]
Removed alarm callback execution statistics
am:
1772ba8319
Change-Id: If7efaacf80e5b867eba2d5efa263a40a888c1048
Myles Watson [Wed, 10 Jan 2018 22:16:15 +0000 (14:16 -0800)]
SDP: Pass the bounds to process_service_*_rsp
Test: build
Bug:
68161546
Change-Id: Icf53d4d05f99b5e0a2b3f4d3735b6fbfd62adaa3
Hansong Zhang [Wed, 10 Jan 2018 01:16:35 +0000 (17:16 -0800)]
Fix unexpected behavior in SDP
Bug:
68776054
Bug:
68817966
Test: Bluetooth SDP still works
Change-Id: I4eef22679a313b88d7e8ec463b29dbb592c6b5b9
Hansong Zhang [Wed, 10 Jan 2018 03:43:20 +0000 (19:43 -0800)]
DO NOT MERGE Fix unexpected behavior in SDP
Bug:
68776054
Bug:
68817966
Test: Bluetooth SDP still works
Change-Id: I4eef22679a313b88d7e8ec463b29dbb592c6b5b9
Merged-In: I4eef22679a313b88d7e8ec463b29dbb592c6b5b9
Hansong Zhang [Wed, 10 Jan 2018 03:36:46 +0000 (19:36 -0800)]
DO NOT MERGE Fix unexpected behavior in SDP
Bug:
68776054
Bug:
68817966
Test: Bluetooth SDP still works
Change-Id: I4eef22679a313b88d7e8ec463b29dbb592c6b5b9
Merged-In: I4eef22679a313b88d7e8ec463b29dbb592c6b5b9
Pavlin Radoslavov [Mon, 8 Jan 2018 19:37:05 +0000 (11:37 -0800)]
Removed alarm callback execution statistics
Updating the alarm state after the callback returns can be problematic
in case the callback itself deleted the alarm.
Bug:
67110137
Test: Manual
Change-Id: Id4de06eebedb792cadd63d09efb68672e9bddc69
Merged-In: Id4de06eebedb792cadd63d09efb68672e9bddc69
(cherry picked from commit
04574e1cde3b0d46b59b4b6ebab935ac60af9f97)
Pavlin Radoslavov [Mon, 8 Jan 2018 19:37:05 +0000 (11:37 -0800)]
Removed alarm callback execution statistics
Updating the alarm state after the callback returns can be problematic
in case the callback itself deleted the alarm.
Bug:
67110137
Test: Manual
Change-Id: Id4de06eebedb792cadd63d09efb68672e9bddc69
Merged-In: Id4de06eebedb792cadd63d09efb68672e9bddc69
(cherry picked from commit
04574e1cde3b0d46b59b4b6ebab935ac60af9f97)
Pavlin Radoslavov [Mon, 8 Jan 2018 19:37:05 +0000 (11:37 -0800)]
Removed alarm callback execution statistics
Updating the alarm state after the callback returns can be problematic
in case the callback itself deleted the alarm.
Bug:
67110137
Test: Manual
Change-Id: Id4de06eebedb792cadd63d09efb68672e9bddc69
Merged-In: Id4de06eebedb792cadd63d09efb68672e9bddc69
(cherry picked from commit
04574e1cde3b0d46b59b4b6ebab935ac60af9f97)
Jacky Cheung [Fri, 1 Dec 2017 22:55:37 +0000 (22:55 +0000)]
DO NOT MERGE ANYWHERE: Disable the use of GATT cache by default. am:
b050cd5d9a -s ours am:
148f6d31a0 -s ours am:
fab8ca8793 -s ours
am:
3ed011da88 -s ours
Change-Id: Ibe322547dff301c4c0e48420cbed243a0f826741
Jacky Cheung [Fri, 1 Dec 2017 22:53:37 +0000 (22:53 +0000)]
DO NOT MERGE ANYWHERE: Disable the use of GATT cache by default. am:
b050cd5d9a -s ours am:
148f6d31a0 -s ours
am:
fab8ca8793 -s ours
Change-Id: If61e7c4dd96815a9d423ea7d0f778573f13f2b78
Jacky Cheung [Fri, 1 Dec 2017 22:51:36 +0000 (22:51 +0000)]
DO NOT MERGE ANYWHERE: Disable the use of GATT cache by default. am:
b050cd5d9a -s ours
am:
148f6d31a0 -s ours
Change-Id: I9393ade6467b657ac813666d9f0e1a1937575024
Jacky Cheung [Fri, 1 Dec 2017 22:49:36 +0000 (22:49 +0000)]
DO NOT MERGE ANYWHERE: Disable the use of GATT cache by default.
am:
b050cd5d9a -s ours
Change-Id: Iaf10a993829cebefecbf49290dd0db345cd71dde
Jacky Cheung [Tue, 7 Nov 2017 19:17:38 +0000 (11:17 -0800)]
DO NOT MERGE ANYWHERE: Disable the use of GATT cache by default.
When a set of GATT services of a bonded device is cached locally,
an application needs to call BluetoothGatt.refresh() to clear it out
and to trigger a new service discovery. By disabling local caching,
a service discovery is performed on every connection and that prevents
an application from getting staled GATT services.
bug:
68954828
Change-Id: I2c07404c3d56a5c8a0ffc86bc65d36480f3c46f2
Jakub Pawlowski [Fri, 13 Oct 2017 16:51:06 +0000 (09:51 -0700)]
Fix crash in l2cble_start_conn_update
Bug:
67774334
Test: compilation
Change-Id: I42ec986c6c5f3fe81f507596bf1df05dcf3ec0ba
(cherry picked from
5e8d54e6c26c3bc8ced932bb9c455bbbad57a9db)
Scott Bauer [Thu, 12 Oct 2017 00:26:02 +0000 (00:26 +0000)]
Read the correct amount of attributes am:
4d1470eb54 am:
48e5396b99 am:
57f958e7e3 am:
e69e6e0fab am:
1e67cf4b2e am:
930d16464f
am:
4010328f80
Change-Id: Ic069690e99651d756f923f6b276f0de85c2ac2c8
Scott Bauer [Thu, 12 Oct 2017 00:25:25 +0000 (00:25 +0000)]
Read the correct amount of attributes am:
636b754cfa am:
5ec93991d7 am:
6e7c360c85 am:
a51aaf2366
am:
15ce434f4b
Change-Id: Ib890b147a7bd77c4987503d8b62400a5735ad036
Scott Bauer [Thu, 12 Oct 2017 00:25:01 +0000 (00:25 +0000)]
Read the correct amount of attributes am:
8eb6493ad5 -s ours am:
95b2e35d5d
am:
f00207c227
Change-Id: I4128915b2b6e914a7798c9e4fa885cddce4d28a1
Scott Bauer [Thu, 12 Oct 2017 00:24:24 +0000 (00:24 +0000)]
Read the correct amount of attributes am:
4d1470eb54 am:
48e5396b99 am:
57f958e7e3 am:
e69e6e0fab am:
1e67cf4b2e
am:
930d16464f
Change-Id: I99851e43afe1fa26d9efa4eccea583250586dc0d
Scott Bauer [Thu, 12 Oct 2017 00:21:50 +0000 (00:21 +0000)]
Read the correct amount of attributes am:
636b754cfa am:
5ec93991d7 am:
6e7c360c85
am:
a51aaf2366
Change-Id: Ie8dfa4cff72aef91a87b4dbbc5b82f88213994e2
Scott Bauer [Thu, 12 Oct 2017 00:21:26 +0000 (00:21 +0000)]
Read the correct amount of attributes am:
8eb6493ad5 -s ours
am:
95b2e35d5d
Change-Id: I0956d72a77cfd13dd6dca526cad54c402991ab44
Scott Bauer [Thu, 12 Oct 2017 00:20:01 +0000 (00:20 +0000)]
Read the correct amount of attributes am:
4d1470eb54 am:
48e5396b99 am:
57f958e7e3 am:
e69e6e0fab
am:
1e67cf4b2e
Change-Id: Ic0858b82dd5c15b824a74e53817e42e1945d1a7d
Scott Bauer [Thu, 12 Oct 2017 00:19:36 +0000 (00:19 +0000)]
Read the correct amount of attributes am:
636b754cfa am:
5ec93991d7
am:
6e7c360c85
Change-Id: Icb1240a22b2cfc7fa32b3ab23652fa1510b3c590
Scott Bauer [Thu, 12 Oct 2017 00:18:39 +0000 (00:18 +0000)]
Read the correct amount of attributes
am:
8eb6493ad5 -s ours
Change-Id: I73a8ff63af23863be10d8cdd4da73234fcd25e3d
Scott Bauer [Wed, 11 Oct 2017 23:30:54 +0000 (23:30 +0000)]
Merge "Read the correct amount of attributes" into oc-dev am:
83aee7b3ba
am:
c7706eef3e
Change-Id: Icede213590da36c16291cfa0fd001265f2728da4
Scott Bauer [Wed, 11 Oct 2017 23:23:47 +0000 (23:23 +0000)]
Merge "Read the correct amount of attributes" into oc-dev
am:
83aee7b3ba
Change-Id: I633e4d7fbcb48387ca092e5e19a6f5c0ba015072
TreeHugger Robot [Wed, 11 Oct 2017 23:11:13 +0000 (23:11 +0000)]
Merge "Read the correct amount of attributes" into oc-dev
Scott Bauer [Wed, 11 Oct 2017 22:38:19 +0000 (22:38 +0000)]
Read the correct amount of attributes am:
4d1470eb54 am:
48e5396b99 am:
57f958e7e3
am:
e69e6e0fab
Change-Id: I4a4802e3bf181f09d8de652d991cc26686e467e4
Scott Bauer [Wed, 11 Oct 2017 22:37:12 +0000 (22:37 +0000)]
Read the correct amount of attributes am:
636b754cfa
am:
5ec93991d7
Change-Id: I69bd3d4e294765feade3840d9f1710cfa1cdc69b
Scott Bauer [Wed, 11 Oct 2017 22:34:23 +0000 (22:34 +0000)]
Read the correct amount of attributes am:
4d1470eb54 am:
48e5396b99
am:
57f958e7e3
Change-Id: I3a664ecfa9eebde0459f299fa3a26c70c528e3b8
Scott Bauer [Wed, 11 Oct 2017 22:33:55 +0000 (22:33 +0000)]
Read the correct amount of attributes
am:
636b754cfa
Change-Id: I43948bbb53b3075e7e7b016b9127f38245a8f9da
Scott Bauer [Wed, 11 Oct 2017 22:28:54 +0000 (22:28 +0000)]
Read the correct amount of attributes am:
4d1470eb54
am:
48e5396b99
Change-Id: I93404b4895d4609e9f0afbc9d020cfae20f4f820
Scott Bauer [Wed, 11 Oct 2017 22:26:14 +0000 (22:26 +0000)]
Read the correct amount of attributes
am:
4d1470eb54
Change-Id: I153a91a1aba1a78837c397d4ee01bea2d1696e4e
Myles Watson [Fri, 6 Oct 2017 18:22:51 +0000 (11:22 -0700)]
HCI: Restart 5 seconds after an HCI timeout
Bug:
67209266
Test: build
Change-Id: I69a4a17382742327268a80dbc5c5be49059ecb3c
(cherry picked from commit
d48d32d04ae9f4d81012f2146f8e746c4a05a0f9)
Merged-In: I69a4a17382742327268a80dbc5c5be49059ecb3c
Jack He [Mon, 2 Oct 2017 21:07:33 +0000 (14:07 -0700)]
A2DP: Advance btif profile queue on OPENING->other_state transition
* Entering BTIF_AV_STATE_OPENING is only possible through
BTIF_AV_CONNECT_REQ_EVT (initiated by us) OR
BTA_AV_PENDING_EVT (initiated by remote)
from BTIF_AV_STATE_IDLE
* If we go from BTIF_AV_CONNECT_REQ_EVT, we must have a pending
connection request in btif_profile_queue that should be advanced when
we quit BTIF_AV_STATE_OPENING state
* This CL adds a flag to indicate whether an AV connection is initiated
by us and only advance queue when it is
* Also add queue advancement in BTA_AV_REJECT_EVT and BTA_AV_CLOSE_EVT
Bug:
67317954
Test: make
Change-Id: I16dc8ebf76c6edaacb1f7a4a44e604170ff9a8b0
(cherry picked from commit
a3626477587e99347dcf966087497e9a1c4732a4)
c_sdamga [Mon, 20 Jul 2015 13:47:04 +0000 (19:17 +0530)]
Handle Disconnect request in AV Opening State handler
Usecase:
1. Uncheck media from settings UI
2. initiate A2dp connection from remote, send AVRCP play from remote
Failure:
A2dp connection stuck in opening state.
Rootcause:
When A2dp is unchecked from settings UI and remote initiated
a2dp connection and AVRCP play, music starts streaming on DUT
since A2dp connection disconnected. As A2dp connection was not
completed, btif state stuck in opening state.
Fix:
Handled the disconnection request in the opening state
so that AV state machine moves to proper state before
processing AVRCP Play.
Test: 1. Uncheck media from settings UI
2. initiate A2dp connection from remote, send AVRCP play
Bug:
35415160
Change-Id: If1cda5b78100419fdc60c97349efafdd4a18d40c
(cherry picked from commit
ff1b9d26ca9a5a25d45bab09df1c0346104051a9)
Subramanian Srinivasan [Fri, 29 Sep 2017 01:41:03 +0000 (18:41 -0700)]
Fix adv instance validity check during suspend and resume of resolving list
When BT is shutdown, multi advertisement instance pointer is made
null by BleAdvertisingManager::CleanUp function.
Any subsequent BleAdvertisingManager::Get function call made at
this point(eg during suspension and resumption of resolving list
activity)leads to a crash as the instance pointer is null.
Hence, use BleAdvertisingManager::IsInitialized function instead
of BleAdvertisingManager::Get function to check the validity of
multi advertisement instance.
Bug:
67325491
Change-Id: Ibbae7fa546bb52494be78eaff6d4b7b15614ab15
TreeHugger Robot [Wed, 4 Oct 2017 23:21:12 +0000 (23:21 +0000)]
Merge "Added extra A2DP logging when there is an error" into oc-mr1-dev
Pavlin Radoslavov [Wed, 4 Oct 2017 12:36:25 +0000 (05:36 -0700)]
Added extra A2DP logging when there is an error
Bug:
64159791
Test: Manual
Change-Id: Ic1001892b7abc9784a21a183d141df51b1b92fc0
Pavlin Radoslavov [Wed, 4 Oct 2017 18:26:04 +0000 (11:26 -0700)]
Decrese the default verbosity for A2DP codec info logs
Bug:
64159791
Test: Manual
Change-Id: Ida10f5d2aa6643df136a41891d7775e175c06570
Pavlin Radoslavov [Fri, 29 Sep 2017 01:11:06 +0000 (18:11 -0700)]
Remove casts to (tBTA_GATTC*) unions to avoid unaligned accesses
Bug:
65381426
Test: unit tests
Change-Id: I37e89ec7187ab1c61be4c736385a9fc5ec88d737
(cherry picked from commit
b147c652e90c60daa7113933c48a465491707213)
Pavlin Radoslavov [Tue, 3 Oct 2017 14:28:01 +0000 (14:28 +0000)]
Fixed the implementation of std::equal_to<bt_bdaddr_t> am:
181144a501
am:
eb9ba99523 -s ours
Change-Id: Ib581c7f9b6474c68956de8a41efadff9f8572545
Pavlin Radoslavov [Tue, 3 Oct 2017 05:15:41 +0000 (05:15 +0000)]
Fixed the implementation of std::equal_to<bt_bdaddr_t>
am:
181144a501
Change-Id: Ic8e35d75ebe14eccd7fd169572fe5bff39d150f6
Pavlin Radoslavov [Wed, 30 Aug 2017 00:03:21 +0000 (17:03 -0700)]
Fixed the implementation of std::equal_to<bt_bdaddr_t>
Now we correctly suppress the processing of repetitive
BLE scan results.
Test: Manual with extra log messages
Bug:
65174158
Bug:
64975965
Change-Id: Ic4386c5e2fbabdc218f6ec675c5b298a7af41e5a
Merged-In: Ie0694843ad5fbd2a80b310c5f532e5e5a9548043
Myles Watson [Tue, 19 Sep 2017 17:01:28 +0000 (10:01 -0700)]
Remove casts to unions to avoid unaligned accesses
Bug:
65392204
Test: sanity
Change-Id: I2886cc02289b68710e83147ba4d7715a32a4fc55
(cherry picked from commit
8d749047a084b2d8a18fcaaac5c585e97a16f58d)
Merged-In: I2886cc02289b68710e83147ba4d7715a32a4fc55
Hemant Gupta [Wed, 13 Sep 2017 12:05:03 +0000 (17:35 +0530)]
HID: Free process_repage_timer to prevent leak
Usecase:
1) Perform BT on/off stress test
2) Check for memory leakage in code in subsequent BT on/off usecase
Expectation
No memory leak during BT on/off stress test
Observed result
Memory leakage in hid code where alarm process_repage_timer is not freed
and only cancelled
Fix:
Free alarm process_repage_timer during HID Host deregstration
Test: Checked with BT on/off usecase, and alarm process_repage_timer is now
freed in every BT on/off usecase.
Bug:
65657207
Change-Id: Iccecd126716a5660f4c37ddc917bacee84342297
(cherry picked from commit
e6b15cf8251643aced0baf716939a6d0857fccfb)
Scott Bauer [Fri, 7 Apr 2017 00:35:40 +0000 (18:35 -0600)]
Read the correct amount of attributes
bta_gattc_cache_load currently attempts to read 0xFF attributes into an
allocation sized to num_attr attributes, which can be smaller than 0xFF.
There aren't more than num_attr bytes in correct data, but this breaks
with dynamic buffer overflow checking in CopperheadOS for the read
system call since fread ends up calling read, which obtains the size of
the allocation from the malloc implementation and then aborts due to the
(potential) overflow.
This would also fail with the default enabled _FORTIFY_SOURCE=2 feature
in the Android Open Source Project if osi_malloc was marked with the
alloc_size attribute. The way it wraps malloc loses that information so
fortify checks aren't done for calls like this.
Bug:
37160362
Change-Id: I68bd170d5378c9d9d21cbda376083bc0b857e15c
Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
[migrated to C++ file, added 0xFFFF limit and wrote commit message]
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
Scott Bauer [Fri, 7 Apr 2017 00:35:40 +0000 (18:35 -0600)]
Read the correct amount of attributes
bta_gattc_cache_load currently attempts to read 0xFF attributes into an
allocation sized to num_attr attributes, which can be smaller than 0xFF.
There aren't more than num_attr bytes in correct data, but this breaks
with dynamic buffer overflow checking in CopperheadOS for the read
system call since fread ends up calling read, which obtains the size of
the allocation from the malloc implementation and then aborts due to the
(potential) overflow.
This would also fail with the default enabled _FORTIFY_SOURCE=2 feature
in the Android Open Source Project if osi_malloc was marked with the
alloc_size attribute. The way it wraps malloc loses that information so
fortify checks aren't done for calls like this.
Bug:
37160362
Change-Id: I68bd170d5378c9d9d21cbda376083bc0b857e15c
Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
[migrated to C++ file, added 0xFFFF limit and wrote commit message]
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
Scott Bauer [Fri, 7 Apr 2017 00:35:40 +0000 (18:35 -0600)]
Read the correct amount of attributes
bta_gattc_cache_load currently attempts to read 0xFF attributes into an
allocation sized to num_attr attributes, which can be smaller than 0xFF.
There aren't more than num_attr bytes in correct data, but this breaks
with dynamic buffer overflow checking in CopperheadOS for the read
system call since fread ends up calling read, which obtains the size of
the allocation from the malloc implementation and then aborts due to the
(potential) overflow.
This would also fail with the default enabled _FORTIFY_SOURCE=2 feature
in the Android Open Source Project if osi_malloc was marked with the
alloc_size attribute. The way it wraps malloc loses that information so
fortify checks aren't done for calls like this.
Bug:
37160362
Change-Id: I68bd170d5378c9d9d21cbda376083bc0b857e15c
Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
[migrated to C++ file, added 0xFFFF limit and wrote commit message]
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
Scott Bauer [Fri, 7 Apr 2017 00:35:40 +0000 (18:35 -0600)]
Read the correct amount of attributes
bta_gattc_cache_load currently attempts to read 0xFF attributes into an
allocation sized to num_attr attributes, which can be smaller than 0xFF.
There aren't more than num_attr bytes in correct data, but this breaks
with dynamic buffer overflow checking in CopperheadOS for the read
system call since fread ends up calling read, which obtains the size of
the allocation from the malloc implementation and then aborts due to the
(potential) overflow.
This would also fail with the default enabled _FORTIFY_SOURCE=2 feature
in the Android Open Source Project if osi_malloc was marked with the
alloc_size attribute. The way it wraps malloc loses that information so
fortify checks aren't done for calls like this.
Bug:
37160362
Change-Id: I68bd170d5378c9d9d21cbda376083bc0b857e15c
Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
[migrated to C++ file, added 0xFFFF limit and wrote commit message]
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
Jakub Pawlowski [Wed, 27 Sep 2017 22:41:13 +0000 (15:41 -0700)]
Don't set CT2 bit when talking to pre-5.0 devices
Prior to 5.0 spec, CT2 bit in AuthReq was reserved. Setting it cause
bonding failure with devices that handle it incorrectly.
Bug:
66179701
Bug:
66931978
Test: Bond with device that have 4.2 chip
Change-Id: Idbbf2c39c499698844218059a35cb686996c136a
Andre Eisenbach [Fri, 22 Sep 2017 20:19:48 +0000 (20:19 +0000)]
Fix build error for AVRCP13 compat fix am:
544f7e1be9
am:
7b1e826e9c
Change-Id: I5813e2869be1b9ef4e1e36b92a6da96a38948fd9
OSDN Git Service
