OSDN Git Service
Myles Watson [Sat, 13 Jan 2018 01:45:53 +0000 (01:45 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours am:
54d56dce26 -s ours am:
325785a28e -s ours am:
f0a0bd2150 -s ours am:
33c34c6187 -s ours am:
fe274a6544 -s ours
am:
25cec205f9 -s ours
Change-Id: I35a626c78628e0cb1cb05ab0d28f93cb1c296bce
Ajay Panicker [Sat, 13 Jan 2018 01:45:25 +0000 (01:45 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am:
e71013a820 am:
b0c0a69f45 am:
7a26c58e12 am:
335bda7c4d am:
a2aa7fe13f -s ours
am:
a4ee1a73db
Change-Id: I7f340e1a0cb5f707e313bfe448b994f9fa38f404
Myles Watson [Sat, 13 Jan 2018 01:40:12 +0000 (01:40 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours am:
54d56dce26 -s ours am:
325785a28e -s ours am:
f0a0bd2150 -s ours am:
33c34c6187 -s ours
am:
fe274a6544 -s ours
Change-Id: I59abde97c92c16d918def58e33877963280ebc7a
Ajay Panicker [Sat, 13 Jan 2018 01:39:48 +0000 (01:39 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am:
e71013a820 am:
b0c0a69f45 am:
7a26c58e12 am:
335bda7c4d
am:
a2aa7fe13f -s ours
Change-Id: Ibf22da15b0bba4597acc38a64a202d632fdddfff
Ajay Panicker [Sat, 13 Jan 2018 01:36:19 +0000 (01:36 +0000)]
Merge "AVRCP: Check the number of text attributes requested" into oc-dev
am:
8f3a82d17a
Change-Id: I388cfb6259d5a2c4bf31a6c97a75b2656f681faa
Myles Watson [Sat, 13 Jan 2018 01:32:08 +0000 (01:32 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours am:
54d56dce26 -s ours am:
325785a28e -s ours am:
f0a0bd2150 -s ours
am:
33c34c6187 -s ours
Change-Id: I2fdcd0703c3ee3c192e2724899853e85b552013f
Ajay Panicker [Sat, 13 Jan 2018 01:31:46 +0000 (01:31 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am:
e71013a820 am:
b0c0a69f45 am:
7a26c58e12
am:
335bda7c4d
Change-Id: I4e40e8dc5fe42ccbc475849f5769042068d7ad57
Ajay Panicker [Sat, 13 Jan 2018 01:30:01 +0000 (01:30 +0000)]
Merge "AVRCP: Check the number of text attributes requested" into oc-dev
Myles Watson [Sat, 13 Jan 2018 01:25:55 +0000 (01:25 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours am:
54d56dce26 -s ours am:
325785a28e -s ours
am:
f0a0bd2150 -s ours
Change-Id: I47f6f6a0e16aa3a21bc5c5e31b53bd4c5df0c0c7
Ajay Panicker [Sat, 13 Jan 2018 01:25:24 +0000 (01:25 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am:
e71013a820 am:
b0c0a69f45
am:
7a26c58e12
Change-Id: Icfbf6a3498f6c1c13e2a4329f9e1289f5e058553
Myles Watson [Sat, 13 Jan 2018 01:19:46 +0000 (01:19 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours am:
54d56dce26 -s ours
am:
325785a28e -s ours
Change-Id: I19bd48a00903e888ad9b758b1b8c1a7ec23c10eb
Ajay Panicker [Sat, 13 Jan 2018 01:19:15 +0000 (01:19 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am:
e71013a820
am:
b0c0a69f45
Change-Id: I5213c3a1a5b8a75330e09f08858f3dd394cbcfbe
Myles Watson [Sat, 13 Jan 2018 01:18:38 +0000 (01:18 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev am:
3f25ecf630 am:
b4cfd05ab3 am:
8502e4862d am:
56cd06f031 am:
138fd6babf -s ours
am:
6123aedafe -s ours
Change-Id: Iad65834ed4244f7de543120f9d051a597c88e098
Myles Watson [Sat, 13 Jan 2018 01:18:14 +0000 (01:18 +0000)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback am:
bcad4b57fa am:
7158d558cf am:
9b46b1e674 am:
22fe062fd8 am:
09cfdf316a -s ours
am:
c57972e5b5 -s ours
Change-Id: I659ecb5b1f921e926e0057e64d9d479739c4b7e4
Myles Watson [Sat, 13 Jan 2018 01:16:42 +0000 (01:16 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev am:
3f25ecf630 am:
b4cfd05ab3 am:
8502e4862d am:
56cd06f031
am:
138fd6babf -s ours
Change-Id: Iba28c0f20a1221bc2969dd368dac9e7304c422fc
Myles Watson [Sat, 13 Jan 2018 01:16:02 +0000 (01:16 +0000)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback am:
bcad4b57fa am:
7158d558cf am:
9b46b1e674 am:
22fe062fd8
am:
09cfdf316a -s ours
Change-Id: I6a219c7c1d61110f09a4dd41156f57103d89479e
Myles Watson [Sat, 13 Jan 2018 01:14:00 +0000 (01:14 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours
am:
54d56dce26 -s ours
Change-Id: I0ddfab9277c515385a388e26652ca8098d6d9e94
Ajay Panicker [Sat, 13 Jan 2018 01:13:39 +0000 (01:13 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev
am:
e71013a820
Change-Id: I1064d189d31afa12f9ab42b195ad2e962964e5bb
Myles Watson [Sat, 13 Jan 2018 01:09:56 +0000 (01:09 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev am:
3f25ecf630 am:
b4cfd05ab3 am:
8502e4862d
am:
56cd06f031
Change-Id: I374d1f6b4cf1ddb945900707c6af8b0c2f996aa8
Myles Watson [Sat, 13 Jan 2018 01:09:44 +0000 (01:09 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5
am:
52de7b9029 -s ours
Change-Id: I1ac8501dca4c9d1b44f400c093cfdc2069d09339
Myles Watson [Sat, 13 Jan 2018 01:09:10 +0000 (01:09 +0000)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback am:
bcad4b57fa am:
7158d558cf am:
9b46b1e674
am:
22fe062fd8
Change-Id: Ib462df60f326e1b1260daa137164b56351b56290
Myles Watson [Sat, 13 Jan 2018 01:06:51 +0000 (01:06 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282
am:
27626267a5
Change-Id: I73f0933ab850b4bb3eedf66cc9c588d04d74129b
Ajay Panicker [Sat, 13 Jan 2018 01:05:11 +0000 (01:05 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev
Myles Watson [Sat, 13 Jan 2018 01:03:44 +0000 (01:03 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev am:
3f25ecf630 am:
b4cfd05ab3
am:
8502e4862d
Change-Id: I32e0ab42d76d45fa33146007c222732ec6ef80c9
Myles Watson [Sat, 13 Jan 2018 01:03:19 +0000 (01:03 +0000)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback am:
bcad4b57fa am:
7158d558cf
am:
9b46b1e674
Change-Id: Ie3bcf1d89d5d9a0aaaff359362653dee32d89008
Myles Watson [Sat, 13 Jan 2018 01:00:06 +0000 (01:00 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e
am:
8fa876b282
Change-Id: Ie9c47005fcc5891b2b9c382c032d4e4bed3cb591
Myles Watson [Sat, 13 Jan 2018 00:57:15 +0000 (00:57 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev am:
3f25ecf630
am:
b4cfd05ab3
Change-Id: Idb9ca3709ac93e4357e941ef08e5387c96a43c82
Myles Watson [Sat, 13 Jan 2018 00:56:43 +0000 (00:56 +0000)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback am:
bcad4b57fa
am:
7158d558cf
Change-Id: I8746aae1cf5ea683988b4605e426b5e29b7c25de
Myles Watson [Sat, 13 Jan 2018 00:55:36 +0000 (00:55 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev
am:
7cfaf8724e
Change-Id: I194a6c63954b7b2847973974005c6d79aa11289c
Myles Watson [Sat, 13 Jan 2018 00:51:27 +0000 (00:51 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev
am:
3f25ecf630
Change-Id: Icc576479d4390cbb076aba74e90004b521ff4e29
Myles Watson [Sat, 13 Jan 2018 00:51:04 +0000 (00:51 +0000)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback
am:
bcad4b57fa
Change-Id: I5e1b04e62aaa25f18e1911fdeeb051abe140f99f
Myles Watson [Sat, 13 Jan 2018 00:47:00 +0000 (00:47 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev
Stanley Tng [Sat, 13 Jan 2018 00:42:03 +0000 (00:42 +0000)]
Merge "Remove memory reference to invalid mem in error log" into oc-dev
am:
ce6cf16714 -s ours
Change-Id: I0a2e430c2cd5193ba5acad17ec91978419caf9dc
TreeHugger Robot [Sat, 13 Jan 2018 00:38:16 +0000 (00:38 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev
TreeHugger Robot [Sat, 13 Jan 2018 00:34:16 +0000 (00:34 +0000)]
Merge "Remove memory reference to invalid mem in error log" into oc-dev
Myles Watson [Sat, 13 Jan 2018 00:26:55 +0000 (00:26 +0000)]
BNEP: Check received frame type
am:
b910734a55
Change-Id: Iefaa80409555ea9653fd398e062ceffa5ae129da
Stanley Tng [Fri, 12 Jan 2018 22:42:13 +0000 (22:42 +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
am:
c3a061581a -s ours
Change-Id: I68ac0ad6d76b9a4cb52893a5062dcc109cee690a
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:23:08 +0000 (22:23 +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
am:
73cf4ff881
Change-Id: Ieef8aad30eec72d3dee755e85f6bad6177fb1acc
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
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
Merged-In: I63b857d031c55d3a0754e4101e330843eb422b2a
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
Myles Watson [Fri, 12 Jan 2018 21:59:24 +0000 (21:59 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into oc-dev
am:
4583cab341
Change-Id: I2298a4a507527f950fc503c0ebb4b76c96f70ce6
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
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
Merged-In: I2b9f32b92d72f226361e6a80f20f9c7ee77f6019
Pavlin Radoslavov [Fri, 12 Jan 2018 21:16:07 +0000 (21:16 +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
am:
01c15d1737 -s ours
Change-Id: Iff9bbaea1a9db7be3c5274c35cb29f44bd33f0a0
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:54:17 +0000 (19:54 +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
am:
56d163b30c
Change-Id: I37032fd93c691e2f597fb6b76bef40a7abb6d69f
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: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: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: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 "Fix unexpected behavior in SDP" into oc-dev
am:
02ee3ed2df
Change-Id: If02f6da17d32d1a96b2fb9054e1ae955e84c3db2