OSDN Git Service
Myles Watson [Thu, 11 Jan 2018 22:20:26 +0000 (14:20 -0800)]
BNEP: Check received frame type
Bug:
68818034
Test: build
Change-Id: I2b9f32b92d72f226361e6a80f20f9c7ee77f6019
Stanley Tng [Fri, 12 Jan 2018 22:37:32 +0000 (22:37 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5 am:
92268a691f am:
8909982e6f am:
3b485ad0f7 -s ours am:
9efed59da5 -s ours am:
7c7d5fb5f7 -s ours am:
dbd120f7ce -s ours am:
fdf25fcb2a -s ours
am:
e3e7a78626 -s ours
Change-Id: I58199b6381de80632cce42cc6d6d4b38cd2f8ce7
Stanley Tng [Fri, 12 Jan 2018 22:32:39 +0000 (22:32 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5 am:
92268a691f am:
8909982e6f am:
3b485ad0f7 -s ours am:
9efed59da5 -s ours am:
7c7d5fb5f7 -s ours am:
dbd120f7ce -s ours
am:
fdf25fcb2a -s ours
Change-Id: If3fe2c42ac80d62fae4159045c4a59528f51b999
Stanley Tng [Fri, 12 Jan 2018 22:29:24 +0000 (22:29 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5 am:
92268a691f am:
8909982e6f am:
3b485ad0f7 -s ours am:
9efed59da5 -s ours am:
7c7d5fb5f7 -s ours
am:
dbd120f7ce -s ours
Change-Id: I37a46ac9d21f7b4a70647d045860fe979686a1f1
Stanley Tng [Fri, 12 Jan 2018 22:23:33 +0000 (22:23 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5 am:
92268a691f am:
8909982e6f am:
3b485ad0f7 -s ours am:
9efed59da5 -s ours
am:
7c7d5fb5f7 -s ours
Change-Id: I8af0cad8ce12ec50cddc7eec34df650643ec9787
Stanley Tng [Fri, 12 Jan 2018 22:18:59 +0000 (22:18 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5 am:
92268a691f am:
8909982e6f am:
3b485ad0f7 -s ours
am:
9efed59da5 -s ours
Change-Id: I49c36b6af9bf279319a070a68f2fe91b71b1b525
Stanley Tng [Fri, 12 Jan 2018 22:18:25 +0000 (22:18 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into nyc-dev am:
70b70baa89 am:
4523d9cff0 am:
f7257a97db am:
8df074e657
am:
ae8a6708c9 -s ours
Change-Id: I8998167d79d501037d13b9c9a986e9599825f182
Stanley Tng [Fri, 12 Jan 2018 22:13:54 +0000 (22:13 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5 am:
92268a691f am:
8909982e6f
am:
3b485ad0f7 -s ours
Change-Id: If144e4104654de7d198b2bb641bdb0c5c65af625
Stanley Tng [Fri, 12 Jan 2018 22:13:32 +0000 (22:13 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into nyc-dev am:
70b70baa89 am:
4523d9cff0 am:
f7257a97db
am:
8df074e657
Change-Id: Ifb8b5333e59b79a599aa5a5077a5c69c02182e9f
Stanley Tng [Fri, 12 Jan 2018 22:09:30 +0000 (22:09 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into nyc-dev am:
70b70baa89 am:
4523d9cff0
am:
f7257a97db
Change-Id: Icb9c8ade01d4cee43da88ee8a118d36ed35abbe0
Stanley Tng [Fri, 12 Jan 2018 22:09:29 +0000 (22:09 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5 am:
92268a691f
am:
8909982e6f
Change-Id: I3438b832e39d85a4e8d598e8f611e5d8a3ef185b
Stanley Tng [Fri, 12 Jan 2018 22:03:57 +0000 (22:03 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into nyc-dev am:
70b70baa89
am:
4523d9cff0
Change-Id: I054dd86fb610e0fbb6f1116bd34e17b1ea09e8eb
Stanley Tng [Fri, 12 Jan 2018 22:03:56 +0000 (22:03 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5
am:
92268a691f
Change-Id: I540a273548859c9d013092b9d1eaee753f469366
Stanley Tng [Fri, 12 Jan 2018 22:00:43 +0000 (22:00 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev
am:
cc798ea2e5
Change-Id: Ic6eda5df4183df713e656d31d8c12d075823a27c
Stanley Tng [Fri, 12 Jan 2018 21:59:26 +0000 (21:59 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into nyc-dev
am:
70b70baa89
Change-Id: I2e130d676996336fe8486f2345a05bea2a13f638
TreeHugger Robot [Fri, 12 Jan 2018 21:51:41 +0000 (21:51 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into oc-dev
TreeHugger Robot [Fri, 12 Jan 2018 21:51:02 +0000 (21:51 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev
TreeHugger Robot [Fri, 12 Jan 2018 21:50:24 +0000 (21:50 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into nyc-dev
Pavlin Radoslavov [Fri, 12 Jan 2018 21:11:14 +0000 (21:11 +0000)]
Merge "Allocate/free the SDP connection timers only during stack startup/shutdown" into nyc-dev am:
42fe329fea am:
7dd87869f2 am:
03c8d807be am:
c0f3c28fac
am:
1541631487 -s ours
Change-Id: I6fb6b8400b599218aebc72026402c4381c5b2dd6
Pavlin Radoslavov [Fri, 12 Jan 2018 21:05:44 +0000 (21:05 +0000)]
Merge "Allocate/free the SDP connection timers only during stack startup/shutdown" into nyc-dev am:
42fe329fea am:
7dd87869f2 am:
03c8d807be
am:
c0f3c28fac
Change-Id: I6175cd9009367490a54d41a2eaf4c27a943a3d17
Pavlin Radoslavov [Fri, 12 Jan 2018 21:02:24 +0000 (21:02 +0000)]
Merge "Allocate/free the SDP connection timers only during stack startup/shutdown" into nyc-dev am:
42fe329fea am:
7dd87869f2
am:
03c8d807be
Change-Id: I5886739b7b43393889deceb48b03b267fd82851d
Pavlin Radoslavov [Fri, 12 Jan 2018 20:56:07 +0000 (20:56 +0000)]
Merge "Allocate/free the SDP connection timers only during stack startup/shutdown" into nyc-dev am:
42fe329fea
am:
7dd87869f2
Change-Id: I2699a1d9c4a17de8ad796cfb18c3597d5f653991
Pavlin Radoslavov [Fri, 12 Jan 2018 20:51:07 +0000 (20:51 +0000)]
Merge "Allocate/free the SDP connection timers only during stack startup/shutdown" into nyc-dev
am:
42fe329fea
Change-Id: Ib7da76b8dc02ccd92433e31bb75ec37665e46e44
TreeHugger Robot [Fri, 12 Jan 2018 20:44:45 +0000 (20:44 +0000)]
Merge "Allocate/free the SDP connection timers only during stack startup/shutdown" into nyc-dev
Hansong Zhang [Fri, 12 Jan 2018 19:48:55 +0000 (19:48 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am:
a8ff361dfd am:
7d1d2cc30e am:
f4ebee33e8 am:
babe2f806a -s ours am:
6ad1b26ba3 am:
531aa6ac4b am:
3dc167be47 am:
9194a3708c
am:
4feed25d33 -s ours
Change-Id: Iaa4e7b5c051209eb841d04f0c4eff331d60c9345
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:43:08 +0000 (19:43 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am:
a8ff361dfd am:
7d1d2cc30e am:
f4ebee33e8 am:
babe2f806a -s ours am:
6ad1b26ba3 am:
531aa6ac4b am:
3dc167be47
am:
9194a3708c
Change-Id: If21fb5608d74acc265e098e96ca3851c4ead08a6
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:30 +0000 (19:38 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am:
a8ff361dfd am:
7d1d2cc30e am:
f4ebee33e8 am:
babe2f806a -s ours am:
6ad1b26ba3 am:
531aa6ac4b
am:
3dc167be47
Change-Id: Ie3fd1ea95db6f62da6ab8327547b04bf79b56f26
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:33:01 +0000 (19:33 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am:
a8ff361dfd am:
7d1d2cc30e am:
f4ebee33e8 am:
babe2f806a -s ours am:
6ad1b26ba3
am:
531aa6ac4b
Change-Id: I91f4898d5a1d33b49abedc99f4d5edefc92401e9
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
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:58 +0000 (19:26 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am:
a8ff361dfd am:
7d1d2cc30e am:
f4ebee33e8 am:
babe2f806a -s ours
am:
6ad1b26ba3
Change-Id: I181a32e5ca511ec470c1310dd40805a34a45d410
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:18 +0000 (19:22 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am:
a8ff361dfd am:
7d1d2cc30e am:
f4ebee33e8
am:
babe2f806a -s ours
Change-Id: I20565790a235d9dcabdd109fab65fcde414c06e3
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:33 +0000 (19:17 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am:
a8ff361dfd am:
7d1d2cc30e
am:
f4ebee33e8
Change-Id: I7bed5ffc40cb15e7f20b704dcb505d6f5ff52ab4
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:10:54 +0000 (19:10 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am:
a8ff361dfd
am:
7d1d2cc30e
Change-Id: I9757d3ee82598276e9fd5b5484435d6699c8c8e3
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:19 +0000 (19:06 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev
am:
a8ff361dfd
Change-Id: I35090af42c4d986cbb874f2599f0d34cfadafb43
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 "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 mnc-dev
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 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)
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 [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
Stanley Tng [Wed, 10 Jan 2018 21:13:15 +0000 (13:13 -0800)]
DO NOT MERGE Remove memory reference to invalid mem in error log
Remove the memory reference to an invalid memory inside an error log
message.
Test: Edit code to force the error condition and make sure the new error
log does not crashed.
Bug:
67058064
Merged-In: I55ec6d8b53e5987cd7721e0ae3ffccc11d6638a0
Change-Id: I55ec6d8b53e5987cd7721e0ae3ffccc11d6638a0
(cherry picked from commit
11cd7277a1d0da9013a8381cddbfc096e9adaed6)
Stanley Tng [Wed, 10 Jan 2018 21:13:15 +0000 (13:13 -0800)]
DO NOT MERGE Remove memory reference to invalid mem in error log
Remove the memory reference to an invalid memory inside an error log
message.
Test: Edit code to force the error condition and make sure the new error
log does not crashed.
Bug:
67058064
Merged-In: I55ec6d8b53e5987cd7721e0ae3ffccc11d6638a0
Change-Id: I55ec6d8b53e5987cd7721e0ae3ffccc11d6638a0
(cherry picked from commit
11cd7277a1d0da9013a8381cddbfc096e9adaed6)
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
Myles Watson [Wed, 10 Jan 2018 17:51:28 +0000 (09:51 -0800)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback
Patch from b/
67078939
Test: build
Bug:
67110692
Change-Id: I63b857d031c55d3a0754e4101e330843eb422b2a
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
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)
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
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
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
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
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>
Andre Eisenbach [Sat, 16 Sep 2017 07:22:10 +0000 (00:22 -0700)]
Fix build error for AVRCP13 compat fix
Bug:
37943083
Test: manual
Change-Id: I3974192dd007804f90f35a724a39824ed093a633
Merged-In: I6d041590dc51d7e8711b17fb1cb9c880b640052a
Ajay Panicker [Wed, 6 Sep 2017 16:59:51 +0000 (09:59 -0700)]
Change our AVRCP capabilities if the remote device only supports 1.3
This prevents issues with devices that only support 1.3 but can not
handle forward compatability like some Alpine Carkits.
Bug:
37943083
Test: Connect to Alpine carkit that only supports 1.3 and see new features
are used.
Change-Id: I6d041590dc51d7e8711b17fb1cb9c880b640052a
Merged-In: I6d041590dc51d7e8711b17fb1cb9c880b640052a
(cherry picked from commit
f9f1c8b449efb9cb7894a64fe2977f875679ba52)
(cherry picked from commit
ff2d86ed3af91099597d033a76a143437543d6fd)
Myles Watson [Thu, 14 Sep 2017 21:13:44 +0000 (14:13 -0700)]
GAP: Set service_id before calling gap_release_ccb
Calling gap_release_ccb with a service_id == 0, which in turn
calls BTM_SecClrService with an ID of 0.
From the documentation for BTM_SecClrService:
Service ID - Id of the service to remove. '0' removes all
service records (except SDP).
Bug:
65695769,
65223508
Test: BLE connection and characteristic read
Change-Id: Icf309807f02e1faa273cf9bad9c09d9221a8bbfd
(cherry picked from commit
5c5c10683e2a11162838297fc8054b15837c4f32)
(cherry picked from commit
4023c6731d5e991c6202d4e499b9dd43d642fb3c)
Jeremy Klein [Fri, 8 Sep 2017 21:04:39 +0000 (14:04 -0700)]
Ensure that services are cleaned from the GattServer HandleMap.
The incorrect service handle was being plumbed up to onServiceDeleted.
This was causing stale entries to stick around forever in the HandleMap,
which could later cause failures to find callback references in
ContextMap if the connection ID changed for a given device.
Bug:
65463237
Test: unit tests modified and run
Change-Id: I2e22858b447f4e6b5a4fbceee4c406191c84a67d
(cherry picked from commit
e631789075f5625fd79c774678f4af0bf102c7d1)
Andre Eisenbach [Thu, 17 Aug 2017 00:51:13 +0000 (00:51 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours am:
1ee8850324 -s ours am:
27e67ba277 -s ours am:
5af8ec6e85 -s ours am:
bc2ddd916c -s ours
am:
ad12cf8070 -s ours
Change-Id: I98a440d9bfa53e413c531b2afa510b52c02104cc
OSDN Git Service
