OSDN Git Service

android-x86/system-bt.git
5 years agoFix possible OOB when AVDT data channel recive ACL data
Ugo Yu [Mon, 29 Oct 2018 16:47:04 +0000 (00:47 +0800)]
Fix possible OOB when AVDT data channel recive ACL data

Bug: 111450156

Change-Id: Id23eeedcb7bde5866cd53a2f7f1c30f27c5352f6
(cherry picked from commit baa9bf5bfe4a6f3e52ac927aaf4463f37f81294e)

5 years agoMerge cherrypicks of [5317808, 5317809, 5318498, 5317873, 5318338, 5318195, 5318499...
android-build-team Robot [Sat, 20 Oct 2018 00:19:43 +0000 (00:19 +0000)]
Merge cherrypicks of [531780853178095318498531787353183385318195531849953178745317875531787653182435318244531853753185385318539531854053185415318542531854353185445318545531854653152105317756531855753185585318559531856053185615318339531854753185485318549531856253185635318564531856553185665318172531817353181745318550531840153181965317889531817553181765318577531857853185795318580531858153185035318390531850553183415318551] into pi-qpr1-release

Change-Id: I6df9d99838866ae835f25adc27afe9e29fc6a380

5 years agoFix possible OOB read
Jakub Pawlowski [Wed, 10 Oct 2018 17:35:37 +0000 (19:35 +0200)]
Fix possible OOB read

Bug: 74249842
Change-Id: I0dbe43f0da1f5a8f14bcb69659752de4bd70ca98
(cherry picked from commit 6e6c347e798bf8195a9a02457edf871a97b1cfad)

5 years agoHIDD: Check descriptor length and increase buffer
Hansong Zhang [Tue, 2 Oct 2018 23:26:38 +0000 (16:26 -0700)]
HIDD: Check descriptor length and increase buffer

Since maximum descriptor length is 2048, we need to assign 2054 bytes of
buffer for another 6 bytes of data. Also added a const for maximum
descriptor length.

Bug: 113572366
Test: manual
Change-Id: Ie2b25c9e1a9f2019cbc7e6fbecbb08b643c87946
Merged-In: Ie2b25c9e1a9f2019cbc7e6fbecbb08b643c87946
(cherry picked from commit c0530b211e8a5b43e556c6d47d424b231afb8e99)

5 years agoRun the wakelock JNI callbacks on the JNI thread
Pavlin Radoslavov [Sat, 25 Aug 2018 01:45:16 +0000 (18:45 -0700)]
Run the wakelock JNI callbacks on the JNI thread

All JNI callbacks must be on the JNI thread, otherwise this could
impact the threads' operation.

Bug: 111277984
Test: A2DP streaming
Change-Id: I94fa4500aea62a574c80749e904434e46eb4e942
(cherry picked from commit c788ad703836f6ac0f63e47b20f27b41dcce9353)
(cherry picked from commit f918ab9ff83a750a344871758a308f17b6e8f5fb)

5 years agobta: Pass the correct UUID array size in bta_ag_do_disc
Myles Watson [Thu, 6 Sep 2018 17:57:47 +0000 (10:57 -0700)]
bta: Pass the correct UUID array size in bta_ag_do_disc

Bug: 113164621
Test: Connect HSP from a device to the phone
Change-Id: Iec875cd165ad1cea64c307602bb00b623967c7c7
(cherry picked from commit 9645b5dd62c8166f10798335768aa2a6c3e05e4c)

5 years agoCheck SDU lower bound before allocate p_data
Ugo Yu [Mon, 17 Sep 2018 07:59:30 +0000 (15:59 +0800)]
Check SDU lower bound before allocate p_data

Bug: 112321180
Test: SL4A BleCocTest:test_coc_insecured_connection_write_ascii
Change-Id: Id0c9aa2097f0b6bdc2bb9fa9086daa9452188e1d
(cherry picked from commit 785e12ed58d020a0df075163c1831021c0cde218)

5 years agoMerge cherrypicks of [4986743, 4986744, 4987539, 4987168, 4986376, 4986377, 4986378...
android-build-team Robot [Mon, 10 Sep 2018 23:21:40 +0000 (23:21 +0000)]
Merge cherrypicks of [498674349867444987539498716849863764986377498637849868894986745498674649867474986748498674949867504986773498716949871704987611498763149876324987633498763449868904987612498765149875984987613498761449876154987599498637949863804987652498765349876914986774] into pi-qpr1-release

Change-Id: Ie47fef4ae26050a4b811814aef26157108434cd5

5 years agoCheck data length when parsing AVRCP vendor specific command responses
Pavlin Radoslavov [Thu, 6 Sep 2018 01:21:31 +0000 (18:21 -0700)]
Check data length when parsing AVRCP vendor specific command responses

Bug: 111450531
Bug: 111896861
Test: PoC test program
Change-Id: I564bee8f05efabc29383659a75e695b4da76c6aa
(cherry picked from commit 7439ea940354f65a147c4ecfce3bada49c688047)

5 years agoCheck AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp()
Pavlin Radoslavov [Thu, 6 Sep 2018 22:41:27 +0000 (15:41 -0700)]
Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp()

Bug: 111450417
Test: PoC test program
Change-Id: Idd619e52dc7a2944d0d08af824505580e299c163
(cherry picked from commit 1c14e10cac53d5a5724dcf34c5679ad8819f9442)
(cherry picked from commit f779ebe368d245c0d9ac954cf7b2b102e7da56be)

5 years agoHID Device: Fix OOB in register_app
Hansong Zhang [Wed, 5 Sep 2018 23:39:16 +0000 (16:39 -0700)]
HID Device: Fix OOB in register_app

Bug: 113037220
Bug: 113111784
Test: manual
Change-Id: I91bcd5032959458b926c479160c7e391b8de313b
(cherry picked from commit 6aa2d0a5fab28c8829aab4099da0ad450e451c1e)

5 years agoSnap for 4972147 from 1ccb7c3489d6775821921ce97bf8b98eb7f7a70c to pi-qpr1-release
android-build-team Robot [Thu, 23 Aug 2018 03:06:34 +0000 (03:06 +0000)]
Snap for 4972147 from 1ccb7c3489d6775821921ce97bf8b98eb7f7a70c to pi-qpr1-release

Change-Id: Icfd7be2d5dd59b922d98f315ea4bcf5d46a9077c

5 years agoFix "Disable Absolute Volume" Bluetooth develop option work
Ted [Fri, 17 Aug 2018 10:49:37 +0000 (18:49 +0800)]
Fix "Disable Absolute Volume" Bluetooth develop option work

Do not report device support absolute volume while
"Disable Absolute Volume" in developer option is enabled or
the remote device is listed in the interoperability database.

Test: manually adjust volume when Disable Absolute Volume is enabled
Bug: 112193362
Change-Id: Id63a22dba0d8a871035774fc86b66d32e9225b48
Merged-In: Id63a22dba0d8a871035774fc86b66d32e9225b48

5 years agoSnap for 4959688 from f827e9fc320861552d884a2706c5a93fe33c69e3 to pi-qpr1-release
android-build-team Robot [Fri, 17 Aug 2018 03:09:19 +0000 (03:09 +0000)]
Snap for 4959688 from f827e9fc320861552d884a2706c5a93fe33c69e3 to pi-qpr1-release

Change-Id: I0e9322114dbe429b0ba475702cf5f0e590534fe9

5 years agoSnap for 4949382 from 206134dc653cffaed0008da80b53eb860ef96670 to pi-qpr1-release
android-build-team Robot [Mon, 13 Aug 2018 03:02:37 +0000 (03:02 +0000)]
Snap for 4949382 from 206134dc653cffaed0008da80b53eb860ef96670 to pi-qpr1-release

Change-Id: Iff31803cb311922fb70df7e273dfc0b7d2d67fe2

5 years agoFix wrong UUID mask when doing BLE filter scan
Ugo Yu [Mon, 13 Aug 2018 02:12:40 +0000 (10:12 +0800)]
Fix wrong UUID mask when doing BLE filter scan

bug: 112350218
Test: manual
Change-Id: I9e4297b936e7a7db164e7ff3bf680c43600c5bda
(cherry picked from commit 04433372392a3c50558cb96f076757472dac2cec)

5 years agoMerge "Add packet length checks in mca_ccb_hdl_req" into oc-dev am: 816107b1e3 am...
Cheney Ni [Sat, 11 Aug 2018 00:56:16 +0000 (17:56 -0700)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev am: 816107b1e3 am: 57cde1b147
am: c019726c62

Change-Id: Ie0d10696cff7d8da694c96af8b224fe4d9061383

5 years ago[automerger skipped] Merge changes from topic "am-dcf0c368-3f3f-440a-998e-f94bd192418...
Cheney Ni [Sat, 11 Aug 2018 00:55:49 +0000 (17:55 -0700)]
[automerger skipped] Merge changes from topic "am-dcf0c368-3f3f-440a-998e-f94bd1924189" into oc-dev am: 1718736f85  -s ours am: 3d14101b52  -s ours
am: 02482e1edd  -s ours

Change-Id: I69d112ec62826799d275e32cf5499083e84d13fe

5 years agoMerge "Add packet length checks in mca_ccb_hdl_req" into oc-dev am: 816107b1e3
Cheney Ni [Sat, 11 Aug 2018 00:27:54 +0000 (17:27 -0700)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev am: 816107b1e3
am: 57cde1b147

Change-Id: I05d1d2af205963afcd1c6bf77c8ca097662e0fc8

5 years ago[automerger skipped] Merge changes from topic "am-dcf0c368-3f3f-440a-998e-f94bd192418...
Cheney Ni [Sat, 11 Aug 2018 00:27:34 +0000 (17:27 -0700)]
[automerger skipped] Merge changes from topic "am-dcf0c368-3f3f-440a-998e-f94bd1924189" into oc-dev am: 1718736f85  -s ours
am: 3d14101b52  -s ours

Change-Id: Iceb020184e799318eb665e19544c1c8012f2b9f9

5 years agoMerge "Add packet length checks in mca_ccb_hdl_req" into oc-dev
Cheney Ni [Sat, 11 Aug 2018 00:11:43 +0000 (17:11 -0700)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev
am: 816107b1e3

Change-Id: Ic37e076a0e89dc449071b6e715c1ba13034b48e8

5 years ago[automerger skipped] Merge changes from topic "am-dcf0c368-3f3f-440a-998e-f94bd192418...
Cheney Ni [Sat, 11 Aug 2018 00:11:22 +0000 (17:11 -0700)]
[automerger skipped] Merge changes from topic "am-dcf0c368-3f3f-440a-998e-f94bd1924189" into oc-dev
am: 1718736f85  -s ours

Change-Id: Id71e8b3945f0d2051c2b642c6ed83c293f5d31fb

5 years agoMerge "Add packet length checks in mca_ccb_hdl_req" into oc-dev
TreeHugger Robot [Fri, 10 Aug 2018 23:29:21 +0000 (23:29 +0000)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev

5 years ago[automerger skipped] Merge "Checks the SMP length to fix OOB read" into oc-dev am...
Cheney Ni [Fri, 10 Aug 2018 23:16:31 +0000 (16:16 -0700)]
[automerger skipped] Merge "Checks the SMP length to fix OOB read" into oc-dev am: a0f6200e5f am: a2d1977617
am: 4b3d08fa40  -s ours

Change-Id: I28d07e232999bdda412c4263bd23e78aff2c27d5

5 years agoMerge changes from topic "am-dcf0c368-3f3f-440a-998e-f94bd1924189" into oc-dev
TreeHugger Robot [Fri, 10 Aug 2018 23:13:53 +0000 (23:13 +0000)]
Merge changes from topic "am-dcf0c368-3f3f-440a-998e-f94bd1924189" into oc-dev

* changes:
  [automerger] Checks the SMP length to fix OOB read am: 353faee793 am: 9343dda4d3 am: 4df8c20808 am: 4bf5cf2228 skipped: 3d75dd009b
  [automerger] Checks the SMP length to fix OOB read am: 353faee793 am: 9343dda4d3 am: 4df8c20808 am: 4bf5cf2228
  [automerger] Checks the SMP length to fix OOB read am: 353faee793 am: 9343dda4d3 am: 4df8c20808
  [automerger] Checks the SMP length to fix OOB read am: 353faee793 am: 9343dda4d3
  [automerger] Checks the SMP length to fix OOB read am: 353faee793
  Checks the SMP length to fix OOB read

5 years agoMerge "Checks the SMP length to fix OOB read" into oc-dev am: a0f6200e5f
Cheney Ni [Fri, 10 Aug 2018 23:12:26 +0000 (16:12 -0700)]
Merge "Checks the SMP length to fix OOB read" into oc-dev am: a0f6200e5f
am: a2d1977617

Change-Id: I04f3e39f4900203999ee16a30540c16698fa1100

5 years agoMerge "Checks the SMP length to fix OOB read" into pi-dev
Hansong Zhang [Fri, 10 Aug 2018 22:50:24 +0000 (22:50 +0000)]
Merge "Checks the SMP length to fix OOB read" into pi-dev

5 years agoChecks the SMP length to fix OOB read
Cheney Ni [Wed, 8 Aug 2018 14:20:08 +0000 (22:20 +0800)]
Checks the SMP length to fix OOB read

Bug: 111937065
Test: manual
Change-Id: I330880a6e1671d0117845430db4076dfe1aba688
Merged-In: I330880a6e1671d0117845430db4076dfe1aba688

5 years agoMerge "Checks the SMP length to fix OOB read" into oc-dev
Cheney Ni [Fri, 10 Aug 2018 22:36:13 +0000 (15:36 -0700)]
Merge "Checks the SMP length to fix OOB read" into oc-dev
am: a0f6200e5f

Change-Id: I878e9a56d3a8f6044fe1922711a50e09861eae08

5 years agoMerge "Checks the SMP length to fix OOB read" into oc-dev
TreeHugger Robot [Fri, 10 Aug 2018 22:20:14 +0000 (22:20 +0000)]
Merge "Checks the SMP length to fix OOB read" into oc-dev

5 years agoMerge "Add packet length check in smp_proc_master_id" into oc-dev am: 7390441c63...
Ugo Yu [Fri, 10 Aug 2018 22:13:33 +0000 (15:13 -0700)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev am: 7390441c63 am: 039526080b
am: 9d97021204

Change-Id: I44ebb7389fa0c4603991b0e7f6aff8ed114556e9

5 years agoMerge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev...
Pavlin Radoslavov [Fri, 10 Aug 2018 22:13:08 +0000 (15:13 -0700)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev am: a33d897e8a am: d6f875028c
am: 91f21014e1

Change-Id: If813c8360bc6f7d3e9320f4b700ea1fc41eafb3b

5 years agoMerge changes from topic "am-df95a56f-528f-434c-972e-bb492348a21a" into oc-dev am...
Ugo Yu [Fri, 10 Aug 2018 22:12:41 +0000 (15:12 -0700)]
Merge changes from topic "am-df95a56f-528f-434c-972e-bb492348a21a" into oc-dev am: ab4b63e6ad am: 23d8fb31be
am: 8a49e7f22d

Change-Id: I2e94fdce6511d63f26ad680361b74bdd3a6c5ec0

5 years ago[automerger skipped] Merge "DO NOT MERGE Fix OOB read before buffer length check...
Ugo Yu [Fri, 10 Aug 2018 22:11:58 +0000 (15:11 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev am: 1503110a53 am: 26b6a7cbf4
am: 1b9264d128  -s ours

Change-Id: I7d24941f1309ddc65e60fbc84e6354e414185ba6

5 years agoMerge "Check packet length in bta_av_proc_meta_cmd" into oc-dev am: 7e52dc116c am...
Chienyuan [Fri, 10 Aug 2018 22:11:43 +0000 (15:11 -0700)]
Merge "Check packet length in bta_av_proc_meta_cmd" into oc-dev am: 7e52dc116c am: ccc3cab119
am: 4d0f5bead6

Change-Id: Ifa7a555b5a5cf8b016c7e92a832a55429e435584

5 years agoMerge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev am:...
Pavlin Radoslavov [Fri, 10 Aug 2018 22:11:18 +0000 (15:11 -0700)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev am: 3834cbd1e6 am: abf4e82057
am: ff19b6e112

Change-Id: I35f75a3cf59ab1bae7921241eb7825305c4ccc6e

5 years agoMerge changes from topic "am-c2d9879f-e9d2-44f3-9012-53037ab580a0" into oc-dev am...
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

5 years agoMerge changes from topic "am-a988fd47-73ee-44e9-929f-5374e8851656" into oc-dev am...
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

5 years agoMerge "Add packet length check in smp_proc_master_id" into oc-dev am: 7390441c63
Ugo Yu [Fri, 10 Aug 2018 21:47:15 +0000 (14:47 -0700)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev am: 7390441c63
am: 039526080b

Change-Id: I42e6c4c2599151607b089452cc2e25d6e5103d47

5 years agoMerge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev...
Pavlin Radoslavov [Fri, 10 Aug 2018 21:46:46 +0000 (14:46 -0700)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev am: a33d897e8a
am: d6f875028c

Change-Id: Ic28bad0cc518cf908765980c361454c2eeb4fa6d

5 years agoMerge "Add packet length check in smp_proc_master_id" into oc-dev
Ugo Yu [Fri, 10 Aug 2018 21:46:09 +0000 (14:46 -0700)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev
am: 7390441c63

Change-Id: I273c233acac3bca1b37c937f8cf65b004048b451

5 years agoMerge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev
Pavlin Radoslavov [Fri, 10 Aug 2018 21:45:45 +0000 (14:45 -0700)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev
am: a33d897e8a

Change-Id: If510886dfb48fe6c741ae6766bcb97d8fa3e482e

5 years agoMerge "Add packet length check in smp_proc_master_id" into oc-dev
TreeHugger Robot [Fri, 10 Aug 2018 21:27:38 +0000 (21:27 +0000)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev

5 years agoMerge changes from topic "am-df95a56f-528f-434c-972e-bb492348a21a" into oc-dev am...
Ugo Yu [Fri, 10 Aug 2018 21:15:56 +0000 (14:15 -0700)]
Merge changes from topic "am-df95a56f-528f-434c-972e-bb492348a21a" into oc-dev am: ab4b63e6ad
am: 23d8fb31be

Change-Id: I57612c50ca73f7bb4a1192c66976af3053eb78b7

5 years agoMerge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev am: 1503110a53
Ugo Yu [Fri, 10 Aug 2018 21:15:28 +0000 (14:15 -0700)]
Merge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev am: 1503110a53
am: 26b6a7cbf4

Change-Id: I0b56adc51b64cb6c56d531a4357066c43c87d09d

5 years agoMerge "Check packet length in bta_av_proc_meta_cmd" into oc-dev am: 7e52dc116c
Chienyuan [Fri, 10 Aug 2018 21:15:07 +0000 (14:15 -0700)]
Merge "Check packet length in bta_av_proc_meta_cmd" into oc-dev am: 7e52dc116c
am: ccc3cab119

Change-Id: Ied0904860f58347e9cc5cf96ab486c0fce75443d

5 years agoMerge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev am:...
Pavlin Radoslavov [Fri, 10 Aug 2018 21:14:46 +0000 (14:14 -0700)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev am: 3834cbd1e6
am: abf4e82057

Change-Id: I7126caabc99fc2767c63593e938a3510fa6ed187

5 years agoMerge changes from topic "am-c2d9879f-e9d2-44f3-9012-53037ab580a0" into oc-dev am...
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

5 years agoMerge changes from topic "am-a988fd47-73ee-44e9-929f-5374e8851656" into oc-dev am...
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

5 years agoMerge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev
TreeHugger Robot [Fri, 10 Aug 2018 21:13:03 +0000 (21:13 +0000)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev

5 years agoMerge changes from topic "am-df95a56f-528f-434c-972e-bb492348a21a" into oc-dev
Ugo Yu [Fri, 10 Aug 2018 21:04:01 +0000 (14:04 -0700)]
Merge changes from topic "am-df95a56f-528f-434c-972e-bb492348a21a" into oc-dev
am: ab4b63e6ad

Change-Id: I510afbc60770cf5d4d272567716d2642154c94ae

5 years agoMerge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev
Ugo Yu [Fri, 10 Aug 2018 21:03:21 +0000 (14:03 -0700)]
Merge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev
am: 1503110a53

Change-Id: I06c98bfac27663e6b443c15b0eb02a04f91f48b7

5 years agoMerge changes from topic "am-df95a56f-528f-434c-972e-bb492348a21a" into oc-dev
TreeHugger Robot [Fri, 10 Aug 2018 20:55:20 +0000 (20:55 +0000)]
Merge changes from topic "am-df95a56f-528f-434c-972e-bb492348a21a" into oc-dev

* changes:
  [automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8db am: 141409e120 am: b0d91a38af am: ae3bb5ff30 skipped: 9d3bb2eacf
  [automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8db am: 141409e120 am: b0d91a38af am: ae3bb5ff30
  [automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8db am: 141409e120 am: b0d91a38af
  [automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8db am: 141409e120
  [automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8db
  DO NOT MERGE Add packet length check in smp_proc_master_id

5 years agoMerge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev
TreeHugger Robot [Fri, 10 Aug 2018 20:51:47 +0000 (20:51 +0000)]
Merge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev

5 years agoMerge "Check packet length in bta_av_proc_meta_cmd" into oc-dev
Chienyuan [Fri, 10 Aug 2018 20:49:16 +0000 (13:49 -0700)]
Merge "Check packet length in bta_av_proc_meta_cmd" into oc-dev
am: 7e52dc116c

Change-Id: I95920813d302cc3c363b3339189292efc79d7596

5 years agoMerge "Check packet length in bta_av_proc_meta_cmd" into oc-dev
TreeHugger Robot [Fri, 10 Aug 2018 20:38:50 +0000 (20:38 +0000)]
Merge "Check packet length in bta_av_proc_meta_cmd" into oc-dev

5 years agoMerge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev
Pavlin Radoslavov [Fri, 10 Aug 2018 20:21:59 +0000 (13:21 -0700)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev
am: 3834cbd1e6

Change-Id: If2a42522be7e34cc5cc5f6ab516c91542ba96b0b

5 years agoMerge changes from topic "am-c2d9879f-e9d2-44f3-9012-53037ab580a0" into oc-dev
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

5 years agoMerge changes from topic "am-a988fd47-73ee-44e9-929f-5374e8851656" into oc-dev
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

5 years agoMerge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev
TreeHugger Robot [Fri, 10 Aug 2018 20:06:42 +0000 (20:06 +0000)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev

* changes:
  [automerger] DO NOT MERGE: Add missing AVRCP message length checks inside avrc_msg_cback am: b78d265f36 am: 750f173103 am: de283c02ef am: 30c2ddb520 skipped: 2c2b3674f0
  [automerger] DO NOT MERGE: Add missing AVRCP message length checks inside avrc_msg_cback am: b78d265f36 am: 750f173103 am: de283c02ef am: 30c2ddb520
  [automerger] DO NOT MERGE: Add missing AVRCP message length checks inside avrc_msg_cback am: b78d265f36 am: 750f173103 am: de283c02ef
  [automerger] DO NOT MERGE: Add missing AVRCP message length checks inside avrc_msg_cback am: b78d265f36 am: 750f173103
  [automerger] DO NOT MERGE: Add missing AVRCP message length checks inside avrc_msg_cback am: b78d265f36
  DO NOT MERGE: Add missing AVRCP message length checks inside avrc_msg_cback

5 years agoMerge changes from topic "am-c2d9879f-e9d2-44f3-9012-53037ab580a0" into oc-dev
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

5 years agoMerge changes from topic "am-a988fd47-73ee-44e9-929f-5374e8851656" into oc-dev
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

5 years ago[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8d...
Android Build Merger (Role) [Fri, 10 Aug 2018 19:18:24 +0000 (19:18 +0000)]
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8db am: 141409e120 am: b0d91a38af am: ae3bb5ff30 skipped: 9d3bb2eacf

Change-Id: I1229e8ac6d350832ba6ff099a49f5d27f92636d1

5 years ago[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8d...
Android Build Merger (Role) [Fri, 10 Aug 2018 19:18:23 +0000 (19:18 +0000)]
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8db am: 141409e120 am: b0d91a38af am: ae3bb5ff30

Change-Id: Iefb6c5578e42fa8487e92307cd8f515c88860fd7

5 years ago[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8d...
Android Build Merger (Role) [Fri, 10 Aug 2018 19:18:21 +0000 (19:18 +0000)]
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8db am: 141409e120 am: b0d91a38af

Change-Id: I93138feb34fb1128ce81876f0e9dbfee54093cdd

5 years ago[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8d...
Android Build Merger (Role) [Fri, 10 Aug 2018 19:18:20 +0000 (19:18 +0000)]
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8db am: 141409e120

Change-Id: I8bd45139ee30783cc528062308fdf42d686251f3

5 years ago[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8db
Android Build Merger (Role) [Fri, 10 Aug 2018 19:18:18 +0000 (19:18 +0000)]
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 36bbbbf8db

Change-Id: If6f2f87162f61fd58492dc5bea9485757fe0e695

5 years agoDO NOT MERGE Add packet length check in smp_proc_master_id
Ugo Yu [Wed, 8 Aug 2018 08:18:08 +0000 (16:18 +0800)]
DO NOT MERGE Add packet length check in smp_proc_master_id

Bug: 111937027
Test: manual
Change-Id: I2009b6be38f9733931e625379b035e84371fdcaf

5 years agoAdd packet length check in smp_proc_master_id
Ugo Yu [Wed, 8 Aug 2018 08:09:58 +0000 (16:09 +0800)]
Add packet length check in smp_proc_master_id

Bug: 111937027
Test: manual

Change-Id: I1144c9879e84fa79d68ad9d5fece4f58e2a3b075

5 years agoChecks the SMP length to fix OOB read
Cheney Ni [Wed, 8 Aug 2018 14:40:27 +0000 (22:40 +0800)]
Checks the SMP length to fix OOB read

Bug: 111937065
Test: manual
Change-Id: I330880a6e1671d0117845430db4076dfe1aba688
Merged-In: I330880a6e1671d0117845430db4076dfe1aba688

5 years ago[automerger] Checks the SMP length to fix OOB read am: 353faee793 am: 9343dda4d3...
Android Build Merger (Role) [Fri, 10 Aug 2018 18:00:41 +0000 (18:00 +0000)]
[automerger] Checks the SMP length to fix OOB read am: 353faee793 am: 9343dda4d3 am: 4df8c20808 am: 4bf5cf2228 skipped: 3d75dd009b

Change-Id: I94ee54a9955023586e6b8d8f3a6a35a709bfd1c1

5 years ago[automerger] Checks the SMP length to fix OOB read am: 353faee793 am: 9343dda4d3...
Android Build Merger (Role) [Fri, 10 Aug 2018 17:43:56 +0000 (17:43 +0000)]
[automerger] Checks the SMP length to fix OOB read am: 353faee793 am: 9343dda4d3 am: 4df8c20808 am: 4bf5cf2228

Change-Id: Ifaae2e4562c49bb94e6619384bb6298693d4c61a

5 years ago[automerger] Checks the SMP length to fix OOB read am: 353faee793 am: 9343dda4d3...
Android Build Merger (Role) [Fri, 10 Aug 2018 17:43:55 +0000 (17:43 +0000)]
[automerger] Checks the SMP length to fix OOB read am: 353faee793 am: 9343dda4d3 am: 4df8c20808

Change-Id: I021f0cf3d6d7da12f09b7fcd61720a112d789dba

5 years ago[automerger] Checks the SMP length to fix OOB read am: 353faee793 am: 9343dda4d3
Android Build Merger (Role) [Fri, 10 Aug 2018 17:43:53 +0000 (17:43 +0000)]
[automerger] Checks the SMP length to fix OOB read am: 353faee793 am: 9343dda4d3

Change-Id: Ib0dd794d01ce85e30c1665b45733befa4af59dda

5 years ago[automerger] Checks the SMP length to fix OOB read am: 353faee793
Android Build Merger (Role) [Fri, 10 Aug 2018 17:43:52 +0000 (17:43 +0000)]
[automerger] Checks the SMP length to fix OOB read am: 353faee793

Change-Id: I897f7f6dec710a102f8fcf0b307be6973eedf994

5 years agoChecks the SMP length to fix OOB read
Cheney Ni [Wed, 8 Aug 2018 14:40:27 +0000 (22:40 +0800)]
Checks the SMP length to fix OOB read

Bug: 111937065
Test: manual
Change-Id: I330880a6e1671d0117845430db4076dfe1aba688
Merged-In: I330880a6e1671d0117845430db4076dfe1aba688

5 years ago[automerger skipped] [automerger] Fix copy length calculation in sdp_copy_raw_data...
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

5 years ago[automerger skipped] [automerger] Fix copy length calculation in sdp_copy_raw_data...
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

5 years ago[automerger skipped] [automerger] Fix copy length calculation in sdp_copy_raw_data...
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

5 years ago[automerger] Fix copy length calculation in sdp_copy_raw_data am: 1a0571a4ac am:...
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

5 years ago[automerger] Fix copy length calculation in sdp_copy_raw_data am: 1a0571a4ac am:...
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

5 years ago[automerger] Fix copy length calculation in sdp_copy_raw_data am: 1a0571a4ac am:...
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

5 years ago[automerger] Fix copy length calculation in sdp_copy_raw_data am: 1a0571a4ac am:...
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

5 years ago[automerger] Fix copy length calculation in sdp_copy_raw_data am: 1a0571a4ac
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

5 years agoFix copy length calculation in sdp_copy_raw_data
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

5 years agoSnap for 4945494 from 55cbfc0145103ea34fd90c98f408c678e4b068e6 to pi-qpr1-release
android-build-team Robot [Fri, 10 Aug 2018 03:01:37 +0000 (03:01 +0000)]
Snap for 4945494 from 55cbfc0145103ea34fd90c98f408c678e4b068e6 to pi-qpr1-release

Change-Id: I4696e8ccbfbd4a64b65f4563e0e56fcc5e5a1c75

5 years agoMerge "Fix OOB read in avrc_ctrl_pars_vendor_rsp" into oc-dev am: 014a36a1f7 am:...
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

5 years agoMerge "Fix OOB read in avrc_ctrl_pars_vendor_rsp" into oc-dev am: 014a36a1f7
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

5 years agoMerge "Fix OOB read in avrc_ctrl_pars_vendor_rsp" into oc-dev
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

5 years agoMerge "Fix OOB read in avrc_ctrl_pars_vendor_rsp" into oc-dev
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

5 years agoMerge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into oc-dev am...
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

5 years agoMerge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into oc-dev am...
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

5 years agoMerge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into oc-dev
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

5 years agoMerge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into nyc-mr2-dev
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

5 years agoMerge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into cw-f-dev
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

5 years agoMerge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into nyc-mr1-dev
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

5 years agoMerge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into nyc-dr1-dev
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

5 years agoMerge "DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp" into nyc-dev
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

5 years agoMerge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into oc-dev
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

5 years agoMerge changes from topic "am-aa78d1e3-f74a-4cdb-b5c4-c931b7a0997b" into oc-dev am...
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