OSDN Git Service
Jakub Pawlowski [Tue, 13 Nov 2018 00:29:41 +0000 (16:29 -0800)]
introduce gatt::connection_manager::get_apps_connecting_to am:
d1d3088e93
am:
9b8e46352e
Change-Id: Ic2586e09eba7708c8863f2618dad2735778cecf3
Jakub Pawlowski [Mon, 12 Nov 2018 23:36:23 +0000 (15:36 -0800)]
introduce gatt::connection_manager::get_apps_connecting_to
am:
d1d3088e93
Change-Id: Idde98ec3cb082150cd57d7749be5d53c11745379
Jakub Pawlowski [Sat, 10 Nov 2018 13:41:41 +0000 (05:41 -0800)]
Naming cleanup in stack/gatt/connection_manager.* am:
d28727edd4
am:
431791987d
Change-Id: I97f4e48a0edfeb98629e559ac71d735ba7195341
Jakub Pawlowski [Sat, 10 Nov 2018 13:37:14 +0000 (05:37 -0800)]
Naming cleanup in stack/gatt/connection_manager.*
am:
d28727edd4
Change-Id: I73a6d1da304af64c986eba804011e6d9f0d6d4cc
Jakub Pawlowski [Fri, 9 Nov 2018 17:40:04 +0000 (18:40 +0100)]
introduce gatt::connection_manager::get_apps_connecting_to
This is to clean up the interface, and don't expose internal control
structures.
Test: compilation
Change-Id: Id2afc5efb4c14be0b787cfabbe21fc1961381cb7
Jakub Pawlowski [Fri, 9 Nov 2018 23:06:06 +0000 (15:06 -0800)]
gatt_utils_white_list -> connection_manager am:
ddba8a6243
am:
e1a3f22bd7
Change-Id: Ic5596a7126024ce6c6c37f3753f83f6acc1974a5
Jakub Pawlowski [Fri, 9 Nov 2018 23:01:02 +0000 (15:01 -0800)]
gatt_utils_white_list -> connection_manager
am:
ddba8a6243
Change-Id: I8000a7a5121c61270a7ea6cb24b48cec5ee1f09d
Jakub Pawlowski [Fri, 9 Nov 2018 11:42:32 +0000 (12:42 +0100)]
Naming cleanup in stack/gatt/connection_manager.*
Test: compilation
Change-Id: Ic73632cb258515856b9ae5616ec47881b4b28c61
Jakub Pawlowski [Fri, 9 Nov 2018 10:53:11 +0000 (11:53 +0100)]
gatt_utils_white_list -> connection_manager
Test: compilation
Change-Id: Ib6741ddd8332ff70efd47a8ede0176d887743ff4
Ajay Panicker [Fri, 9 Nov 2018 03:11:40 +0000 (19:11 -0800)]
Merge "AVRCP: Change notification variable when the interim response is sent" am:
62cd940292
am:
5ecac9b8e5
Change-Id: Iea6a4b8261b0a90cdc85904ddb2e9b0312cfb8da
Ajay Panicker [Fri, 9 Nov 2018 03:06:59 +0000 (19:06 -0800)]
Merge "AVRCP: Change notification variable when the interim response is sent"
am:
62cd940292
Change-Id: I11061ce6fb36be8cac793ad93cd0d502eed9734d
Treehugger Robot [Fri, 9 Nov 2018 02:57:12 +0000 (02:57 +0000)]
Merge "AVRCP: Change notification variable when the interim response is sent"
weichinweng [Fri, 9 Nov 2018 00:42:21 +0000 (16:42 -0800)]
[automerger skipped] Merge "Hearing Aid: Combine audio from stereo to mono when only one side connect" into pi-dev
am:
ac6a9f95b3 -s ours
Change-Id: I421bfc5a38d47b34f44f7dbdd4157787485432c7
TreeHugger Robot [Fri, 9 Nov 2018 00:27:36 +0000 (00:27 +0000)]
Merge "Hearing Aid: Combine audio from stereo to mono when only one side connect" into pi-dev
Ajay Panicker [Tue, 26 Jun 2018 21:52:56 +0000 (14:52 -0700)]
AVRCP: Change notification variable when the interim response is sent
This avoids the possibility of having a changed notification be sent
before an interim response is sent when the AVRCP service has to wait
for a response from the media layer for information regarding the
notification.
Also fix the PlayPosition test for AVRCP as it was testing for play
state correctness.
Bug:
109588762
Test: Run host test net_test_avrcp
Change-Id: Icb7bb1068191ecf2a2e390854084b6b9b47537fa
(cherry picked from commit
2d87908fe8825245dcc2e1dbde027331f1e2371d)
weichinweng [Fri, 26 Oct 2018 09:21:13 +0000 (17:21 +0800)]
Hearing Aid: Combine audio from stereo to mono when only one side connect
* On the design of the Hearing Aids, the phone will separate the stereo
audio samples and stream the left audio samples to the left device and
right audio samples to the right device. When only one side connected,
phone will only stream the one side audio sample to one hearing aid
device.
* This CL adds a functionality for checking the left/right hearing aid
and combine audio samples from stereo to mono when only on side connect.
Bug:
117178490
Bug:
116317072
Test: disconnected/reconnected one side hearing when play stereo test
sound.
Change-Id: Idb3871951617680aba3ca82f801a70c95403d889
Merged-In: Idb3871951617680aba3ca82f801a70c95403d889
Jakub Pawlowski [Thu, 8 Nov 2018 23:41:38 +0000 (15:41 -0800)]
Minor style fixes in gatt_main.cc am:
b5629de6ed
am:
4872b155e4
Change-Id: Iddae08e7095a80f3a0edd168a88020de9ddd0933
Jakub Pawlowski [Thu, 8 Nov 2018 23:25:56 +0000 (15:25 -0800)]
Minor style fixes in gatt_main.cc
am:
b5629de6ed
Change-Id: I26d6290ccfe93ab38329dfb84560b8722804d57f
Jakub Pawlowski [Thu, 8 Nov 2018 18:54:49 +0000 (19:54 +0100)]
Minor style fixes in gatt_main.cc
Test: compilation
Change-Id: I446b9e83603e7224abe1eddd030b4502cc7dceb5
Ajay Panicker [Thu, 8 Nov 2018 22:27:51 +0000 (14:27 -0800)]
Merge "Add code coverage report support to Bluetooth" am:
d533096b1b
am:
c916abccf0
Change-Id: Iabd851fece3ca68fe3dcd468ffcd73b666fe4ebe
Ajay Panicker [Thu, 8 Nov 2018 22:18:37 +0000 (14:18 -0800)]
Merge "Add code coverage report support to Bluetooth"
am:
d533096b1b
Change-Id: I4980643d5443389bb04e14fd93fdf3941a7d3b19
Treehugger Robot [Thu, 8 Nov 2018 22:02:48 +0000 (22:02 +0000)]
Merge "Add code coverage report support to Bluetooth"
weichinweng [Thu, 8 Nov 2018 08:54:36 +0000 (00:54 -0800)]
Merge "HFP: Don't use mSBC for HF devices not supporting related feature" am:
c5931e67b4
am:
50192a91ae
Change-Id: I58a54079702d787ce62a7744b73aefd947d9c96b
weichinweng [Thu, 8 Nov 2018 08:50:27 +0000 (00:50 -0800)]
Merge "HFP: Don't use mSBC for HF devices not supporting related feature"
am:
c5931e67b4
Change-Id: Ic9969ea693f9912f12917186c921cdccdba085ab
Treehugger Robot [Thu, 8 Nov 2018 08:43:27 +0000 (08:43 +0000)]
Merge "HFP: Don't use mSBC for HF devices not supporting related feature"
Stanley Tng [Wed, 7 Nov 2018 23:53:04 +0000 (15:53 -0800)]
[automerger skipped] Fix Spurious Hearing Aid Start and Stop Cmds am:
ff3ed00c79
am:
da4c3cf3d7 -s ours
Change-Id: If7bd552fcbb250cdc94b3b50304f3c7d65a6f9f1
Stanley Tng [Wed, 7 Nov 2018 23:47:05 +0000 (15:47 -0800)]
Fix Spurious Hearing Aid Start and Stop Cmds
am:
ff3ed00c79
Change-Id: I14199a18d6d89385c23188e265703f5dc4d12189
Stanley Tng [Sun, 14 Oct 2018 04:17:00 +0000 (21:17 -0700)]
Fix Spurious Hearing Aid Start and Stop Cmds
Prevent the spurious Start and Stop Commands that are send to the
Hearing Aids when there is audio suspend and resume, and also connection
and disconnections.
Also, make sure that the callback for the Audio Suspend and Resume are
done in the main thread; previously, it was running in the wrong socket
thread.
Lastly, make sure that the Connection Update callback are processed
correctly; previously, we are not checking that the right connection
interval are set and taking the callbacks done by service discovery.
Test: Manual testing with Hearing Aids
Bug:
117619792
Change-Id: I33a175947b0118f0234ec6338c20ac6e7963a598
Merged-In: I33a175947b0118f0234ec6338c20ac6e7963a598
(cherry picked from commit
cac96c646fac463a9c894ad702bd4428863c9400)
Ajay Panicker [Wed, 7 Nov 2018 03:06:54 +0000 (19:06 -0800)]
Merge "AVRCP: Change notification variable when the interim response is sent" into pi-dev
am:
ae04da547f
Change-Id: I8a6dc602c4aa58b462f46440a91804aa2dd202ff
TreeHugger Robot [Wed, 7 Nov 2018 03:01:13 +0000 (03:01 +0000)]
Merge "AVRCP: Change notification variable when the interim response is sent" into pi-dev
Chienyuan [Mon, 5 Nov 2018 21:55:29 +0000 (13:55 -0800)]
[automerger skipped] Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-dev am:
6bc3fa5698 am:
2a2dc33454 -s ours am:
efa804ed44 -s ours
am:
6a27baad58 -s ours
Change-Id: I95f0f3cba36d2b5f292e4f869aff97c7ce1daf32
Chienyuan [Mon, 5 Nov 2018 21:49:27 +0000 (13:49 -0800)]
[automerger skipped] Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-dev am:
6bc3fa5698 am:
2a2dc33454 -s ours
am:
efa804ed44 -s ours
Change-Id: I107e96c3cbeb1f3afd3c60663669aa46c05acae7
Chienyuan [Mon, 5 Nov 2018 21:45:40 +0000 (13:45 -0800)]
[automerger skipped] Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-dev am:
6bc3fa5698
am:
2a2dc33454 -s ours
Change-Id: I37f850ba7d3361dc801f80188137e23d63f1d2dd
Chienyuan [Mon, 5 Nov 2018 21:38:46 +0000 (13:38 -0800)]
Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-dev
am:
6bc3fa5698
Change-Id: Ib0f1f4d80313b20e2db2233b0766dfdf887f7bb3
TreeHugger Robot [Mon, 5 Nov 2018 21:32:27 +0000 (21:32 +0000)]
Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-dev
Hansong Zhang [Mon, 5 Nov 2018 21:29:22 +0000 (13:29 -0800)]
Merge "HFP: Check AT command buffer boundary during parsing" into pi-dev
am:
c3b078c4e6
Change-Id: If4f2565ac0574f5fd2f35a74a3b2f1e59d2990a4
Hansong Zhang [Mon, 5 Nov 2018 21:18:49 +0000 (21:18 +0000)]
Merge "HFP: Check AT command buffer boundary during parsing" into pi-dev
Ajay Panicker [Thu, 20 Sep 2018 21:39:00 +0000 (14:39 -0700)]
Add code coverage report support to Bluetooth
Allow the generation of code coverage reports for any code that has
native tests.
In order to add coverage support to code do the following steps.
1. Add "clang_file_coverage" as a default to the source library(s) you
want statistics for.
2. Add "clang_coverage_bin" as a default to the host supported test.
3. Add the test name and the files you want covered to "gen_coverage.py"
- The files covered can either be a directory or files.
- Avoid using / at the beginning of a covered file/dir as this
breaks how the coverage generator resolves filenames.
Bug:
114751344
Test: run ./gen_coverage.py and test arguments manually
Change-Id: I9dd04f6ee2fd642531e301e3bfd52713f862cd4b
Myles Watson [Mon, 5 Nov 2018 19:36:27 +0000 (11:36 -0800)]
[automerger skipped] Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into oc-dev am:
f90160ea4f -s ours am:
d2e1ff8307 -s ours am:
4e8ad23c80 -s ours
am:
11338dee1e -s ours
Change-Id: I22616892e5c59fc86621752111fb739b219b75d0
Myles Watson [Mon, 5 Nov 2018 19:32:05 +0000 (11:32 -0800)]
[automerger skipped] Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into oc-dev am:
f90160ea4f -s ours am:
d2e1ff8307 -s ours
am:
4e8ad23c80 -s ours
Change-Id: I3ecb8639e74cbd720ffa5ee547e77c6898091907
Myles Watson [Mon, 5 Nov 2018 19:26:17 +0000 (11:26 -0800)]
[automerger skipped] Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into oc-dev am:
f90160ea4f -s ours
am:
d2e1ff8307 -s ours
Change-Id: Id3fec3163877efd920bf6883c4c1dbc108bdce75
Myles Watson [Mon, 5 Nov 2018 19:22:43 +0000 (11:22 -0800)]
[automerger skipped] Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into oc-dev
am:
f90160ea4f -s ours
Change-Id: Ibfd89fac51bc174eb75f144f623c59b8f290c655
TreeHugger Robot [Mon, 5 Nov 2018 19:06:20 +0000 (19:06 +0000)]
Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into oc-dev
Chienyuan [Mon, 5 Nov 2018 18:37:50 +0000 (10:37 -0800)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a skipped:
f9606e1d89 skipped:
c96313fb2c skipped:
9c2fb57cee am:
18515721e5 -s ours am:
6408abcd83 -s ours am:
bfe3eda2bb -s ours
am:
970d51348b -s ours
Change-Id: Ia4e18e0261f1162136674bd9bfa0dd3c27cd9fbc
Chienyuan [Mon, 5 Nov 2018 18:33:22 +0000 (10:33 -0800)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a skipped:
f9606e1d89 skipped:
c96313fb2c skipped:
9c2fb57cee am:
18515721e5 -s ours am:
6408abcd83 -s ours
am:
bfe3eda2bb -s ours
Change-Id: Iab0493279298a450a5b4f223249abbf34d6dc069
Chienyuan [Mon, 5 Nov 2018 18:28:38 +0000 (10:28 -0800)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a skipped:
f9606e1d89 skipped:
c96313fb2c skipped:
9c2fb57cee am:
18515721e5 -s ours
am:
6408abcd83 -s ours
Change-Id: Iff25af63698a6a502b0cae09d16b54072b33ffbd
Chienyuan [Mon, 5 Nov 2018 18:24:35 +0000 (10:24 -0800)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a skipped:
f9606e1d89 skipped:
c96313fb2c skipped:
9c2fb57cee
am:
18515721e5 -s ours
Change-Id: I5b428c6b8ed1cd08d03a5f3c76f46a7211f2077d
Chienyuan [Mon, 5 Nov 2018 18:04:19 +0000 (10:04 -0800)]
[automerger skipped] Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-mr1-dev am:
cfaf7a9792 -s ours
am:
76e509cbd4
Change-Id: Idf4b42277f636cba77e5012b19a4b7657af30e7b
Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:29 +0000 (18:01 +0000)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a skipped:
f9606e1d89 skipped:
c96313fb2c skipped:
9c2fb57cee
Change-Id: I9bb69caded703f74c79189f0cf78069e1fab9ca5
Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:28 +0000 (18:01 +0000)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a skipped:
f9606e1d89 skipped:
c96313fb2c
Change-Id: I29b39b9cd2b0390289b525bf50ce4080b4a9557a
Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:27 +0000 (18:01 +0000)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a skipped:
f9606e1d89
Change-Id: Iee0814f1ed5a5decc214abad4721a84825cd53b1
Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:26 +0000 (18:01 +0000)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a
Change-Id: I5977408e04b4479c9aa2b5d16a03e18d7e9deced
Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:25 +0000 (18:01 +0000)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1
Change-Id: I406dd66fa46d18b70d48faedf810d6a3ddbe3fbc
Chienyuan [Mon, 5 Nov 2018 17:59:04 +0000 (09:59 -0800)]
[automerger skipped] Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-mr1-dev
am:
cfaf7a9792 -s ours
Change-Id: Ie772fff1acf9c3b9d0d8eeaecdfe0f4cb9586461
TreeHugger Robot [Mon, 5 Nov 2018 17:50:52 +0000 (17:50 +0000)]
Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-mr1-dev
Myles Watson [Mon, 5 Nov 2018 17:46:47 +0000 (09:46 -0800)]
[automerger skipped] Merge "DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act" into oc-dev am:
f6dc20ea52 am:
0e1c94b72d am:
a8fcbbcc01 -s ours
am:
a0b485d88a
Change-Id: Ia82d1d5895fb8cd616f2471614dbc4937d393f05
Myles Watson [Mon, 5 Nov 2018 17:46:17 +0000 (09:46 -0800)]
Merge changes from topic "am-
154171ba-0805-48c6-88cf-
c592ee3cf37c" into oc-dev am:
518c50aaa9 am:
e476de0364 am:
999d3d078f
am:
efc63ede47
Change-Id: I890071dd0148a04a715b130e48b3f22a9fdb629f
Myles Watson [Mon, 5 Nov 2018 17:42:56 +0000 (09:42 -0800)]
[automerger skipped] Merge "DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act" into oc-dev am:
f6dc20ea52 am:
0e1c94b72d
am:
a8fcbbcc01 -s ours
Change-Id: I7c85a561273b60e3419b7ce493bafa7f0a39f6dc
Myles Watson [Mon, 5 Nov 2018 17:42:43 +0000 (09:42 -0800)]
Merge changes from topic "am-
154171ba-0805-48c6-88cf-
c592ee3cf37c" into oc-dev am:
518c50aaa9 am:
e476de0364
am:
999d3d078f
Change-Id: Id11bf5d791308d7cd5ce9de2c175b64423291606
Myles Watson [Mon, 5 Nov 2018 17:36:58 +0000 (09:36 -0800)]
Merge "DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act" into oc-dev am:
f6dc20ea52
am:
0e1c94b72d
Change-Id: Iec488eec7467acd6c4c216f1412924e2860f33a3
Myles Watson [Mon, 5 Nov 2018 17:36:37 +0000 (09:36 -0800)]
Merge changes from topic "am-
154171ba-0805-48c6-88cf-
c592ee3cf37c" into oc-dev am:
518c50aaa9
am:
e476de0364
Change-Id: I9d2e15050dbe5f77b1abf7cc67b952ed65e8d161
Myles Watson [Mon, 5 Nov 2018 17:33:38 +0000 (09:33 -0800)]
Merge "DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act" into oc-dev
am:
f6dc20ea52
Change-Id: Ia27e3b2a51ef75bc07b1ba5a8b5aa7064f4aadd6
Myles Watson [Mon, 5 Nov 2018 17:33:14 +0000 (09:33 -0800)]
Merge changes from topic "am-
154171ba-0805-48c6-88cf-
c592ee3cf37c" into oc-dev
am:
518c50aaa9
Change-Id: Ia8b2acfb4a82f90624459a3e49edbeae64d5481f
Myles Watson [Mon, 5 Nov 2018 17:28:51 +0000 (09:28 -0800)]
[automerger skipped] Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into oc-mr1-dev am:
f2f5d9ebf2 -s ours
am:
03d83ca11e
Change-Id: Ic1d893b4a2599cd740cb9dad9d238b654682a2be
Myles Watson [Mon, 5 Nov 2018 17:28:25 +0000 (09:28 -0800)]
Merge "HH: Check parameter length in bta_hh_ctrl_dat_act" into pi-dev
am:
074f3aa646
Change-Id: I7b31a596c6502de029883057ce0d5feff8a4e870
Myles Watson [Mon, 5 Nov 2018 17:23:02 +0000 (09:23 -0800)]
[automerger skipped] Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into oc-mr1-dev
am:
f2f5d9ebf2 -s ours
Change-Id: I10d497a2c99116373a8864d7e4b38ffe7ea1f519
TreeHugger Robot [Mon, 5 Nov 2018 17:16:58 +0000 (17:16 +0000)]
Merge "HH: Check parameter length in bta_hh_ctrl_dat_act" into pi-dev
TreeHugger Robot [Mon, 5 Nov 2018 17:16:37 +0000 (17:16 +0000)]
Merge "DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act" into oc-dev
TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]
Merge changes from topic "am-
154171ba-0805-48c6-88cf-
c592ee3cf37c" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981 am:
9172befdc8 am:
13e8d7ad1c am:
d474c386ef
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981 am:
9172befdc8 am:
13e8d7ad1c
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981 am:
9172befdc8
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981
DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act
TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]
Merge changes from topic "am-
154171ba-0805-48c6-88cf-
c592ee3cf37c" into cw-f-dev
* changes:
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981 am:
9172befdc8 am:
13e8d7ad1c
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981 am:
9172befdc8
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981
DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act
TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]
Merge changes from topic "am-
154171ba-0805-48c6-88cf-
c592ee3cf37c" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981 am:
9172befdc8
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981
DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act
TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]
Merge changes from topic "am-
154171ba-0805-48c6-88cf-
c592ee3cf37c" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981
DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act
TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]
Merge changes from topic "am-
154171ba-0805-48c6-88cf-
c592ee3cf37c" into oc-dev
* changes:
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981 am:
9172befdc8 am:
13e8d7ad1c am:
d474c386ef skipped:
0ea657053e
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981 am:
9172befdc8 am:
13e8d7ad1c am:
d474c386ef
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981 am:
9172befdc8 am:
13e8d7ad1c
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981 am:
9172befdc8
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am:
a4a11e1981
DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act
TreeHugger Robot [Mon, 5 Nov 2018 17:07:59 +0000 (17:07 +0000)]
Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into oc-mr1-dev
Chienyuan [Sat, 3 Nov 2018 05:01:14 +0000 (22:01 -0700)]
Merge changes from topic "Check-AT-command-buffer-boundary-during-parsing" into oc-dev am:
97ed603b62 am:
e81dc3a461 am:
92892e3f98
am:
c862c5c1ca
Change-Id: I2fc671a68660fc0ad7846d988c2e30b2570ebfe0
Chienyuan [Sat, 3 Nov 2018 04:53:05 +0000 (21:53 -0700)]
Merge changes from topic "Check-AT-command-buffer-boundary-during-parsing" into oc-dev am:
97ed603b62 am:
e81dc3a461
am:
92892e3f98
Change-Id: Idec684fb369cb80d8cbc422386613092ef0b61ca
Chienyuan [Sat, 3 Nov 2018 04:42:58 +0000 (21:42 -0700)]
Merge changes from topic "Check-AT-command-buffer-boundary-during-parsing" into oc-dev am:
97ed603b62
am:
e81dc3a461
Change-Id: I30e08d61ec22e58faf4fb33978f2c1db7617b2a8
Chienyuan [Sat, 3 Nov 2018 04:31:37 +0000 (21:31 -0700)]
Merge changes from topic "Check-AT-command-buffer-boundary-during-parsing" into oc-dev
am:
97ed603b62
Change-Id: I68020bb39483cf639ef295b657385a16c6680b90
Chienyuan [Thu, 11 Oct 2018 01:47:46 +0000 (09:47 +0800)]
DO NOT MERGE HFP: Check AT command buffer boundary during parsing
* add p_end parameter to tBTA_AG_AT_CMD_CBACK, bta_ag_at_hsp_cback
and bta_ag_at_hfp_cback to indicate effective data range of p_arg
* add checks for buffer copy overflow in bta_ag_at_hsp_cback and
bta_ag_at_hfp_cback
* add packet legnth checks with p_end in bta_ag_parse_cmer
* add packet length checks with p_end in bta_ag_parse_bac
Bug:
112860487
Test: manual
Change-Id: I6bbbc2ba29ad025c7d3ba023d8191af6a11c4aa9
Merged-In: I6bbbc2ba29ad025c7d3ba023d8191af6a11c4aa9
Chienyuan [Thu, 11 Oct 2018 01:47:46 +0000 (09:47 +0800)]
DO NOT MERGE HFP: Check AT command buffer boundary during parsing
* add p_end parameter to tBTA_AG_AT_CMD_CBACK, bta_ag_at_hsp_cback
and bta_ag_at_hfp_cback to indicate effective data range of p_arg
* add checks for buffer copy overflow in bta_ag_at_hsp_cback and
bta_ag_at_hfp_cback
* add packet legnth checks with p_end in bta_ag_parse_cmer
* add packet length checks with p_end in bta_ag_parse_bac
Bug:
112860487
Test: manual
Change-Id: I6bbbc2ba29ad025c7d3ba023d8191af6a11c4aa9
(cherry picked from commit
749063afebb8324276a47bdfbf320aa70f94a8ba)
TreeHugger Robot [Sat, 3 Nov 2018 00:37:33 +0000 (00:37 +0000)]
Merge changes from topic "Check-AT-command-buffer-boundary-during-parsing" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am:
aea10aec7f am:
289b3fa863
[automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am:
aea10aec7f
DO NOT MERGE HFP: Check AT command buffer boundary during parsing
TreeHugger Robot [Sat, 3 Nov 2018 00:37:33 +0000 (00:37 +0000)]
Merge changes from topic "Check-AT-command-buffer-boundary-during-parsing" into cw-f-dev
* changes:
[automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am:
aea10aec7f
DO NOT MERGE HFP: Check AT command buffer boundary during parsing
TreeHugger Robot [Sat, 3 Nov 2018 00:37:33 +0000 (00:37 +0000)]
Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into nyc-mr1-dev
TreeHugger Robot [Sat, 3 Nov 2018 00:37:33 +0000 (00:37 +0000)]
Merge changes from topic "Check-AT-command-buffer-boundary-during-parsing" into oc-dev
* changes:
[automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am:
aea10aec7f am:
289b3fa863 skipped:
04ade0fdc0
[automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am:
aea10aec7f am:
289b3fa863
[automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am:
aea10aec7f
DO NOT MERGE HFP: Check AT command buffer boundary during parsing
Myles Watson [Thu, 25 Oct 2018 00:05:12 +0000 (17:05 -0700)]
DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr
Bug:
115900043
Test: Sanity pairing and SDP PTS
Change-Id: Ib642f79ed22b65ede5ff786cb1e163d172480f11
Merged-In: Ib642f79ed22b65ede5ff786cb1e163d172480f11
Myles Watson [Thu, 25 Oct 2018 00:05:12 +0000 (17:05 -0700)]
DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr
Bug:
115900043
Test: Sanity pairing and SDP PTS
Change-Id: Ib642f79ed22b65ede5ff786cb1e163d172480f11
Myles Watson [Fri, 2 Nov 2018 23:59:17 +0000 (16:59 -0700)]
Merge "MCAP: Check response length in mca_ccb_hdl_rsp" into pi-dev
am:
97ea73f708
Change-Id: I8c0c9eb2bed0085e3ac465f0f8c5a9594b70d2ca
TreeHugger Robot [Fri, 2 Nov 2018 23:35:25 +0000 (23:35 +0000)]
Merge "MCAP: Check response length in mca_ccb_hdl_rsp" into pi-dev
Myles Watson [Fri, 2 Nov 2018 23:20:16 +0000 (16:20 -0700)]
Merge changes from topic "am-
3290ac2a-4a57-4151-aaf8-
9695d2ed6348" into oc-dev am:
74749c1996 am:
28c5c4ab20 am:
adb9ed0d35
am:
f65b2ddb98
Change-Id: I14787d6180392e7cc09dd3647c204e8b732d7147
Myles Watson [Fri, 2 Nov 2018 23:19:38 +0000 (16:19 -0700)]
[automerger skipped] Merge "DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp" into oc-dev am:
7d38013232 am:
c5c82d09b4 am:
b713c179e8 -s ours
am:
3c9da8ab5d
Change-Id: I72cf46176750a63da844f82285cb2e9f1558978b
Myles Watson [Fri, 2 Nov 2018 23:18:52 +0000 (16:18 -0700)]
Merge changes from topic "am-
a8794701-2d32-4392-bf6f-
9d00a3751e39" into oc-dev am:
6d6c82d9e0 am:
a9291d7c8b am:
cdbadeb96d
am:
578e16258c
Change-Id: I463f71d771e8d2b15858b6243a6d9ac2d809f691
Myles Watson [Fri, 2 Nov 2018 23:10:31 +0000 (16:10 -0700)]
Merge changes from topic "am-
3290ac2a-4a57-4151-aaf8-
9695d2ed6348" into oc-dev am:
74749c1996 am:
28c5c4ab20
am:
adb9ed0d35
Change-Id: Ia54ebfd6c50a44d528db10c8979f986308409180
Myles Watson [Fri, 2 Nov 2018 23:09:49 +0000 (16:09 -0700)]
[automerger skipped] Merge "DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp" into oc-dev am:
7d38013232 am:
c5c82d09b4
am:
b713c179e8 -s ours
Change-Id: Ie1f784ccf56cb65b3c927b8168f75db64e9d56ed
Myles Watson [Fri, 2 Nov 2018 23:09:36 +0000 (16:09 -0700)]
Merge changes from topic "am-
a8794701-2d32-4392-bf6f-
9d00a3751e39" into oc-dev am:
6d6c82d9e0 am:
a9291d7c8b
am:
cdbadeb96d
Change-Id: I9b85c90cf6a82fe97dbbf0a81c03249b4dc0e672
Myles Watson [Fri, 2 Nov 2018 23:06:28 +0000 (16:06 -0700)]
Merge changes from topic "am-
3290ac2a-4a57-4151-aaf8-
9695d2ed6348" into oc-dev am:
74749c1996
am:
28c5c4ab20
Change-Id: Ic8085ac83b196a8101fd25b654bbea2468961216
Myles Watson [Fri, 2 Nov 2018 23:05:47 +0000 (16:05 -0700)]
Merge "DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp" into oc-dev am:
7d38013232
am:
c5c82d09b4
Change-Id: I39323f25b6314cfddb5852f3b07afb99ba713399
Myles Watson [Fri, 2 Nov 2018 23:05:21 +0000 (16:05 -0700)]
Merge changes from topic "am-
a8794701-2d32-4392-bf6f-
9d00a3751e39" into oc-dev am:
6d6c82d9e0
am:
a9291d7c8b
Change-Id: I194865fb7b0dbd79b6c698ff307fdc12a1f42f8f
Myles Watson [Fri, 2 Nov 2018 23:03:56 +0000 (16:03 -0700)]
Merge "SDP: Check p_end in save_attr_seq and add_attr" into pi-dev
am:
13a959b777
Change-Id: I252a3c12c551c0fc62cd09c9ff14b6863ef58cbf
Myles Watson [Fri, 2 Nov 2018 23:01:24 +0000 (16:01 -0700)]
Merge changes from topic "am-
3290ac2a-4a57-4151-aaf8-
9695d2ed6348" into oc-dev
am:
74749c1996
Change-Id: Ie0b18788113d43696ee9b0a35c8352bb4bf7c8a2
Myles Watson [Fri, 2 Nov 2018 22:59:55 +0000 (15:59 -0700)]
Merge "DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp" into oc-dev
am:
7d38013232
Change-Id: I4e52d6cbaa27dc59f90d5c0f7ee63bdac5d40667
OSDN Git Service
