OSDN Git Service
Hansong Zhang [Fri, 10 Aug 2018 00:10:24 +0000 (17:10 -0700)]
Merge changes from topic "am-
aa78d1e3-f74a-4cdb-b5c4-
c931b7a0997b" into oc-dev am:
a57247b56c am:
597d46d81d
am:
7df3c31238
Change-Id: I3e4b460e0c44f57c7bb92b18ad60153d0df5b9e0
Hansong Zhang [Fri, 10 Aug 2018 00:09:54 +0000 (17:09 -0700)]
Merge "Check remaining frame length in rfc_process_mx_message" into oc-dev am:
ae8509d9b7 am:
9cb1e4b72a
am:
45be325db1
Change-Id: I87a16a0543eb7e17f1e121086bddbb7674c7a3fe
Hansong Zhang [Fri, 10 Aug 2018 00:06:16 +0000 (17:06 -0700)]
Merge changes from topic "am-
aa78d1e3-f74a-4cdb-b5c4-
c931b7a0997b" into oc-dev am:
a57247b56c
am:
597d46d81d
Change-Id: Ia97c64fc4911fd8e209d3223b220008230e57a97
Hansong Zhang [Fri, 10 Aug 2018 00:05:49 +0000 (17:05 -0700)]
Merge "Check remaining frame length in rfc_process_mx_message" into oc-dev am:
ae8509d9b7
am:
9cb1e4b72a
Change-Id: Iffa1f2640e3192dafe94bd26879c4080055cdd20
Hansong Zhang [Thu, 9 Aug 2018 23:53:06 +0000 (16:53 -0700)]
Merge changes from topic "am-
aa78d1e3-f74a-4cdb-b5c4-
c931b7a0997b" into oc-dev
am:
a57247b56c
Change-Id: I6165f5f7aebd63c0eb4c00e2e918d6ee260643b2
Hansong Zhang [Thu, 9 Aug 2018 23:52:28 +0000 (16:52 -0700)]
Merge "Check remaining frame length in rfc_process_mx_message" into oc-dev
am:
ae8509d9b7
Change-Id: I00abf83f15bc4859deaa6283e0b8e26b8f069cbd
Hansong Zhang [Thu, 9 Aug 2018 23:43:44 +0000 (23:43 +0000)]
Merge changes from topic "am-
aa78d1e3-f74a-4cdb-b5c4-
c931b7a0997b" into oc-dev
* changes:
[automerger] DO NOT MERGE Check remaining frame length in rfc_process_mx_message am:
53e8b941fd am:
ab038438dc am:
8a6961131b am:
976a23cd4b skipped:
14db3b68c0
[automerger] DO NOT MERGE Check remaining frame length in rfc_process_mx_message am:
53e8b941fd am:
ab038438dc am:
8a6961131b am:
976a23cd4b
[automerger] DO NOT MERGE Check remaining frame length in rfc_process_mx_message am:
53e8b941fd am:
ab038438dc am:
8a6961131b
[automerger] DO NOT MERGE Check remaining frame length in rfc_process_mx_message am:
53e8b941fd am:
ab038438dc
[automerger] DO NOT MERGE Check remaining frame length in rfc_process_mx_message am:
53e8b941fd
DO NOT MERGE Check remaining frame length in rfc_process_mx_message
TreeHugger Robot [Thu, 9 Aug 2018 23:28:49 +0000 (23:28 +0000)]
Merge "Check remaining frame length in rfc_process_mx_message" into oc-dev
Cheney Ni [Thu, 9 Aug 2018 23:05:31 +0000 (16:05 -0700)]
Merge changes from topic "am-
1ac1c997-3571-4fd2-87bd-
bb10887070b7" into oc-dev am:
b7b580578b am:
455910d972
am:
6a1fafd1a8
Change-Id: I995ae90bbe586d32eb1796544a6b284b90fc9b2b
Cheney Ni [Thu, 9 Aug 2018 23:00:26 +0000 (16:00 -0700)]
Merge changes from topic "am-
1ac1c997-3571-4fd2-87bd-
bb10887070b7" into oc-dev am:
b7b580578b
am:
455910d972
Change-Id: Ica42916bc91579c5275dd7bdcd4a873adb3e8a1e
Cheney Ni [Thu, 9 Aug 2018 22:57:33 +0000 (15:57 -0700)]
Merge changes from topic "am-
1ac1c997-3571-4fd2-87bd-
bb10887070b7" into oc-dev
am:
b7b580578b
Change-Id: If36b04bb774713d6223939fbdc8100d17a9b8831
Android Build Merger (Role) [Thu, 9 Aug 2018 22:55:53 +0000 (22:55 +0000)]
[automerger] DO NOT MERGE Check remaining frame length in rfc_process_mx_message am:
53e8b941fd am:
ab038438dc am:
8a6961131b am:
976a23cd4b skipped:
14db3b68c0
Change-Id: I9b391091a3b315cc63ffd9473de4f2355bea7120
Android Build Merger (Role) [Thu, 9 Aug 2018 22:55:51 +0000 (22:55 +0000)]
[automerger] DO NOT MERGE Check remaining frame length in rfc_process_mx_message am:
53e8b941fd am:
ab038438dc am:
8a6961131b am:
976a23cd4b
Change-Id: Id44e7d201010b92d57251b517abac83c0c280d7f
Android Build Merger (Role) [Thu, 9 Aug 2018 22:55:50 +0000 (22:55 +0000)]
[automerger] DO NOT MERGE Check remaining frame length in rfc_process_mx_message am:
53e8b941fd am:
ab038438dc am:
8a6961131b
Change-Id: Icce80ed02b3a56f870be1f10cc28acc3217c2dee
Android Build Merger (Role) [Thu, 9 Aug 2018 22:55:49 +0000 (22:55 +0000)]
[automerger] DO NOT MERGE Check remaining frame length in rfc_process_mx_message am:
53e8b941fd am:
ab038438dc
Change-Id: I39245a2ad5f7a25817312a839dc380c65d5c6bc7
Android Build Merger (Role) [Thu, 9 Aug 2018 22:55:47 +0000 (22:55 +0000)]
[automerger] DO NOT MERGE Check remaining frame length in rfc_process_mx_message am:
53e8b941fd
Change-Id: Icf15e5062606fb69a632d136dbbb4257802bbef2
Hansong Zhang [Wed, 8 Aug 2018 18:38:30 +0000 (11:38 -0700)]
DO NOT MERGE Check remaining frame length in rfc_process_mx_message
Bug:
111936792
Bug:
80432928
Test: manual
Change-Id: Ie2c09f3d598fb230ce060c9043f5a88c241cdd79
TreeHugger Robot [Thu, 9 Aug 2018 22:28:43 +0000 (22:28 +0000)]
Merge changes from topic "am-
1ac1c997-3571-4fd2-87bd-
bb10887070b7" into oc-dev
* changes:
[automerger] DO NOT MERGE: Add packet length checks in mca_ccb_hdl_req am:
fb5115a9f8 am:
1ced84f755 am:
87005c456f am:
86ae4a64a7 skipped:
c1bf22d912
[automerger] DO NOT MERGE: Add packet length checks in mca_ccb_hdl_req am:
fb5115a9f8 am:
1ced84f755 am:
87005c456f am:
86ae4a64a7
[automerger] DO NOT MERGE: Add packet length checks in mca_ccb_hdl_req am:
fb5115a9f8 am:
1ced84f755 am:
87005c456f
[automerger] DO NOT MERGE: Add packet length checks in mca_ccb_hdl_req am:
fb5115a9f8 am:
1ced84f755
[automerger] DO NOT MERGE: Add packet length checks in mca_ccb_hdl_req am:
fb5115a9f8
DO NOT MERGE: Add packet length checks in mca_ccb_hdl_req
Jakub Pawlowski [Thu, 9 Aug 2018 21:27:55 +0000 (14:27 -0700)]
Merge "Fix copy length calculation in sdp_copy_raw_data" into oc-dev am:
9e8972b882 am:
06d127395d
am:
e2f657b725
Change-Id: Ieb06eb975b8a3c7d19e8501d0e4035a1617e0f73
Jakub Pawlowski [Thu, 9 Aug 2018 21:23:48 +0000 (14:23 -0700)]
Merge "Fix copy length calculation in sdp_copy_raw_data" into oc-dev am:
9e8972b882
am:
06d127395d
Change-Id: Ic9c78e0cbf3b3386029883ba88e4c786fcb27832
Jakub Pawlowski [Thu, 9 Aug 2018 21:19:48 +0000 (14:19 -0700)]
Merge "Fix copy length calculation in sdp_copy_raw_data" into oc-dev
am:
9e8972b882
Change-Id: Ic8e44e7546ba67ef3500d4d7d13de2ddd1382261
TreeHugger Robot [Thu, 9 Aug 2018 21:06:30 +0000 (21:06 +0000)]
Merge "Fix copy length calculation in sdp_copy_raw_data" into oc-dev
Hansong Zhang [Wed, 8 Aug 2018 18:31:28 +0000 (11:31 -0700)]
Check remaining frame length in rfc_process_mx_message
Bug:
111936792
Bug:
80432928
Test: manual
Change-Id: Ie2c09f3d598fb230ce060c9043f5a88c241cdd79
Android Build Merger (Role) [Thu, 9 Aug 2018 05:31:35 +0000 (05:31 +0000)]
[automerger] DO NOT MERGE: Add packet length checks in mca_ccb_hdl_req am:
fb5115a9f8 am:
1ced84f755 am:
87005c456f am:
86ae4a64a7 skipped:
c1bf22d912
Change-Id: I8e04165542a70a421799042c1854d6e7622c4e2d
Android Build Merger (Role) [Thu, 9 Aug 2018 05:31:31 +0000 (05:31 +0000)]
[automerger] DO NOT MERGE: Add packet length checks in mca_ccb_hdl_req am:
fb5115a9f8 am:
1ced84f755 am:
87005c456f am:
86ae4a64a7
Change-Id: Ib82a2509ca23e101935302247ac1cf440723fb56
Android Build Merger (Role) [Thu, 9 Aug 2018 05:31:28 +0000 (05:31 +0000)]
[automerger] DO NOT MERGE: Add packet length checks in mca_ccb_hdl_req am:
fb5115a9f8 am:
1ced84f755 am:
87005c456f
Change-Id: Ifac068eadc58e0ec110d7e014489c0412971e870
Android Build Merger (Role) [Thu, 9 Aug 2018 05:31:25 +0000 (05:31 +0000)]
[automerger] DO NOT MERGE: Add packet length checks in mca_ccb_hdl_req am:
fb5115a9f8 am:
1ced84f755
Change-Id: Ie0aaf223c4a572094bdf93c09fb24fcb0b3d67e4
Android Build Merger (Role) [Thu, 9 Aug 2018 05:31:21 +0000 (05:31 +0000)]
[automerger] DO NOT MERGE: Add packet length checks in mca_ccb_hdl_req am:
fb5115a9f8
Change-Id: I5863c4cf1a923c99cc00ad5d802e88d4e08eb6dc
Cheney Ni [Tue, 7 Aug 2018 13:32:07 +0000 (21:32 +0800)]
DO NOT MERGE: Add packet length checks in mca_ccb_hdl_req
Bug:
110791536
Test: manual
Change-Id: Ica5d8037246682fdb190b2747a86ed8d44c2869a
Chris Fries [Mon, 30 Jul 2018 22:59:57 +0000 (22:59 +0000)]
Merge "Ignore SDP failure while bonding if SDP was not attempted" into pi-dev
TreeHugger Robot [Wed, 25 Jul 2018 17:38:24 +0000 (17:38 +0000)]
Merge "HFP: Reset BTA SCO control block when bta_ag_create_sco failed" into pi-dev
Cheney Ni [Tue, 17 Jul 2018 11:27:59 +0000 (19:27 +0800)]
Ignore SDP failure while bonding if SDP was not attempted
When bonding, there is an ACL_UP event to the upper layers and some apps
may want to fetch SDP in return. This can break pairing. In cases SDP fails,
it causes the procedure to be finished before the LinkKey is generated.
And thus the LinkKey is not committed to NVRAM and the device is not paired.
Bug:
111189110
Test: : Pair / Unpair BT accessories manually
Change-Id: Iaefbe8b6c1fc3e78f0f120220992df84699a2eb8
Merged-In: Iaefbe8b6c1fc3e78f0f120220992df84699a2eb8
(cherry picked from commit
5492af2d0ee3a9c810f001cfc9a29283a76b4438)
Hansong Zhang [Fri, 20 Jul 2018 18:39:40 +0000 (11:39 -0700)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into oc-dev am:
0d4898a05d am:
a9fc38bcbf
am:
a7d532c77c
Change-Id: Ic3bbfdf73d39b1455f6d27bf9294fb56011d0829
Hansong Zhang [Fri, 20 Jul 2018 18:39:07 +0000 (11:39 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8 skipped:
00dad61a16 am:
c898c9c6a4 am:
37e8dd3c55
am:
024d0e1d5b -s ours
Change-Id: Idb00a9bfd6c501c90ce4aa4361a586f9cf422f0d
Hansong Zhang [Fri, 20 Jul 2018 18:32:52 +0000 (11:32 -0700)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into oc-dev am:
0d4898a05d
am:
a9fc38bcbf
Change-Id: I70a95eb32638425b21e5bef29a0a02b370277bac
Hansong Zhang [Fri, 20 Jul 2018 18:32:21 +0000 (11:32 -0700)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8 skipped:
00dad61a16 am:
c898c9c6a4
am:
37e8dd3c55
Change-Id: I94485d850eee68f7434b3f8f20332c243ceae2a1
Hansong Zhang [Fri, 20 Jul 2018 18:30:04 +0000 (11:30 -0700)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into oc-dev
am:
0d4898a05d
Change-Id: Id277c1b6c5b105a492d03980d5cf7e958128b505
Hansong Zhang [Fri, 20 Jul 2018 18:29:19 +0000 (11:29 -0700)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8 skipped:
00dad61a16
am:
c898c9c6a4
Change-Id: If8c3042504c65bb244b253f822409457fadb096e
TreeHugger Robot [Fri, 20 Jul 2018 18:25:33 +0000 (18:25 +0000)]
Merge "DO NOT MERGE SDP: Fix the param_len recalculation" into nyc-dev
TreeHugger Robot [Fri, 20 Jul 2018 18:25:33 +0000 (18:25 +0000)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41 am:
f066a42e32 skipped:
72d1557fe0
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41 am:
f066a42e32
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b
DO NOT MERGE SDP: Fix the param_len recalculation
TreeHugger Robot [Fri, 20 Jul 2018 18:25:33 +0000 (18:25 +0000)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41 am:
f066a42e32
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b
DO NOT MERGE SDP: Fix the param_len recalculation
TreeHugger Robot [Fri, 20 Jul 2018 18:25:33 +0000 (18:25 +0000)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into cw-f-dev
* changes:
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b
DO NOT MERGE SDP: Fix the param_len recalculation
TreeHugger Robot [Fri, 20 Jul 2018 18:25:33 +0000 (18:25 +0000)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b
DO NOT MERGE SDP: Fix the param_len recalculation
TreeHugger Robot [Fri, 20 Jul 2018 18:25:33 +0000 (18:25 +0000)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b
DO NOT MERGE SDP: Fix the param_len recalculation
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:45 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41 am:
f066a42e32 skipped:
72d1557fe0
Change-Id: Ia2aafdffd87d9f7a00429d50783e64864fe92db3
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:44 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41 am:
f066a42e32
Change-Id: I036429bc438f3713148c44668c9030d9968bbb71
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:43 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41
Change-Id: I2b54ca809d16ca1df0a9061301f76cf64c16243e
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:41 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce
Change-Id: I792c9737e3ba5ac8ab173e7675ddde50383a97b8
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:40 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b
Change-Id: Ic935bcfa40526b5f6dbd8714552b6420a35cf29a
Hansong Zhang [Fri, 20 Jul 2018 17:16:14 +0000 (10:16 -0700)]
DO NOT MERGE SDP: Fix the param_len recalculation
Bug:
78136869
Test: manual connection to an A2DP device
Change-Id: If32b848696180ab2fd33f514de89cb8c3d202e39
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:24 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8 skipped:
00dad61a16
Change-Id: I4f5e848e72f9ae77371c2d4e596a882581d8fe7b
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:23 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8
Change-Id: I8705f0d81fba1027c7a9b506f447482901227c40
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:22 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e
Change-Id: I53e95354ae4b588f11e57fc6e5aef741177becfe
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:20 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4
Change-Id: I0693e632de44e6781f7435a730dcd485e27e4cab
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:19 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a
Change-Id: I54d6a6295dcb5791aa339ffaa23ac2f319acd667
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:18 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233
Change-Id: I5429442640a203df07ba448e8b9837fb8017eb6d
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:17 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23
Change-Id: Ie9d7f0209ad248035cb65c9e6d04236ba61a9264
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:15 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb
Change-Id: Iea2346e652fe6bb086e894615bb409491d60457d
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:14 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e
Change-Id: I1adfd8dd7cd684e5d9af4a1967f0630e53fe035f
Hansong Zhang [Fri, 20 Jul 2018 17:16:14 +0000 (10:16 -0700)]
DO NOT MERGE SDP: Fix the param_len recalculation
Bug:
78136869
Test: manual connection to an A2DP device
Change-Id: If32b848696180ab2fd33f514de89cb8c3d202e39
TreeHugger Robot [Wed, 18 Jul 2018 18:58:15 +0000 (18:58 +0000)]
Merge "AVRCP: Reject SetAddressedPlayer command only if remote set invalid player ID" into pi-dev
Jakub Pawlowski [Mon, 16 Jul 2018 13:40:35 +0000 (06:40 -0700)]
Fix copy length calculation in sdp_copy_raw_data
Test: compilation
Bug:
110216176
Change-Id: Ic4a19c9f0fe8cd592bc6c25dcec7b1da49ff7459
Hansong Zhang [Sat, 14 Jul 2018 00:20:24 +0000 (17:20 -0700)]
Merge "Fix a wrong check in rfc_parse_data" into oc-dev am:
e6d78b9c37 am:
a7992011a4
am:
4a8e14e16b
Change-Id: Iab5a146f0f22780a38192c1e5294350738daf0a7
Hansong Zhang [Sat, 14 Jul 2018 00:19:59 +0000 (17:19 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf skipped:
54cb89ba14 am:
93110a553e am:
aa7175ae97
am:
05211b1947 -s ours
Change-Id: If80c66ab182419dbe22d455dd332ec20c3670da9
Hansong Zhang [Sat, 14 Jul 2018 00:19:47 +0000 (17:19 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c skipped:
cdcca17caa am:
d88cfe6530 -s ours am:
85a799bff2 -s ours
am:
af35291d41 -s ours
Change-Id: I01cde7e51e2ebf2482746aa19f23ba3d925923ef
Hansong Zhang [Sat, 14 Jul 2018 00:07:40 +0000 (17:07 -0700)]
Merge "Fix a wrong check in rfc_parse_data" into oc-dev am:
e6d78b9c37
am:
a7992011a4
Change-Id: I2dbe619f4db2afd28f1426265e2e43c5ede9efd3
Hansong Zhang [Sat, 14 Jul 2018 00:07:13 +0000 (17:07 -0700)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf skipped:
54cb89ba14 am:
93110a553e
am:
aa7175ae97
Change-Id: Ic9876c6ff2c1919976e2409970f02f61f4c4db20
Hansong Zhang [Sat, 14 Jul 2018 00:06:42 +0000 (17:06 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c skipped:
cdcca17caa am:
d88cfe6530 -s ours
am:
85a799bff2 -s ours
Change-Id: I5cf4f65085bc701e75af5556d0315e2923b8f1ea
Hansong Zhang [Fri, 13 Jul 2018 23:12:06 +0000 (16:12 -0700)]
Merge "Fix a wrong check in rfc_parse_data" into oc-dev
am:
e6d78b9c37
Change-Id: Id4bc567e478860b199e7cbea2c91fc163b0cc01f
TreeHugger Robot [Fri, 13 Jul 2018 23:00:24 +0000 (23:00 +0000)]
Merge "Fix a wrong check in rfc_parse_data" into oc-dev
Hansong Zhang [Fri, 13 Jul 2018 22:31:26 +0000 (15:31 -0700)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf skipped:
54cb89ba14
am:
93110a553e
Change-Id: I6e00c18146c048be020c8077b9b3ba7a8aabe2a0
Hansong Zhang [Fri, 13 Jul 2018 22:30:55 +0000 (15:30 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c skipped:
cdcca17caa
am:
d88cfe6530 -s ours
Change-Id: I2d99954f7ee5fd5f246eae2158a01fb4f4c679a6
Benson Li [Wed, 4 Jul 2018 12:41:58 +0000 (20:41 +0800)]
HFP: Reset BTA SCO control block when bta_ag_create_sco failed
* When trying to connect SCO to non-active and active device back to
back, the first connection to non-active device must fail gracefully
* Otherwise, BTA SCO state machine may stuck in a irrecoverable state
* Schedule to send AUDIO_CONNECTING state before starting SCO connection
to avoid race condition between connecting state and connection
failure
Bug:
111101075
Test: Manual test, make a call and switch path A->speaker->B on phone UI
Change-Id: I9bfa389e04863944d88f2bca49d27f1247fa072b
(cherry picked from commit
5360d6ac01702aa0657a10e561fae760fd6a151d)
Hansong Zhang [Fri, 13 Jul 2018 20:45:46 +0000 (13:45 -0700)]
Fix a wrong check in rfc_parse_data
Bug:
78288018
Bug:
111436796
Test: manual
Change-Id: I16e6026acbaac230fe1453bbac040d1b75bcea2a
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:17 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf skipped:
54cb89ba14
Change-Id: I26b9980c190e11ac0676e4ca3d24766614653d96
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:15 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf
Change-Id: I81864bd4e4a97b50a9e22ba426e336717463496f
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:13 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9
Change-Id: I7b018c136700d25e8a4905d0245d802979ea8c78
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:12 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53
Change-Id: I58c883eeac2c4a6db16ed70ba54cade1e548e549
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:10 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942
Change-Id: Ic4a9218144a8c88e8bc84177d0f85c976fae1844
Hansong Zhang [Fri, 13 Jul 2018 20:43:27 +0000 (13:43 -0700)]
DO NOT MERGE Fix a wrong check in rfc_parse_data
Bug:
78288018
Bug:
111436796
Test: manual
Change-Id: I16e6026acbaac230fe1453bbac040d1b75bcea2a
Hansong Zhang [Fri, 13 Jul 2018 17:20:02 +0000 (10:20 -0700)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714 skipped:
99381269de skipped:
fff4962f67 am:
8e51fb603d -s ours am:
262a81d328 -s ours
am:
8729bc8b2a -s ours
Change-Id: If2af5bbcbf0036810c76d2f5920742c8965c38fa
Hansong Zhang [Fri, 13 Jul 2018 16:51:51 +0000 (09:51 -0700)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714 skipped:
99381269de skipped:
fff4962f67 am:
8e51fb603d -s ours
am:
262a81d328 -s ours
Change-Id: Ic909e32a9c23540ac149709e4686f9d705bae687
Hansong Zhang [Fri, 13 Jul 2018 16:32:45 +0000 (09:32 -0700)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714 skipped:
99381269de skipped:
fff4962f67
am:
8e51fb603d -s ours
Change-Id: Ic2a62fcfb00d4a25a97c505e15926cc4bd806066
Android Build Merger (Role) [Fri, 13 Jul 2018 16:18:37 +0000 (16:18 +0000)]
[automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c skipped:
cdcca17caa
Change-Id: Ifcbc63cb72a2cc8659792d9e1a02c8241d97b8b2
Android Build Merger (Role) [Fri, 13 Jul 2018 16:18:35 +0000 (16:18 +0000)]
[automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c
Change-Id: I103f98d8725fa7e12dad4a89a66e691e20cd4651
Android Build Merger (Role) [Fri, 13 Jul 2018 16:18:33 +0000 (16:18 +0000)]
[automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc
Change-Id: Ia0ef6e7edf06eee0e01e88451b9b4c162620e145
Android Build Merger (Role) [Fri, 13 Jul 2018 16:18:31 +0000 (16:18 +0000)]
[automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c
Change-Id: I8a01f6d1b1a0555c98fa72d27c796cd5756eb1bf
Android Build Merger (Role) [Fri, 13 Jul 2018 16:18:30 +0000 (16:18 +0000)]
[automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4
Change-Id: I56a6a6281f816339d4028f84c1c720426863c21f
Hansong Zhang [Thu, 7 Jun 2018 23:11:27 +0000 (16:11 -0700)]
DO NOT MERGE Add bound check for rfc_parse_data
Bug:
78288018
Test: manual
Change-Id: I44349cd22c141483d01bce0f5a2131b727d0feb0
Merged-In: I44349cd22c141483d01bce0f5a2131b727d0feb0
(cherry picked from commit
1b9a465eea85e86984bb1e53be69880159e59c69)
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:25 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714 skipped:
99381269de skipped:
fff4962f67
Change-Id: Ia28843cf75c09affea13d302054e9b31943b4247
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:23 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714 skipped:
99381269de
Change-Id: Ib634ea6caddad254fa971dc5993fb66697855e05
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:20 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714
Change-Id: I4a1b737c01d4a2a0aac153dfa857a4e91b8858b8
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:19 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2
Change-Id: I9529f804880eb014a2e40b71e19af49a369d0c40
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:17 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c
Change-Id: I93bd0e643f666e1f2c2af36fb56186e725ab6e03
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:15 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40
Change-Id: I7b848bbdf257721c4f653daeb531ec2f6be4a6ad
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:13 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87
Change-Id: Ibc434fafa8043a4c9b42e26a80d893441a4cef27
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:11 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e
Change-Id: I0e691f7030013c84b90a10e20e67274ac2408025
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:09 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea
Change-Id: I4c80ed01bf081bfe6ab6d27fcbb5b685309fb2a2
Hansong Zhang [Thu, 7 Jun 2018 23:11:27 +0000 (16:11 -0700)]
Add bound check for rfc_parse_data
Bug:
78288018
Test: manual
Change-Id: I44349cd22c141483d01bce0f5a2131b727d0feb0
Merged-In: I44349cd22c141483d01bce0f5a2131b727d0feb0
Jakub Pawlowski [Fri, 13 Jul 2018 13:48:15 +0000 (06:48 -0700)]
[automerger skipped] [automerger] Fix out of bounds read in l2c_rcv_acl_data am:
9bf8cb2683 am:
4a370bbdc5 am:
2e08a14470 skipped:
e4460d953d am:
c4a8457124 am:
dee921631a am:
ebee1a8658 am:
bde49a9c60 am:
e6e84901aa am:
15eee6efec -s ours am:
1e89f1d35c -s ours
am:
007ae2dd82 -s ours
Change-Id: I18f2b5ca397f3c1a4182e78416e85aa8d3712860
OSDN Git Service
