Commit graph

6260 commits

Author SHA1 Message Date
Android Build Merger (Role)
b89ca18b38 Merge "Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev am: 90e68d31cf am: 3f60c009dc" into oc-dr1-dev-plus-aosp 2017-08-01 00:09:02 +00:00
Kevin Rocard
f088e57008 Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev am: 90e68d31cf
am: e93e38a91d

Change-Id: I9c1c4929b4edeebd8e3d1173312e07f62ad29fc0
2017-08-01 00:08:46 +00:00
Kevin Rocard
352070c11e Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev am: 90e68d31cf
am: e93e38a91d

Change-Id: Ibf5b6c05c340d7ae423ab0149067b4db58ff6c97
2017-08-01 00:08:46 +00:00
Kevin Rocard
f4410ca6c0 Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev am: 90e68d31cf
am: 3f60c009dc

Change-Id: Ibf84197428ce6fd98224135107ddefa58786b8ad
2017-08-01 00:08:46 +00:00
Kevin Rocard
3f60c009dc Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev
am: 90e68d31cf

Change-Id: Iadee05e91ad122c99b3d33b92c47b6fbcc27f2af
2017-08-01 00:05:16 +00:00
Kevin Rocard
e93e38a91d Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev
am: 90e68d31cf

Change-Id: I0aa31b2996c8aae97d0b7ba16d9943f47d70a1fe
2017-08-01 00:05:16 +00:00
TreeHugger Robot
90e68d31cf Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev 2017-07-31 23:56:02 +00:00
Asaf Rosenfeld
6bd319b40b Merge "Rename and Redoc VMS HAL defs." into oc-mr1-dev
am: e2a3ca9cac

Change-Id: Ib4bd5a1f53c76d202115c643410c74f99b19eb96
2017-07-31 23:34:44 +00:00
TreeHugger Robot
e2a3ca9cac Merge "Rename and Redoc VMS HAL defs." into oc-mr1-dev 2017-07-31 23:30:13 +00:00
sqian
58467cc3b0 Add corresponding error code to fix vts test
am: 293bbfdc3e  -s ours

Change-Id: If3709e59cb0279d1dea8a84e2610822e32640c05
2017-07-31 22:54:42 +00:00
sqian
293bbfdc3e Add corresponding error code to fix vts test
Test: run vts
Bug: 63152815
Bug: 62989786
Bug: 64041522
Change-Id: Ifbd17f85b39221de31ec7884b30dc176e1cbd3ab
Merged-In: Ifbd17f85b39221de31ec7884b30dc176e1cbd3ab
2017-07-31 15:00:44 -07:00
Sanket Padawe
fd8cc38275 Add owners for radio vts.
Test: vts
Fix: 64220334
Change-Id: I255d4fd9ed4416254c6897b0f314f65feacb04d6
2017-07-31 14:21:49 -07:00
Android Build Merger (Role)
a2460c6303 Merge "Merge "Wifi Offload HAL: Improve VTS tests for scanConfig" into oc-dr1-dev am: cf43256fa9 am: ff16a48057" into oc-mr1-dev-plus-aosp 2017-07-31 20:07:37 +00:00
Sohani Rao
81d5dbae88 Merge "Wifi Offload HAL: Improve VTS tests for scanConfig" into oc-dr1-dev am: cf43256fa9
am: ff16a48057

Change-Id: I6a758b358e20ed95c0748e9d15241f3b94587b43
2017-07-31 20:03:14 +00:00
Sohani Rao
8ba37279e9 Merge "Wifi Offload HAL: Improve VTS tests for scanConfig" into oc-dr1-dev am: cf43256fa9
am: c17e286b9f

Change-Id: Ibe4b8bf50a9be59530416b809ea4f6a36cccbe47
2017-07-31 20:03:03 +00:00
Sohani Rao
ff16a48057 Merge "Wifi Offload HAL: Improve VTS tests for scanConfig" into oc-dr1-dev
am: cf43256fa9

Change-Id: I4c6a33f61d9278edc8640564bb151a347f69c17f
2017-07-31 19:59:30 +00:00
Sohani Rao
c17e286b9f Merge "Wifi Offload HAL: Improve VTS tests for scanConfig" into oc-dr1-dev
am: cf43256fa9

