Jordan Jozwiak
782ef26b41
Add missing VHAL properties
...
Bug: b/111500076
Test: Build and install.
Change-Id: I32bfd33ce050ab6ffc886e2ba63b99bd5a33ad31
(cherry picked from commit 85df08f4fe94fd6dfedd6d7def5192cf1f7ce2c4)
2018-08-21 22:17:18 +00:00
Steven Moreland
333d905000
[automerger skipped] Merge "Add back keymaster@4.0 hash." into stage-aosp-master am: 0195970aa9 -s ours
...
am: d436d1b258
2018-08-21 15:07:15 -07:00
Steven Moreland
d436d1b258
[automerger skipped] Merge "Add back keymaster@4.0 hash." into stage-aosp-master
...
am: 0195970aa9
2018-08-21 14:47:07 -07:00
TreeHugger Robot
0195970aa9
Merge "Add back keymaster@4.0 hash." into stage-aosp-master
2018-08-21 21:16:21 +00:00
Nathan Harold
87e77f3999
[automerger skipped] Add docs for setSignalStrengthReportingCriteria am: dd06d73cab -s ours am: 6b4eb0e4bd -s ours am: 9da1dfe22b -s ours
...
am: 6598971ae9
2018-08-20 21:23:41 -07:00
Nathan Harold
6598971ae9
[automerger skipped] Add docs for setSignalStrengthReportingCriteria am: dd06d73cab -s ours am: 6b4eb0e4bd -s ours
...
am: 9da1dfe22b
2018-08-20 21:15:37 -07:00
Nathan Harold
9da1dfe22b
[automerger skipped] Add docs for setSignalStrengthReportingCriteria am: dd06d73cab -s ours
...
am: 6b4eb0e4bd
2018-08-20 21:11:34 -07:00
Nathan Harold
344e2c8c3c
[automerger skipped] Add docs for setSignalStrengthReportingCriteria am: dd06d73cab -s ours am: 8970ac88ed -s ours
...
am: 35007c0e7c
2018-08-20 21:11:04 -07:00
Nathan Harold
35007c0e7c
[automerger skipped] Add docs for setSignalStrengthReportingCriteria am: dd06d73cab -s ours
...
am: 8970ac88ed
2018-08-20 20:56:43 -07:00
Nathan Harold
6b4eb0e4bd
[automerger skipped] Add docs for setSignalStrengthReportingCriteria
...
am: dd06d73cab
2018-08-20 20:44:31 -07:00
Nathan Harold
8970ac88ed
[automerger skipped] Add docs for setSignalStrengthReportingCriteria
...
am: dd06d73cab
2018-08-20 20:43:32 -07:00
Steven Moreland
1c864dae17
[automerger skipped] Merge "Add back keymaster@4.0 hash." into pie-vts-dev am: 6a20e646e4 am: 51a56c5a11 -s ours am: 61016c8f5d -s ours
...
am: bdf816899c
2018-08-20 20:03:39 -07:00
Nathan Harold
dd06d73cab
Add docs for setSignalStrengthReportingCriteria
...
Because setSignalStrengthReportingCriteria only
supports a single measurement quantity, provide
further clarification on the applicability of the
API and how it may be used in various situations.
Bug: 110121199
Test: compilation - docstring-only change
Merged-In: If4236070fbc03368e5a78b0cf502cdc4a529a6ed
Change-Id: If4236070fbc03368e5a78b0cf502cdc4a529a6ed
(cherry picked from commit 529d2fffa0
2018-08-21 02:12:38 +00:00
Steven Moreland
bdf816899c
[automerger skipped] Merge "Add back keymaster@4.0 hash." into pie-vts-dev am: 6a20e646e4 am: 51a56c5a11 -s ours
...
am: 61016c8f5d
2018-08-20 19:12:35 -07:00
Valerie Hau
b8485526c4
Merge "Hardware composer VTS test harness"
2018-08-21 01:28:23 +00:00
Steven Moreland
61016c8f5d
[automerger skipped] Merge "Add back keymaster@4.0 hash." into pie-vts-dev am: 6a20e646e4
...
am: 51a56c5a11
2018-08-20 18:23:06 -07:00
Steven Moreland
b3f5bd11da
Merge "Add back keymaster@4.0 hash." into pie-vts-dev am: 6a20e646e4 am: 472e5f4355
...
am: 78d0fd4caf
2018-08-20 18:19:51 -07:00
Steven Moreland
a560a1b35f
Merge "Add back keymaster@4.0 hash." into pi-dev am: 095e15e000
...
am: 313379462a
2018-08-20 18:10:38 -07:00
Steven Moreland
736f04cf7f
Add back keymaster@4.0 hash.
...
This was changed after this branch was released. The originally
released hash needs to be restored since that is what partners
are building with.
Bug: 112688384
Bug: 78104779
Test: m android.hardware.keymaster@4.0 (tests hashes)
Change-Id: I0f59a493d7f17a13402d992495d1a259f6257077
Merged-In: I0f59a493d7f17a13402d992495d1a259f6257077
(cherry picked from commit ec720564db
2018-08-21 01:10:31 +00:00
Steven Moreland
78d0fd4caf
Merge "Add back keymaster@4.0 hash." into pie-vts-dev am: 6a20e646e4
...
am: 472e5f4355
2018-08-20 17:59:57 -07:00
Steven Moreland
472e5f4355
Merge "Add back keymaster@4.0 hash." into pie-vts-dev
...
am: 6a20e646e4
2018-08-20 17:33:46 -07:00
Steven Moreland
51a56c5a11
Merge "Add back keymaster@4.0 hash." into pie-vts-dev
...
am: 6a20e646e4
2018-08-20 17:20:49 -07:00
Steven Moreland
313379462a
Merge "Add back keymaster@4.0 hash." into pi-dev
...
am: 095e15e000
2018-08-20 17:09:40 -07:00
Treehugger Robot
6a20e646e4
Merge "Add back keymaster@4.0 hash." into pie-vts-dev
2018-08-20 23:44:03 +00:00
TreeHugger Robot
095e15e000
Merge "Add back keymaster@4.0 hash." into pi-dev
2018-08-20 23:33:25 +00:00
Valerie Hau
667f11ab3a
Hardware composer VTS test harness
...
Bug: 111563608
Test: VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I965efe8811e45a114978a9c8dd7a440c759787ec
2018-08-20 13:48:22 -07:00
TreeHugger Robot
0a6b9d9ea4
Merge "graphics: composer@2.2 does not require mapper@2.1"
2018-08-20 20:34:58 +00:00
Yin-Chia Yeh
eff21f4347
[automerger skipped] resolve merge conflicts of cd02298b46 to oreo-mr1-vts-dev am: 79cea44239 -s ours am: 46a5d4f73b am: 72c90cbaa5 am: a9891eebb3
...
am: b2c14d0297
2018-08-20 12:40:28 -07:00
Kevin Rocard
8791359eff
Effect VTS: Allow an effect proxy as pre/post processing am: 0f0328fc4e am: a3268e954d am: 8a452029f9 am: 196c7f7acf
...
am: 791dbf175c
2018-08-20 12:40:05 -07:00
Hsin-Yi Chen
14fc48b44c
[automerger skipped] Merge "Fix base class of WifiHidlEnvironment_1_2" into pie-vts-dev am: a73a8c9b2b am: 770b25abd0 am: fa79f2f8b3 -s ours
...
am: 731fc652f7
2018-08-20 12:39:27 -07:00
Hsin-Yi Chen
c7a546ac10
[automerger skipped] Merge "Fix IUsb version number in vts test" into pie-vts-dev am: 0a55878d1e -s ours am: 997fb4631e -s ours am: 55eb364f43 -s ours
...
am: d4a739bbf8
2018-08-20 12:35:09 -07:00
Yin-Chia Yeh
b2c14d0297
[automerger skipped] resolve merge conflicts of cd02298b46 to oreo-mr1-vts-dev am: 79cea44239 -s ours am: 46a5d4f73b am: 72c90cbaa5
...
am: a9891eebb3
2018-08-20 12:09:34 -07:00
Kevin Rocard
791dbf175c
Effect VTS: Allow an effect proxy as pre/post processing am: 0f0328fc4e am: a3268e954d am: 8a452029f9
...
am: 196c7f7acf
2018-08-20 12:09:13 -07:00
Hsin-Yi Chen
731fc652f7
[automerger skipped] Merge "Fix base class of WifiHidlEnvironment_1_2" into pie-vts-dev am: a73a8c9b2b am: 770b25abd0
...
am: fa79f2f8b3
2018-08-20 12:08:52 -07:00
Hsin-Yi Chen
d4a739bbf8
[automerger skipped] Merge "Fix IUsb version number in vts test" into pie-vts-dev am: 0a55878d1e -s ours am: 997fb4631e -s ours
...
am: 55eb364f43
2018-08-20 12:07:19 -07:00
Yin-Chia Yeh
a9891eebb3
[automerger skipped] resolve merge conflicts of cd02298b46 to oreo-mr1-vts-dev am: 79cea44239 -s ours am: 46a5d4f73b
...
am: 72c90cbaa5
2018-08-20 11:54:29 -07:00
Kevin Rocard
196c7f7acf
Effect VTS: Allow an effect proxy as pre/post processing am: 0f0328fc4e am: a3268e954d
...
am: 8a452029f9
2018-08-20 11:54:11 -07:00
Yin-Chia Yeh
f3e7f21783
[automerger skipped] resolve merge conflicts of cd02298b46 to oreo-mr1-vts-dev am: 79cea44239 -s ours am: 46a5d4f73b am: cfc4356fb2
...
am: 8b37caa777
2018-08-20 11:53:48 -07:00
Hsin-Yi Chen
fa79f2f8b3
Merge "Fix base class of WifiHidlEnvironment_1_2" into pie-vts-dev am: a73a8c9b2b
...
am: 770b25abd0
2018-08-20 11:53:38 -07:00
Hsin-Yi Chen
55eb364f43
[automerger skipped] Merge "Fix IUsb version number in vts test" into pie-vts-dev am: 0a55878d1e -s ours
...
am: 997fb4631e
2018-08-20 11:51:10 -07:00
Kevin Rocard
eb5f5f0553
Effect VTS: Allow an effect proxy as pre/post processing am: 0f0328fc4e am: a3268e954d am: 6be2351904
...
am: 06a87a6422
2018-08-20 11:45:06 -07:00
Yin-Chia Yeh
8b37caa777
[automerger skipped] resolve merge conflicts of cd02298b46 to oreo-mr1-vts-dev am: 79cea44239 -s ours am: 46a5d4f73b
...
am: cfc4356fb2
2018-08-20 11:44:48 -07:00
Yin-Chia Yeh
cfc4356fb2
[automerger skipped] resolve merge conflicts of cd02298b46 to oreo-mr1-vts-dev am: 79cea44239 -s ours
...
am: 46a5d4f73b
2018-08-20 11:38:45 -07:00
Yin-Chia Yeh
72c90cbaa5
[automerger skipped] resolve merge conflicts of cd02298b46 to oreo-mr1-vts-dev am: 79cea44239 -s ours
...
am: 46a5d4f73b
2018-08-20 11:32:43 -07:00
Kevin Rocard
06a87a6422
Effect VTS: Allow an effect proxy as pre/post processing am: 0f0328fc4e am: a3268e954d
...
am: 6be2351904
2018-08-20 11:31:46 -07:00
Yin-Chia Yeh
46a5d4f73b
[automerger skipped] resolve merge conflicts of cd02298b46 to oreo-mr1-vts-dev
...
am: 79cea44239
2018-08-20 11:29:40 -07:00
Kevin Rocard
6be2351904
Effect VTS: Allow an effect proxy as pre/post processing am: 0f0328fc4e
...
am: a3268e954d
2018-08-20 11:26:42 -07:00
Kevin Rocard
8a452029f9
Effect VTS: Allow an effect proxy as pre/post processing am: 0f0328fc4e
...
am: a3268e954d
2018-08-20 11:21:39 -07:00
Hsin-Yi Chen
770b25abd0
Merge "Fix base class of WifiHidlEnvironment_1_2" into pie-vts-dev
...
am: a73a8c9b2b
2018-08-20 11:14:25 -07:00
Hsin-Yi Chen
997fb4631e
[automerger skipped] Merge "Fix IUsb version number in vts test" into pie-vts-dev
...
am: 0a55878d1e
2018-08-20 11:14:00 -07:00
