git.osdn.net Git - android-x86/system-bt.git/log

OSDN Git Service

(root) / android-x86 / system-bt.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Jakub Pawlowski [Tue, 27 Nov 2018 21:29:49 +0000 (13:29 -0800)]

[automerger skipped] [automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am: 78508d2c2c am: a236f16071 am: 3f5af0aa65 am: 12557bb999 skipped: 2470706409 am: d2dd0bacbc -s ours am: 1062b94226 -s ours
am: 54f6c84dfd -s ours

Change-Id: I4cb634d3c98dabfdc6f1d95f6c1ff348f954ddd4

commit | commitdiff | tree

Jakub Pawlowski [Tue, 27 Nov 2018 21:24:43 +0000 (13:24 -0800)]

[automerger skipped] [automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am: 78508d2c2c am: a236f16071 am: 3f5af0aa65 am: 12557bb999 skipped: 2470706409 am: d2dd0bacbc -s ours
am: 1062b94226 -s ours

Change-Id: Ic8bab7e79d802eca8efda8a613f83e465e2a4e81

commit | commitdiff | tree

Jakub Pawlowski [Tue, 27 Nov 2018 21:14:37 +0000 (13:14 -0800)]

[automerger skipped] [automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am: 78508d2c2c am: a236f16071 am: 3f5af0aa65 am: 12557bb999 skipped: 2470706409
am: d2dd0bacbc -s ours

Change-Id: If276bb160498a352e02bdb6231ac8fed8142aec4

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 27 Nov 2018 20:09:16 +0000 (20:09 +0000)]

[automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am: 78508d2c2c am: a236f16071 am: 3f5af0aa65 am: 12557bb999 skipped: 2470706409

Change-Id: Id4bfbba911ecb95c728e1daba294fefc9d1de4ce

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 27 Nov 2018 16:47:48 +0000 (16:47 +0000)]

[automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am: 78508d2c2c am: a236f16071 am: 3f5af0aa65 am: 12557bb999

Change-Id: I1ecbacc502b14733b0f4bd11b057763506b1fd95

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 27 Nov 2018 16:47:45 +0000 (16:47 +0000)]

[automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am: 78508d2c2c am: a236f16071 am: 3f5af0aa65

Change-Id: I98ae5ab9e24acd447c0c72835067db0bc7430371

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 27 Nov 2018 16:47:42 +0000 (16:47 +0000)]

[automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am: 78508d2c2c am: a236f16071

Change-Id: I8615cedf8b9192c46506c54934229089021fe101

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 27 Nov 2018 16:47:40 +0000 (16:47 +0000)]

[automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am: 78508d2c2c

Change-Id: If8da202c56ee7deeb7aba67f59b19ef28466f6ae

commit | commitdiff | tree

Jakub Pawlowski [Tue, 20 Nov 2018 21:31:31 +0000 (22:31 +0100)]

Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm

Bug: 116222069
Test: compilation
Change-Id: Iebe2c500dfc2806ca321fdcd170e20c680619d4d
Merged-In: Iebe2c500dfc2806ca321fdcd170e20c680619d4d

commit | commitdiff | tree

Jakub Pawlowski [Tue, 27 Nov 2018 16:31:14 +0000 (08:31 -0800)]

Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am: 889efd5b91 am: 934213ef03
am: 6135f03864

Change-Id: I72d0554197d85b6d63b37c09e67083a21b98ef32

commit | commitdiff | tree

Jakub Pawlowski [Tue, 27 Nov 2018 16:23:09 +0000 (08:23 -0800)]

Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am: 889efd5b91
am: 934213ef03

Change-Id: Ic9ff7d53321c6c7b39f32dc043050f1467a1233d

commit | commitdiff | tree

Jakub Pawlowski [Tue, 27 Nov 2018 16:19:03 +0000 (08:19 -0800)]

Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm
am: 889efd5b91

Change-Id: If3ae150367def015874bebb60c2fca763f01133f

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Nov 2018 21:10:41 +0000 (21:10 +0000)]

Merge "HFP: support pause character "Comma" in acceptable dial digit string" into pi-dev

commit | commitdiff | tree

Jakub Pawlowski [Tue, 20 Nov 2018 21:31:31 +0000 (22:31 +0100)]

Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm

Bug: 116222069
Test: compilation
Change-Id: Iebe2c500dfc2806ca321fdcd170e20c680619d4d

commit | commitdiff | tree

Cheney Ni [Tue, 13 Nov 2018 01:27:42 +0000 (17:27 -0800)]

Revert "Fix OOB in avrc_pars_browse_rsp" am: 6d1c4974bf am: 1e5b0037f8
am: 40cbdde492

Change-Id: Ie709003c0668e1786758b0d17e7459db8f94529a

commit | commitdiff | tree

Cheney Ni [Tue, 13 Nov 2018 01:06:10 +0000 (17:06 -0800)]

Revert "Fix OOB in avrc_pars_browse_rsp" am: 6d1c4974bf
am: 1e5b0037f8

Change-Id: Ibd9afdda7b2f7cc8f895bf9af4cfbd893f3a8bbe

commit | commitdiff | tree

Cheney Ni [Tue, 13 Nov 2018 00:35:58 +0000 (16:35 -0800)]

Revert "Fix OOB in avrc_pars_browse_rsp"
am: 6d1c4974bf

Change-Id: I164343e6a08e851173a730fb06173fd6dca60f03

commit | commitdiff | tree

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

commit | commitdiff | tree

Cheney Ni [Thu, 8 Nov 2018 18:56:07 +0000 (18:56 +0000)]

Revert "Fix OOB in avrc_pars_browse_rsp"

This reverts commit 32a33dc12d4a9b21306510a98bcd039ca3be1dd3.

Reason for revert: regression issue found.

Change-Id: I48db0b0313477e1f3b6fe97cd4d540dfe16f3963
Bug: 111451066

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Mon, 5 Nov 2018 18:03:36 +0000 (18:03 +0000)]

Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]