Change-Id: I6dc1e8402c30a15f53273d059231b33d958eee4e
2017-07-31 19:59:29 +00:00
TreeHugger Robot
cf43256fa9 Merge "Wifi Offload HAL: Improve VTS tests for scanConfig" into oc-dr1-dev 2017-07-31 19:52:44 +00:00
Steven Moreland
07b399b6ec Merge "Update HIDL makefiles." am: 49dad304a5 am: 68a25d22e3 am: 27e608f01c
am: a1a7a39695

Change-Id: I4eb55db8907fcccdaa605b26c3bbf3549cbc3e7e
2017-07-31 19:43:30 +00:00
Steven Moreland
a1a7a39695 Merge "Update HIDL makefiles." am: 49dad304a5 am: 68a25d22e3
am: 27e608f01c

Change-Id: I1d9c2c1d1b15f865890f3c11310abd4096497ff5
2017-07-31 19:40:02 +00:00
Steven Moreland
27e608f01c Merge "Update HIDL makefiles." am: 49dad304a5
am: 68a25d22e3

Change-Id: I98400033b6e49696bc27930153a6747665235a98
2017-07-31 19:36:37 +00:00
Steven Moreland
68a25d22e3 Merge "Update HIDL makefiles."
am: 49dad304a5

Change-Id: I29f1de44312f589ba6e1df9498809cbb31315a2b
2017-07-31 19:33:34 +00:00
Treehugger Robot
49dad304a5 Merge "Update HIDL makefiles." 2017-07-31 19:25:11 +00:00
Shuo Qian
e799f22a94 Merge "Add corresponding error code to fix vts test" into oc-mr1-dev
am: de8b8c2abf

Change-Id: I53da8ef12020129098e2b049d42c8a538b854efe
2017-07-31 17:44:21 +00:00
Shuo Qian
de8b8c2abf Merge "Add corresponding error code to fix vts test" into oc-mr1-dev 2017-07-31 17:40:52 +00:00
Tomasz Wasilczyk
4a2b89b272 Merge "Refine broadcastradio HAL comments." into oc-mr1-dev
am: 084351dcb2

Change-Id: If61596548eae99a465e78c881bc119e0a633d857
2017-07-31 17:16:15 +00:00
Tomasz Wasilczyk
084351dcb2 Merge "Refine broadcastradio HAL comments." into oc-mr1-dev 2017-07-31 17:12:06 +00:00
Asaf Rosenfeld
01d10a11cf Rename and Redoc VMS HAL defs.
Test: All tests has been adjusted to post review names and pass.
Bug: 64093467
Change-Id: I7b5646b179030b59b87abc23ffe6a2a81e1b74b2
2017-07-31 16:40:42 +00:00
Emilian Peev
21eeeb0755 Merge "Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev am: 456dc6cc86 am: 39e2d42dcb -s ours" into oc-dr1-dev-plus-aosp
am: 686b08f4bc  -s ours

Change-Id: I0cee1370f8b79dfdce8b22ad01318d08f03f796c
2017-07-31 16:35:02 +00:00
Emilian Peev
2e2d6beb39 Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev am: 456dc6cc86 -s ours am: 7bf57e857b -s ours
am: 0a43eddebd  -s ours

Change-Id: I6bddff5952b5a4b4496aff4d32286a790a2f559c
2017-07-31 16:34:45 +00:00
Emilian Peev
52903e0564 Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev am: 456dc6cc86 -s ours am: 7bf57e857b -s ours
am: 1a8ec1b8c8  -s ours

Change-Id: Ie6d617e1251a8de3a6619ad4d578ff72f26de65d
2017-07-31 16:31:47 +00:00
Android Build Merger (Role)
686b08f4bc Merge "Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev am: 456dc6cc86 am: 39e2d42dcb -s ours" into oc-dr1-dev-plus-aosp 2017-07-31 16:31:36 +00:00
Android Build Merger (Role)
15e11db4d2 Merge "Merge "Camera: Update stream consumer usage flag" into oc-dr1-dev am: 48e25765d1 -s ours am: 274d228f4f -s ours" into oc-mr1-dev-plus-aosp 2017-07-31 16:31:30 +00:00
Emilian Peev
1a8ec1b8c8 Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev am: 456dc6cc86 -s ours
am: 7bf57e857b  -s ours

