OSDN Git Service
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:49 +0000 (21:39 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into oc-dev
* changes:
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7 am:
7781bec06e skipped:
349d1fb596
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7 am:
7781bec06e
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:08 +0000 (21:39 +0000)]
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7 am:
7781bec06e skipped:
349d1fb596
Change-Id: Iea1c1e5a791b6ee03714e23daafc317b8b4b670b
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:06 +0000 (21:39 +0000)]
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7 am:
7781bec06e
Change-Id: I8c52ee09952bb03da09418a86a7865070177fbdd
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:04 +0000 (21:39 +0000)]
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7
Change-Id: I6393804bc9845ac8cd3f62f38df52206dd62cbcc
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:03 +0000 (21:39 +0000)]
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041
Change-Id: I5bb77085b74b30710f7c4eb41f4a183ee46ab37b
Android Build Merger (Role) [Wed, 7 Feb 2018 21:38:56 +0000 (21:38 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev am:
c1f1c627c8 am:
7bed084759 am:
af3f55e2e2 am:
58b9373cc5
Change-Id: Idc40781aed669a80681e19a61858f19b7c1ac8c0
Android Build Merger (Role) [Wed, 7 Feb 2018 21:38:55 +0000 (21:38 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev am:
c1f1c627c8 am:
7bed084759 am:
af3f55e2e2
Change-Id: I5930c000a4b9fb01d40ed611c1bd77efcda1b8f5
Android Build Merger (Role) [Wed, 7 Feb 2018 21:38:54 +0000 (21:38 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev am:
c1f1c627c8 am:
7bed084759
Change-Id: I4084cc2a26b76c3b95ca91b700463e0edfaf4a4d
Myles Watson [Wed, 7 Feb 2018 21:38:45 +0000 (21:38 +0000)]
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev
am:
87d9e19727
Change-Id: If7db6b29ed6a842349b7070ec9692b2b1faeb0cd
Myles Watson [Wed, 7 Feb 2018 21:38:42 +0000 (21:38 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev
am:
c1f1c627c8
Change-Id: I921df8b46b290f25ec3e3876f0669766ee035257
Android Build Merger (Role) [Wed, 7 Feb 2018 21:38:26 +0000 (21:38 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev am:
5666c37ad1 am:
dfef16ff78 am:
9cd44cac30
Change-Id: I4822fadd69527526689fb89052d5154563bb1706
Android Build Merger (Role) [Wed, 7 Feb 2018 21:38:25 +0000 (21:38 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev am:
5666c37ad1 am:
dfef16ff78
Change-Id: I9be8980f56bb4baf9b427e7390f5dbc2a9682dd2
Myles Watson [Wed, 7 Feb 2018 21:38:17 +0000 (21:38 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr2-dev
am:
30b21cde00
Change-Id: Ib777a1d7ed1c1541b3fecd513ac52c6e0f027698
Myles Watson [Wed, 7 Feb 2018 21:38:14 +0000 (21:38 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev
am:
5666c37ad1
Change-Id: Ib9f91cd05f2bca87756c033091c7fb6b237ff680
TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea
DO NOT MERGE: SDP: Check p_req_end before reading from p_req
TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea
DO NOT MERGE: SDP: Check p_req_end before reading from p_req
TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev
TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db am:
8604b579ec
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea
DO NOT MERGE: SDP: Check p_req_end before reading from p_req
TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into oc-dev
* changes:
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db am:
8604b579ec skipped:
6c1fe0668d
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db am:
8604b579ec
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea
DO NOT MERGE: SDP: Check p_req_end before reading from p_req
TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev
* changes:
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea
DO NOT MERGE: SDP: Check p_req_end before reading from p_req
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:22 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407 am:
5a512bd29f am:
063e487cb1 am:
1170310876 am:
8e70cd4d15 skipped:
bf26e15f10
Change-Id: I2682a0552a8579c401b4a49af3145b5577f0c53b
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:21 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407 am:
5a512bd29f am:
063e487cb1 am:
1170310876 am:
8e70cd4d15
Change-Id: Id62a6bf04ff44e2b2f28b3e318886907c25d6456
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:19 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407 am:
5a512bd29f am:
063e487cb1 am:
1170310876
Change-Id: Ic06dca7bd702f558399969217c3df23b9a43b14e
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:18 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407 am:
5a512bd29f am:
063e487cb1
Change-Id: I6d3794a99a85aad5d1546b94b693db91a7d9adef
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:17 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407 am:
5a512bd29f
Change-Id: Ie69e1fd2e30742edc770e58d62c142692914b873
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:16 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407
Change-Id: Iae89be86bc20908521d2c99a099f8728c4e9f820
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:15 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4
Change-Id: Iaec135fc10b631d0ba46467ba71692f8a60e477c
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:13 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a
Change-Id: Idde655e8a3377560317189bbc49620670c5923c8
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:12 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4
Change-Id: I2462f1128b027a515b616beb005c879e6d372f27
Android Build Merger (Role) [Wed, 7 Feb 2018 20:08:23 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db am:
8604b579ec skipped:
6c1fe0668d
Change-Id: I26eb5d630f27be4a80da01ebad1ef60b9e59846e
Android Build Merger (Role) [Wed, 7 Feb 2018 20:08:22 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db am:
8604b579ec
Change-Id: I0c1395a07cbbb8d29f93c0de8048daf049bd24dc
Android Build Merger (Role) [Wed, 7 Feb 2018 20:08:21 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db
Change-Id: I312ef4feec2eb5f14d33315824f49ee0c80978f3
Android Build Merger (Role) [Wed, 7 Feb 2018 20:08:19 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec
Change-Id: I312edefb3dde4b9124c2426d93c6de1a20d714f4
Android Build Merger (Role) [Wed, 7 Feb 2018 20:08:18 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea
Change-Id: I38fe9031785ca2476280a03c1510781e0750f9da
Myles Watson [Fri, 12 Jan 2018 01:43:40 +0000 (17:43 -0800)]
DO NOT MERGE: SDP: Check p_req_end before reading from p_req
Bug:
69384124
Test: Connect a headset
Change-Id: Ia30c58ed39977552e5ddc21cc3c1b54c6b1d8abe
Myles Watson [Fri, 12 Jan 2018 01:43:40 +0000 (17:43 -0800)]
DO NOT MERGE: SDP: Check p_req_end before reading from p_req
Bug:
69384124
Test: Connect a headset
Change-Id: Ia30c58ed39977552e5ddc21cc3c1b54c6b1d8abe
Myles Watson [Fri, 12 Jan 2018 01:43:40 +0000 (17:43 -0800)]
SDP: Check p_req_end before reading from p_req
Bug:
69384124
Test: Connect a headset
Change-Id: Ia30c58ed39977552e5ddc21cc3c1b54c6b1d8abe
Merged-In: Ia30c58ed39977552e5ddc21cc3c1b54c6b1d8abe
Myles Watson [Tue, 16 Jan 2018 18:38:01 +0000 (18:38 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c am:
0f9c39d5cd am:
510601cbb4 am:
b92debbd19 am:
0e69fe96e7 am:
00a4610749
am:
eacc3e945c -s ours
Change-Id: I4a3bdd2e6dc5688500c4c10704669ba874bac2ff
Myles Watson [Tue, 16 Jan 2018 18:33:06 +0000 (18:33 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c am:
0f9c39d5cd am:
510601cbb4 am:
b92debbd19 am:
0e69fe96e7
am:
00a4610749
Change-Id: I749c16b970ce622161f073f9a15a51b8b09887ca
Myles Watson [Tue, 16 Jan 2018 18:28:28 +0000 (18:28 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c am:
0f9c39d5cd am:
510601cbb4 am:
b92debbd19
am:
0e69fe96e7
Change-Id: I1cf83ae6e68124da3afc3f8fc7884d3e12587b80
Myles Watson [Tue, 16 Jan 2018 18:24:21 +0000 (18:24 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c am:
0f9c39d5cd am:
510601cbb4
am:
b92debbd19
Change-Id: I4e66566e973a8443537f85715dcd9a18ae639d07
Myles Watson [Tue, 16 Jan 2018 18:12:53 +0000 (18:12 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c am:
0f9c39d5cd
am:
510601cbb4
Change-Id: I95f12990cbc975453460aa18ab125bf571add95d
Myles Watson [Tue, 16 Jan 2018 18:08:23 +0000 (18:08 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c
am:
0f9c39d5cd
Change-Id: I56a016ee9e1459472e97a341b8cbc9b8253b230b
Myles Watson [Tue, 16 Jan 2018 18:03:20 +0000 (18:03 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d
am:
1c4f74e02c
Change-Id: I160dce825ef9490fea2c9614472d4bb2477cfb40
Myles Watson [Tue, 16 Jan 2018 17:58:18 +0000 (17:58 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4
am:
1f573b136d
Change-Id: I2d2d968c09bc690ec03ee54a1a4060ef2ba71eac
Myles Watson [Tue, 16 Jan 2018 17:53:49 +0000 (17:53 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev
am:
f3c40264c4
Change-Id: I22c76d476befb51d5e8b8c1d5557e711d8949507
TreeHugger Robot [Tue, 16 Jan 2018 17:46:17 +0000 (17:46 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev
TreeHugger Robot [Tue, 16 Jan 2018 17:46:14 +0000 (17:46 +0000)]
Merge "SDP: Include the offset in sdp_disc_server_rsp" into oc-dev
Ajay Panicker [Sat, 13 Jan 2018 02:28:37 +0000 (02:28 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4 am:
786be83578 -s ours am:
66cda0073a am:
f9d07e37fa am:
2a8638c939 am:
0daa921541
am:
89ec0b650b -s ours
Change-Id: I08971172cd73ddc098aaa571b153eee84d163dbb
Ajay Panicker [Sat, 13 Jan 2018 02:22:04 +0000 (02:22 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4 am:
786be83578 -s ours am:
66cda0073a am:
f9d07e37fa am:
2a8638c939
am:
0daa921541
Change-Id: I00f724417c2c0b57810f5772fa21e31b434c5e40
Ajay Panicker [Sat, 13 Jan 2018 02:17:01 +0000 (02:17 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4 am:
786be83578 -s ours am:
66cda0073a am:
f9d07e37fa
am:
2a8638c939
Change-Id: Icc24d0d12d7d435491bf2941608c40fddb959834
Ajay Panicker [Sat, 13 Jan 2018 02:09:42 +0000 (02:09 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4 am:
786be83578 -s ours am:
66cda0073a
am:
f9d07e37fa
Change-Id: I9860cc0aca5bba8682babfc64a9751cd547ede8f
Ajay Panicker [Sat, 13 Jan 2018 02:03:56 +0000 (02:03 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4 am:
786be83578 -s ours
am:
66cda0073a
Change-Id: I6d65606a09c8b1dba7bb5d23e4463af534abf852
Ajay Panicker [Sat, 13 Jan 2018 02:02:43 +0000 (02:02 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75 am:
b70b57eaf8 -s ours am:
876f7a2033 am:
6c5d8c52b1 am:
1b601dde3c am:
b83b14d8d9
am:
3d05bc5b79 -s ours
Change-Id: I583c0213873ef2e77243eee8edf26a9048fe9f88
Ajay Panicker [Sat, 13 Jan 2018 02:02:27 +0000 (02:02 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev am:
37534db500 am:
81b581d311 am:
201090a46b am:
19607d5aa6
am:
2e98875389 -s ours
Change-Id: I54fc2e5b7547b87cd8ff8894bcb77bafaeff1f22
Ajay Panicker [Sat, 13 Jan 2018 01:59:21 +0000 (01:59 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4
am:
786be83578 -s ours
Change-Id: Ie6a054ff92fb0fe993d900b0c4a3873bb62e097e
Ajay Panicker [Sat, 13 Jan 2018 01:55:12 +0000 (01:55 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75 am:
b70b57eaf8 -s ours am:
876f7a2033 am:
6c5d8c52b1 am:
1b601dde3c
am:
b83b14d8d9
Change-Id: I2852da99354c858d0f0879dee1ec5e81c04d979e
Ajay Panicker [Sat, 13 Jan 2018 01:54:54 +0000 (01:54 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev am:
37534db500 am:
81b581d311 am:
201090a46b
am:
19607d5aa6
Change-Id: Ic8af3f38856ec2be7dffa347c04432cb517c265a
Ajay Panicker [Sat, 13 Jan 2018 01:53:55 +0000 (01:53 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699
am:
45490dc0b4
Change-Id: Ifaa0e2129b7dbea668016813d969b94fd8c45960
Ajay Panicker [Sat, 13 Jan 2018 01:50:09 +0000 (01:50 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75 am:
b70b57eaf8 -s ours am:
876f7a2033 am:
6c5d8c52b1
am:
1b601dde3c
Change-Id: I649e82377c13a8a19b398729cb84b65243c04c06
Ajay Panicker [Sat, 13 Jan 2018 01:49:52 +0000 (01:49 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev am:
37534db500 am:
81b581d311
am:
201090a46b
Change-Id: Ibf437c7127c08d08b9edf02d719689f7a8ba54fb
Ajay Panicker [Sat, 13 Jan 2018 01:46:26 +0000 (01:46 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75 am:
b70b57eaf8 -s ours am:
876f7a2033
am:
6c5d8c52b1
Change-Id: I7e3df3f9df1904c5515f98756b00a1b3d0951dbf
Ajay Panicker [Sat, 13 Jan 2018 01:45:20 +0000 (01:45 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6
am:
9f936a8699
Change-Id: Ie5405de54e55239946d2cf608f0fe1d7e2229dc3
Ajay Panicker [Sat, 13 Jan 2018 01:40:49 +0000 (01:40 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75 am:
b70b57eaf8 -s ours
am:
876f7a2033
Change-Id: I0c87bf60a4c0cd1f46ad1fdf1d79e650d2918456
Ajay Panicker [Sat, 13 Jan 2018 01:40:49 +0000 (01:40 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev am:
37534db500
am:
81b581d311
Change-Id: Ie3ba63f7d87ea51c41ce3a741305b3ba64fa1b0e
Myles Watson [Sat, 13 Jan 2018 01:40:29 +0000 (01:40 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8 am:
661e71faaf am:
df4385a4f0 -s ours am:
4c5e6785e0 -s ours am:
f1fb6a9a40 -s ours am:
8340e7985c -s ours am:
cc6e8864a9 -s ours
am:
d3135d932d -s ours
Change-Id: I18f7610720cab40a0b0082ab5a19508c38ad7e39
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:51 +0000 (01:39 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev
am:
4207e26df6
Change-Id: I187de7f4dd45ea3fa3b6921d0d2ec54d23da9b81
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:16 +0000 (01:36 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev
am:
37534db500
Change-Id: I3307b3b4d8b42e729ba1a1e0fcfcf880eb3101c1
Ajay Panicker [Sat, 13 Jan 2018 01:36:13 +0000 (01:36 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75
am:
b70b57eaf8 -s ours
Change-Id: Ifdb9178a0d6ba8655f5b7c93405b6155dd1afe33
Ajay Panicker [Sat, 13 Jan 2018 01:33:24 +0000 (01:33 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654
am:
12d12aac75
Change-Id: I1714e438cbd56e7ffe14e5f260adf0eed8100f70
Myles Watson [Sat, 13 Jan 2018 01:32:24 +0000 (01:32 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8 am:
661e71faaf am:
df4385a4f0 -s ours am:
4c5e6785e0 -s ours am:
f1fb6a9a40 -s ours am:
8340e7985c -s ours
am:
cc6e8864a9 -s ours
Change-Id: Ie5d57ed45daf2b0e94b1bda8346c92912701619b
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
Ajay Panicker [Sat, 13 Jan 2018 01:29:56 +0000 (01:29 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev
Ajay Panicker [Sat, 13 Jan 2018 01:29:51 +0000 (01:29 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev
Ajay Panicker [Sat, 13 Jan 2018 01:27:12 +0000 (01:27 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd
am:
d95e0eb654
Change-Id: I65c4d588423ca11d897d86c11dc65f13004bdfb5
Myles Watson [Sat, 13 Jan 2018 01:26:16 +0000 (01:26 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8 am:
661e71faaf am:
df4385a4f0 -s ours am:
4c5e6785e0 -s ours am:
f1fb6a9a40 -s ours
am:
8340e7985c -s ours
Change-Id: I1a8fa2e5fae44959a3ec03fbf2032df9276089cd
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
Ajay Panicker [Sat, 13 Jan 2018 01:20:49 +0000 (01:20 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev
am:
90368e62cd
Change-Id: Ie5c417600fe460bef706cc6db879fb1ddbd37eb7
Myles Watson [Sat, 13 Jan 2018 01:20:20 +0000 (01:20 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8 am:
661e71faaf am:
df4385a4f0 -s ours am:
4c5e6785e0 -s ours
am:
f1fb6a9a40 -s ours
Change-Id: Ia688f80ab38e7ff5771fa0c0550c48d916d1d60d
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: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:20 +0000 (01:14 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8 am:
661e71faaf am:
df4385a4f0 -s ours
am:
4c5e6785e0 -s ours
Change-Id: I81a35444ac036549ee47d00325c7f516b69eb911
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:10:01 +0000 (01:10 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8 am:
661e71faaf
am:
df4385a4f0 -s ours
Change-Id: Ia0fb19da63c464c6821288c761126a58f4685e3f
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:07:21 +0000 (01:07 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8
am:
661e71faaf
Change-Id: I15d0e141edb9f775e5a7987145562353b16d861c
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
TreeHugger Robot [Sat, 13 Jan 2018 01:05:43 +0000 (01:05 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev
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