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

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

Chienyuan [Fri, 10 Aug 2018 22:10:39 +0000 (15:10 -0700)]

Merge changes from topic "am-c2d9879f-e9d2-44f3-9012-53037ab580a0" into oc-dev am: ee9315f84c am: 76ad7b5439
am: cbfe0fff84

Change-Id: I49d299a85b3e3a00f58dadd3f8af169eab0ca7e4

commit | commitdiff | tree

Ugo Yu [Fri, 10 Aug 2018 22:10:06 +0000 (15:10 -0700)]

Merge changes from topic "am-a988fd47-73ee-44e9-929f-5374e8851656" into oc-dev am: cb0cdcc7ab am: 7e719a45da
am: 52c5bfffba

Change-Id: I5b6d62d23ab555cc25a44ad302da5045247a1662

commit | commitdiff | tree

Chienyuan [Fri, 10 Aug 2018 21:14:13 +0000 (14:14 -0700)]

Merge changes from topic "am-c2d9879f-e9d2-44f3-9012-53037ab580a0" into oc-dev am: ee9315f84c
am: 76ad7b5439

Change-Id: Ia183f05e8f3601b9969f7de86033dbd39b974495

commit | commitdiff | tree

Ugo Yu [Fri, 10 Aug 2018 21:13:35 +0000 (14:13 -0700)]

Merge changes from topic "am-a988fd47-73ee-44e9-929f-5374e8851656" into oc-dev am: cb0cdcc7ab
am: 7e719a45da

Change-Id: Ibfba8a0de4b8eb7ba7905724b742ea1ced2770a5

commit | commitdiff | tree

Chienyuan [Fri, 10 Aug 2018 20:21:02 +0000 (13:21 -0700)]

Merge changes from topic "am-c2d9879f-e9d2-44f3-9012-53037ab580a0" into oc-dev
am: ee9315f84c

Change-Id: Idd7c2b6716d1b820bc1a5ccdac29b4c3e5d76ba7

commit | commitdiff | tree

Ugo Yu [Fri, 10 Aug 2018 20:20:20 +0000 (13:20 -0700)]

Merge changes from topic "am-a988fd47-73ee-44e9-929f-5374e8851656" into oc-dev
am: cb0cdcc7ab

Change-Id: If7b0787b082c30363a12a33af0591f83e2017d8e

commit | commitdiff | tree

TreeHugger Robot [Fri, 10 Aug 2018 19:52:34 +0000 (19:52 +0000)]

Merge changes from topic "am-c2d9879f-e9d2-44f3-9012-53037ab580a0" into oc-dev