Change-Id: Icc0eee8c4b944bb09c95eb9842db25f5206dde85
2017-07-31 16:31:15 +00:00
Emilian Peev
0a43eddebd Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev am: 456dc6cc86 -s ours
am: 7bf57e857b  -s ours

Change-Id: If42e70eb0da24fcb91011bdf8014d4f323e86aea
2017-07-31 16:31:15 +00:00
Emilian Peev
d810d69c51 Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev am: 456dc6cc86
am: 39e2d42dcb  -s ours

Change-Id: Ie86915af1be6fa0a394f85f058b9a0006296b1d8
2017-07-31 16:31:15 +00:00
Emilian Peev
6ba1ec2d85 Merge "Camera: Update stream consumer usage flag" into oc-dr1-dev am: 48e25765d1 -s ours
am: 274d228f4f  -s ours

Change-Id: I1dabd125b188cbe793e705d586095a0e15c58c84
2017-07-31 16:31:15 +00:00
Emilian Peev
e5a8e24ab1 Merge "Camera: Update stream consumer usage flag" into oc-dr1-dev am: 48e25765d1
am: 9a63e83ca2  -s ours

Change-Id: Ib2a2f2b0c026aa454c38e8c7cfed2cfcb133fe29
2017-07-31 16:31:14 +00:00
Emilian Peev
39e2d42dcb Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev
am: 456dc6cc86

Change-Id: I2101aa5931f85f78f19e35922bdecfabd4687c65
2017-07-31 16:28:17 +00:00
Emilian Peev
9a63e83ca2 Merge "Camera: Update stream consumer usage flag" into oc-dr1-dev
am: 48e25765d1

Change-Id: I1a606bafa515b7dd494a508be426473e412416b7
2017-07-31 16:28:17 +00:00
Emilian Peev
7bf57e857b Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev
am: 456dc6cc86  -s ours

Change-Id: I10d00cc7a42127f5235a97dc72f76e608dfb5fea
2017-07-31 16:28:15 +00:00
Emilian Peev
274d228f4f Merge "Camera: Update stream consumer usage flag" into oc-dr1-dev
am: 48e25765d1  -s ours

Change-Id: Ie7acfad590d5069717373f2a79c1cbe5372bee0d
2017-07-31 16:28:15 +00:00
TreeHugger Robot
456dc6cc86 Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev 2017-07-31 16:22:23 +00:00
TreeHugger Robot
48e25765d1 Merge "Camera: Update stream consumer usage flag" into oc-dr1-dev 2017-07-31 16:21:44 +00:00
Android Build Merger (Role)
276bd2ee52 Merge "Merge "Camera: fix various VTS issues am: a0dd95d45d am: d42258ea80 -s ours" into oc-dr1-dev-plus-aosp am: 43c83f070b -s ours" into oc-mr1-dev-plus-aosp 2017-07-31 09:02:41 +00:00
Yin-Chia Yeh
d35a6473f1 Merge "Camera: fix various VTS issues am: a0dd95d45d am: d42258ea80 -s ours" into oc-dr1-dev-plus-aosp
am: 43c83f070b  -s ours

Change-Id: I1b9ef7e42c435b8b89d141f11383b8ab6cb33de0
2017-07-31 09:02:31 +00:00
Android Build Merger (Role)
9f142470b1 Merge "Camera: fix various VTS issues am: a0dd95d45d -s ours am: 63a9a98152 -s ours am: 80fefeb6d8 -s ours" into oc-mr1-dev-plus-aosp 2017-07-31 09:02:25 +00:00
Yin-Chia Yeh
95e1028adb Camera: fix various VTS issues am: a0dd95d45d -s ours am: 63a9a98152 -s ours
am: bf1bb54442  -s ours

Change-Id: I6f6283b2722158a8091cc9c7628d69847f176891
2017-07-31 09:02:16 +00:00
Yin-Chia Yeh
13e3aab325 Camera: fix various VTS issues am: a0dd95d45d -s ours am: 63a9a98152 -s ours
am: 80fefeb6d8  -s ours

Change-Id: I437011493ec69dbad08558380570e4e2840bca51
2017-07-31 09:02:16 +00:00
Android Build Merger (Role)
43c83f070b Merge "Camera: fix various VTS issues am: a0dd95d45d am: d42258ea80 -s ours" into oc-dr1-dev-plus-aosp 2017-07-31 08:58:58 +00:00