Merge "DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Myles Watson [Fri, 2 Nov 2018 22:59:31 +0000 (15:59 -0700)]

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into oc-dev
am: 6d6c82d9e0

Change-Id: I4b9f9f0d282b966b123a36d2bf22a95f5ad89577

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:49:35 +0000 (22:49 +0000)]

Merge "SDP: Check p_end in save_attr_seq and add_attr" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:47:59 +0000 (22:47 +0000)]

Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:47:59 +0000 (22:47 +0000)]

Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into nyc-dr1-dev

* changes:
[automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501
DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:47:59 +0000 (22:47 +0000)]

Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3 am: e50ffa7119
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501
  DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:47:59 +0000 (22:47 +0000)]

Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501
  DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:47:59 +0000 (22:47 +0000)]

Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501
  DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:47:59 +0000 (22:47 +0000)]

Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into oc-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3 am: e50ffa7119 skipped: fc00aa02bf
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3 am: e50ffa7119
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501
  DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:44:07 +0000 (22:44 +0000)]

Merge "DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:43:43 +0000 (22:43 +0000)]

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into oc-dev

* changes:
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa am: 0f2de3c3df skipped: a3dbdeece2
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa am: 0f2de3c3df
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e
  DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:43:43 +0000 (22:43 +0000)]

Merge "DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:43:43 +0000 (22:43 +0000)]

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into nyc-dr1-dev

* changes:
[automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e
DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:43:43 +0000 (22:43 +0000)]

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa am: 0f2de3c3df
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e
  DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:43:43 +0000 (22:43 +0000)]

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e
  DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:43:43 +0000 (22:43 +0000)]

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e
  DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp

commit | commitdiff | tree

Chienyuan [Thu, 11 Oct 2018 02:36:57 +0000 (10:36 +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: Idbfa2b8bd4c1a0aeeacfe34349851b3bc8de7c69
Merged-In: Idbfa2b8bd4c1a0aeeacfe34349851b3bc8de7c69
(cherry picked from commit 5b1ef1038e3f4e4371c3d6718bf0f684be65eb2b)

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Nov 2018 22:10:06 +0000 (22:10 +0000)]

[automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f am: 289b3fa863 skipped: 04ade0fdc0

Change-Id: Ibc39203eb7fa7c245d29013126e47c4638fd3c6b

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Nov 2018 22:10:05 +0000 (22:10 +0000)]

[automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f am: 289b3fa863

Change-Id: I3510b09b67948fa640b028df8346077dc87ead51

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Nov 2018 22:10:04 +0000 (22:10 +0000)]

[automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f

Change-Id: I15e13d82ec8f1aea4236044762e96e704f4275b2

commit | commitdiff | tree

Chienyuan [Thu, 11 Oct 2018 02:36:57 +0000 (10:36 +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: Idbfa2b8bd4c1a0aeeacfe34349851b3bc8de7c69
(cherry picked from commit 5b1ef1038e3f4e4371c3d6718bf0f684be65eb2b)

commit | commitdiff | tree

Ugo Yu [Fri, 2 Nov 2018 04:39:33 +0000 (21:39 -0700)]

[automerger skipped] Merge "DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data" into oc-dev am: 5b3764ada2 -s ours am: d23783330e -s ours
am: 5a706ef567 -s ours

Change-Id: Ic5da5b23c80d2344ca0a17862ae2cffad172e639

commit | commitdiff | tree

Ugo Yu [Fri, 2 Nov 2018 04:35:42 +0000 (21:35 -0700)]

[automerger skipped] Merge "DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data" into oc-dev am: 5b3764ada2 -s ours
am: d23783330e -s ours

Change-Id: Ibf80fd7ad5da69b61a2f36181ff9989eeb52659a

commit | commitdiff | tree

Ugo Yu [Fri, 2 Nov 2018 04:31:37 +0000 (21:31 -0700)]

[automerger skipped] Merge "DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data" into oc-dev
am: 5b3764ada2 -s ours

Change-Id: If234a0b7b075098d8f42153138d5a72a78fb82b9

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.