* changes:
  [automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am: 82815f4498 am: 1bf18942ad am: ba90170489 am: 24e9e1f47a skipped: b4b40d8fb3
  [automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am: 82815f4498 am: 1bf18942ad am: ba90170489 am: 24e9e1f47a
  [automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am: 82815f4498 am: 1bf18942ad am: ba90170489
  [automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am: 82815f4498 am: 1bf18942ad
  [automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am: 82815f4498
  DO NOT MERGE Check packet length in bta_av_proc_meta_cmd

commit | commitdiff | tree

TreeHugger Robot [Fri, 10 Aug 2018 19:43:29 +0000 (19:43 +0000)]

Merge changes from topic "am-a988fd47-73ee-44e9-929f-5374e8851656" into oc-dev

* changes:
  [automerger] DO NOT MERGE Fix OOB read before buffer length check am: e64b4a38b0 am: d952a36975 am: a999037d02 am: aa9c254357 skipped: de319d0416
  [automerger] DO NOT MERGE Fix OOB read before buffer length check am: e64b4a38b0 am: d952a36975 am: a999037d02 am: aa9c254357
  [automerger] DO NOT MERGE Fix OOB read before buffer length check am: e64b4a38b0 am: d952a36975 am: a999037d02
  [automerger] DO NOT MERGE Fix OOB read before buffer length check am: e64b4a38b0 am: d952a36975
  [automerger] DO NOT MERGE Fix OOB read before buffer length check am: e64b4a38b0
  DO NOT MERGE Fix OOB read before buffer length check

commit | commitdiff | tree

Jakub Pawlowski [Fri, 10 Aug 2018 09:05:28 +0000 (02:05 -0700)]

[automerger skipped] [automerger] Fix copy length calculation in sdp_copy_raw_data am: 1a0571a4ac am: fc08bac226 am: 78014df470 am: 427c2c7783 skipped: ea23ff5608 am: 682936d05d -s ours am: 6354a16d8e -s ours
am: 7051739728 -s ours

Change-Id: I9f1d009af5c3cbc397c3b9f49261bd67ae4607a7

commit | commitdiff | tree

Jakub Pawlowski [Fri, 10 Aug 2018 08:58:24 +0000 (01:58 -0700)]

[automerger skipped] [automerger] Fix copy length calculation in sdp_copy_raw_data am: 1a0571a4ac am: fc08bac226 am: 78014df470 am: 427c2c7783 skipped: ea23ff5608 am: 682936d05d -s ours
am: 6354a16d8e -s ours

Change-Id: I59fb0d9115ae761af37f0b4749288a224e08b71c

commit | commitdiff | tree

Jakub Pawlowski [Fri, 10 Aug 2018 08:53:18 +0000 (01:53 -0700)]

[automerger skipped] [automerger] Fix copy length calculation in sdp_copy_raw_data am: 1a0571a4ac am: fc08bac226 am: 78014df470 am: 427c2c7783 skipped: ea23ff5608
am: 682936d05d -s ours

Change-Id: I03b13f5f9d93f1c2ad07cfc6338b8a65917078f9

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 10 Aug 2018 07:04:56 +0000 (07:04 +0000)]

[automerger] Fix copy length calculation in sdp_copy_raw_data am: 1a0571a4ac am: fc08bac226 am: 78014df470 am: 427c2c7783 skipped: ea23ff5608

Change-Id: I5ee4cb73177c56e7adfe4a96a22f7d1a49248f19

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 10 Aug 2018 07:04:30 +0000 (07:04 +0000)]

[automerger] Fix copy length calculation in sdp_copy_raw_data am: 1a0571a4ac am: fc08bac226 am: 78014df470 am: 427c2c7783

Change-Id: I37cb9240f3e471768d454e41a37143f16bd4f4e7

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 10 Aug 2018 07:04:27 +0000 (07:04 +0000)]

[automerger] Fix copy length calculation in sdp_copy_raw_data am: 1a0571a4ac am: fc08bac226 am: 78014df470

Change-Id: I3b15e7664fac9d395b07a13365af57379ef6bfac

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 10 Aug 2018 07:04:24 +0000 (07:04 +0000)]

[automerger] Fix copy length calculation in sdp_copy_raw_data am: 1a0571a4ac am: fc08bac226

Change-Id: I6eb912e2613ec8549f9a8a579d7440ed876fd0e7

commit | commitdiff | tree

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

[automerger] Fix copy length calculation in sdp_copy_raw_data am: 1a0571a4ac

Change-Id: I8334874f9f3037833a60c0b84c9fea593b7daffa

commit | commitdiff | tree

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
Merged-In: Ic4a19c9f0fe8cd592bc6c25dcec7b1da49ff7459

commit | commitdiff | tree

Hansong Zhang [Fri, 10 Aug 2018 02:10:02 +0000 (19:10 -0700)]

Merge "Fix OOB read in avrc_ctrl_pars_vendor_rsp" into oc-dev am: 014a36a1f7 am: ce16531dbc
am: 39caefd0d4

Change-Id: Ifc68c195e1ffe987e46a5340abfa09212ee73504

commit | commitdiff | tree

Hansong Zhang [Fri, 10 Aug 2018 02:04:58 +0000 (19:04 -0700)]

Merge "Fix OOB read in avrc_ctrl_pars_vendor_rsp" into oc-dev am: 014a36a1f7
am: ce16531dbc

Change-Id: Id3669fa2cb1a4c45f5f0f92903b857d0fa2b7ba9

commit | commitdiff | tree

Hansong Zhang [Fri, 10 Aug 2018 01:59:05 +0000 (18:59 -0700)]

Merge "Fix OOB read in avrc_ctrl_pars_vendor_rsp" into oc-dev
am: 014a36a1f7

Change-Id: I073b4b96930ecd4150f6515fe64485a1dce1370d

commit | commitdiff | tree

TreeHugger Robot [Fri, 10 Aug 2018 01:46:44 +0000 (01:46 +0000)]

Merge "Fix OOB read in avrc_ctrl_pars_vendor_rsp" into oc-dev

commit | commitdiff | tree

Hansong Zhang [Fri, 10 Aug 2018 00:59:10 +0000 (17:59 -0700)]

Merge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into oc-dev am: b01b82b03a am: 23996390b5
am: 66403af3c6

Change-Id: Id362dab356a51c43b095d8cbfee8a05016033597

commit | commitdiff | tree

Hansong Zhang [Fri, 10 Aug 2018 00:55:35 +0000 (17:55 -0700)]

Merge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into oc-dev am: b01b82b03a
am: 23996390b5

Change-Id: Id9bdba718f4ec07658f8a306ebb4c59e435d6051

commit | commitdiff | tree

Hansong Zhang [Fri, 10 Aug 2018 00:51:46 +0000 (17:51 -0700)]

Merge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into oc-dev
am: b01b82b03a

Change-Id: I42f2e51fbff12afc07f01690bc9f18b99b84eda9

commit | commitdiff | tree

TreeHugger Robot [Fri, 10 Aug 2018 00:39:29 +0000 (00:39 +0000)]

Merge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14 am: 03c98acc31 am: b672ba6cac am: e653bb9a14
  [automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14 am: 03c98acc31 am: b672ba6cac
  [automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14 am: 03c98acc31
  [automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14
  DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp

commit | commitdiff | tree

TreeHugger Robot [Fri, 10 Aug 2018 00:39:29 +0000 (00:39 +0000)]

Merge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14 am: 03c98acc31 am: b672ba6cac
  [automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14 am: 03c98acc31
  [automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14
  DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp

commit | commitdiff | tree

TreeHugger Robot [Fri, 10 Aug 2018 00:39:29 +0000 (00:39 +0000)]

Merge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14 am: 03c98acc31
  [automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14
  DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp

commit | commitdiff | tree

TreeHugger Robot [Fri, 10 Aug 2018 00:39:29 +0000 (00:39 +0000)]

Merge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into nyc-dr1-dev

* changes:
[automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14
DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp

commit | commitdiff | tree

TreeHugger Robot [Fri, 10 Aug 2018 00:39:29 +0000 (00:39 +0000)]

Merge "DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 10 Aug 2018 00:39:29 +0000 (00:39 +0000)]

Merge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into oc-dev

* changes:
  [automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14 am: 03c98acc31 am: b672ba6cac am: e653bb9a14 skipped: 14494bb416
  [automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14 am: 03c98acc31 am: b672ba6cac am: e653bb9a14
  [automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14 am: 03c98acc31 am: b672ba6cac
  [automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14 am: 03c98acc31
  [automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14
  DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Thu, 9 Aug 2018 23:43:44 +0000 (23:43 +0000)]

Merge "DO NOT MERGE Check remaining frame length in rfc_process_mx_message" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 Aug 2018 08:17:26 +0000 (08:17 +0000)]

[automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am: 82815f4498 am: 1bf18942ad am: ba90170489 am: 24e9e1f47a skipped: b4b40d8fb3

Change-Id: I361778a1be3c1006e72e002f44c6d5ef94649b23

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 Aug 2018 08:17:23 +0000 (08:17 +0000)]

[automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am: 82815f4498 am: 1bf18942ad am: ba90170489 am: 24e9e1f47a

Change-Id: I6d8230e0ffb578230cdbaba0794dad3a6f1d8893

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 Aug 2018 08:17:20 +0000 (08:17 +0000)]

[automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am: 82815f4498 am: 1bf18942ad am: ba90170489

Change-Id: I6bc0048722d4c66fa90efd422293fdeefeb4cf39

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 Aug 2018 08:17:16 +0000 (08:17 +0000)]

[automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am: 82815f4498 am: 1bf18942ad

Change-Id: I7e08942760476ff7a7555ae389fe2125d82058cb

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 Aug 2018 08:17:13 +0000 (08:17 +0000)]

[automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am: 82815f4498

Change-Id: I1884a8a5b2f36debd0e1e8d2dd2a62f839d70dbb

commit | commitdiff | tree

Chienyuan [Wed, 8 Aug 2018 08:15:21 +0000 (16:15 +0800)]

DO NOT MERGE Check packet length in bta_av_proc_meta_cmd

Bug: 111893951
Test: manual
Change-Id: Ie562c393e949c275203617972d43bb005190b32b

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 Aug 2018 06:58:28 +0000 (06:58 +0000)]

[automerger] DO NOT MERGE Fix OOB read before buffer length check am: e64b4a38b0 am: d952a36975 am: a999037d02 am: aa9c254357 skipped: de319d0416

Change-Id: I4c0f83da8f39ff3339098f43152badba470b7182

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 Aug 2018 06:58:25 +0000 (06:58 +0000)]

[automerger] DO NOT MERGE Fix OOB read before buffer length check am: e64b4a38b0 am: d952a36975 am: a999037d02 am: aa9c254357

Change-Id: I816d8bb946c890cce0062e66f0aa751fed606570

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 Aug 2018 06:58:22 +0000 (06:58 +0000)]

[automerger] DO NOT MERGE Fix OOB read before buffer length check am: e64b4a38b0 am: d952a36975 am: a999037d02

Change-Id: Ibdafac859df4977b41e954ce0c2d1f7cc30cf12e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 Aug 2018 06:58:18 +0000 (06:58 +0000)]

[automerger] DO NOT MERGE Fix OOB read before buffer length check am: e64b4a38b0 am: d952a36975

Change-Id: I06022c8ab062e4422b443d49869293b777058b20

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 Aug 2018 06:58:15 +0000 (06:58 +0000)]

[automerger] DO NOT MERGE Fix OOB read before buffer length check am: e64b4a38b0

Change-Id: Id645cb892c2bef5f985f9bc9d770617c4feb0a97

commit | commitdiff | tree

Ugo Yu [Wed, 8 Aug 2018 06:57:25 +0000 (14:57 +0800)]

DO NOT MERGE Fix OOB read before buffer length check

Bug: 111936834
Test: manual
Change-Id: I60c500651f130876934a7b80889f4e021055fe73

commit | commitdiff | tree

Hansong Zhang [Mon, 6 Aug 2018 21:40:37 +0000 (14:40 -0700)]

Fix OOB read in avrc_ctrl_pars_vendor_rsp

Bug: 78526423
Test: manual
Change-Id: I0eeacc6a25b12f4b999098375d0d032cfa462a91

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 Aug 2018 21:37:30 +0000 (21:37 +0000)]

[automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14 am: 03c98acc31 am: b672ba6cac am: e653bb9a14 skipped: 14494bb416

Change-Id: I7f9a2f42d3ea07f36ce2f8d068da69029cd32890

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 Aug 2018 21:37:29 +0000 (21:37 +0000)]

[automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14 am: 03c98acc31 am: b672ba6cac am: e653bb9a14

Change-Id: I6fdb008f5e6187507d2a0a7c5426188dda0c3cff

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 Aug 2018 21:37:28 +0000 (21:37 +0000)]

[automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14 am: 03c98acc31 am: b672ba6cac

Change-Id: I80ae25af3a3b9be071837cab835c3bc91c90829f

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 Aug 2018 21:37:26 +0000 (21:37 +0000)]

[automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14 am: 03c98acc31

Change-Id: I6b5e1c9082af1fddaaee8944b7ae661f429c483c

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 Aug 2018 21:37:25 +0000 (21:37 +0000)]

[automerger] DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp am: 082353ad14

Change-Id: I0ab8cc738023d77e040d3b3ffc159001f13a531e

commit | commitdiff | tree

Hansong Zhang [Mon, 6 Aug 2018 21:36:41 +0000 (14:36 -0700)]

DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp

Bug: 78526423
Test: manual
Change-Id: I0eeacc6a25b12f4b999098375d0d032cfa462a91

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree