Commit Graph

12165 Commits

Author SHA1 Message Date
Kevin Chyn
57acf9749a Update Face HIDL enroll method
Bug: 110597778

Test: builds
Change-Id: I61e4f4a61ad0561448bc50a29b84b668e9569551
2018-09-05 00:32:11 -07:00
TreeHugger Robot
f22f2202a4 Merge "CleanSpec: Remove stale configstore@1.1-service.rc" 2018-08-30 20:50:24 +00:00
Yin-Chia Yeh
8fd024c378 Merge "Camera: support torch control on external camera" am: f8007c2000 am: 361f2f9a17
am: fb5d713264

Change-Id: I5dbe1e94b8e6a49a57770717ff6f7c3702e6bb1c
2018-08-30 12:20:58 -07:00
Yin-Chia Yeh
fb5d713264 Merge "Camera: support torch control on external camera" am: f8007c2000
am: 361f2f9a17

Change-Id: I982aa7e7acb3e85c247319757516e85bf7408f82
2018-08-30 12:15:37 -07:00
Yin-Chia Yeh
361f2f9a17 Merge "Camera: support torch control on external camera"
am: f8007c2000

Change-Id: I876d92c646f3c0cb189dfd6be4881f4706d991cf
2018-08-30 12:11:29 -07:00
Treehugger Robot
f8007c2000 Merge "Camera: support torch control on external camera" 2018-08-30 19:02:26 +00:00
Emilian Peev
f9f9f7cf08 [automerger skipped] Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pie-vts-dev am: 391eb588cf am: 81221c2f6c -s ours am: 7e0abbc7d8 -s ours
am: df2ac02593  -s ours

Change-Id: I346ebc3d1fd783f2ce7c2a8b5b059450d653ca75
2018-08-30 10:48:19 -07:00
Kevin Rocard
2535c120c8 [automerger skipped] Merge "Allow getCapturePosition to return 0 frames for unprepared streams" into pie-vts-dev am: 137194ef5e am: 30c2361ad4 -s ours am: a29aa05595 -s ours
am: 9eaa2f33da  -s ours

Change-Id: Ie8af7ef7efc1325daf3e84589da48b7839921b10
2018-08-30 10:47:01 -07:00
Emilian Peev
9b9658a96e [automerger skipped] Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pie-vts-dev am: 391eb588cf -s ours am: 9ab6d35098 -s ours
am: c3812981d4  -s ours

Change-Id: I98b66a083f6400b24dd05ffaa41d70edca7f4de2
2018-08-30 10:43:59 -07:00
Emilian Peev
df2ac02593 [automerger skipped] Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pie-vts-dev am: 391eb588cf am: 81221c2f6c -s ours
am: 7e0abbc7d8  -s ours

Change-Id: I8adb782eda1793c2289127c86358c25fd9229c05
2018-08-30 10:43:45 -07:00
Kevin Rocard
9eaa2f33da [automerger skipped] Merge "Allow getCapturePosition to return 0 frames for unprepared streams" into pie-vts-dev am: 137194ef5e am: 30c2361ad4 -s ours
am: a29aa05595  -s ours

Change-Id: Iaa080ada2a9c48c1c75a0f75795f1771ffa3b260
2018-08-30 10:42:39 -07:00
Kevin Rocard
d1b083e119 [automerger skipped] Merge "Allow getCapturePosition to return 0 frames for unprepared streams" into pie-vts-dev am: 137194ef5e -s ours am: 7fd4c19ee7 -s ours
am: fd9aa9d8f9  -s ours

Change-Id: Ie142d7e2e14215b51bdbd1bb145bb9cdf26a1543
2018-08-30 10:42:36 -07:00
Emilian Peev
7e0abbc7d8 [automerger skipped] Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pie-vts-dev am: 391eb588cf
am: 81221c2f6c  -s ours

Change-Id: Id219b9dc2c492bbc8024c65c4b5e5244f9c7e412
2018-08-30 10:39:22 -07:00
Kevin Rocard
a29aa05595 [automerger skipped] Merge "Allow getCapturePosition to return 0 frames for unprepared streams" into pie-vts-dev am: 137194ef5e
am: 30c2361ad4  -s ours

Change-Id: Ie8a72fe300beceb415f86b07b99be7e15952d5e3
2018-08-30 10:38:24 -07:00
Emilian Peev
c3812981d4 [automerger skipped] Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pie-vts-dev am: 391eb588cf -s ours
am: 9ab6d35098  -s ours

Change-Id: If5d42a173c3639af5a4a26671d9dd20edf17c98e
2018-08-30 10:33:59 -07:00
Kevin Rocard
fd9aa9d8f9 [automerger skipped] Merge "Allow getCapturePosition to return 0 frames for unprepared streams" into pie-vts-dev am: 137194ef5e -s ours
am: 7fd4c19ee7  -s ours

Change-Id: I83147205f4a36fde3a82e5e3a38920f55ff449dd
2018-08-30 10:33:35 -07:00
Emilian Peev
9ab6d35098 [automerger skipped] Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pie-vts-dev
am: 391eb588cf  -s ours

Change-Id: If67bf92373255a6e2f0ccf90890316e8d478f74d
2018-08-30 10:29:52 -07:00
Kevin Rocard
7fd4c19ee7 [automerger skipped] Merge "Allow getCapturePosition to return 0 frames for unprepared streams" into pie-vts-dev
am: 137194ef5e  -s ours

Change-Id: Icb255d529c6268876c18700358d244929854d381
2018-08-30 10:29:31 -07:00
Emilian Peev
81221c2f6c Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pie-vts-dev
am: 391eb588cf

Change-Id: Id897eee2251eee92267b4e32f7d245aca3eb1e88
2018-08-30 10:23:00 -07:00
Kevin Rocard
30c2361ad4 Merge "Allow getCapturePosition to return 0 frames for unprepared streams" into pie-vts-dev
am: 137194ef5e

Change-Id: Ibef9acb447f71a94c27ad62ffd93b87126637143
2018-08-30 10:22:35 -07:00
Treehugger Robot
391eb588cf Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pie-vts-dev 2018-08-30 17:15:35 +00:00
Treehugger Robot
137194ef5e Merge "Allow getCapturePosition to return 0 frames for unprepared streams" into pie-vts-dev 2018-08-30 17:15:19 +00:00
Yu-Han Yang
9451f2ac3c [automerger skipped] Merge "Set the floor value of time estimate as 2017 Jan 01 00:00:00 GMT" into pie-vts-dev am: 4e0c7c1760 am: 241ea6a582 -s ours am: fdaba9a466 -s ours
am: f5ffacae40  -s ours

Change-Id: I5f50d12e89f722f19ffeeb412780cd642f3b8d4d
2018-08-29 17:57:18 -07:00
Yu-Han Yang
f5ffacae40 [automerger skipped] Merge "Set the floor value of time estimate as 2017 Jan 01 00:00:00 GMT" into pie-vts-dev am: 4e0c7c1760 am: 241ea6a582 -s ours
am: fdaba9a466  -s ours

Change-Id: I40e87a5a462dc74ce7bf2492b082069a37b25c12
2018-08-29 17:38:35 -07:00
Yu-Han Yang
1025fafed0 [automerger skipped] Merge "Set the floor value of time estimate as 2017 Jan 01 00:00:00 GMT" into pie-vts-dev am: 4e0c7c1760 -s ours am: cdb057feb6 -s ours
am: f6ebaa96ae  -s ours

Change-Id: I9a29fca2d54bbefc8fc9a0296fd2e8870f9d4574
2018-08-29 17:27:42 -07:00
Yu-Han Yang
fdaba9a466 [automerger skipped] Merge "Set the floor value of time estimate as 2017 Jan 01 00:00:00 GMT" into pie-vts-dev am: 4e0c7c1760
am: 241ea6a582  -s ours

Change-Id: Iaaa8190afb55a3dcd74289e1207c954c420f972d
2018-08-29 17:26:23 -07:00
Yu-Han Yang
f6ebaa96ae [automerger skipped] Merge "Set the floor value of time estimate as 2017 Jan 01 00:00:00 GMT" into pie-vts-dev am: 4e0c7c1760 -s ours
am: cdb057feb6  -s ours

Change-Id: I3e24ede80dcd4459008343c7c8c2431c577af0e9
2018-08-29 17:18:09 -07:00
Yu-Han Yang
cdb057feb6 [automerger skipped] Merge "Set the floor value of time estimate as 2017 Jan 01 00:00:00 GMT" into pie-vts-dev
am: 4e0c7c1760  -s ours

Change-Id: Ifb42edcc7283289b3c427ca56ca4acdeeffd98d2
2018-08-29 17:13:03 -07:00
Yu-Han Yang
241ea6a582 Merge "Set the floor value of time estimate as 2017 Jan 01 00:00:00 GMT" into pie-vts-dev
am: 4e0c7c1760

Change-Id: Ia8b0d2e61772da26e399d5a6d029159eb70b88d7
2018-08-29 17:11:15 -07:00
Treehugger Robot
4e0c7c1760 Merge "Set the floor value of time estimate as 2017 Jan 01 00:00:00 GMT" into pie-vts-dev 2018-08-29 23:59:34 +00:00
Peiyong Lin
b4fa9a7edb [automerger skipped] Merge "[ConfigStore] Clarify hasHDRDisplay spec." am: cd86e194de am: 30de0d87aa
am: a5df87065b  -s ours

Change-Id: I234fe97beaf208754e59c8b6865a2ca638a8c389
2018-08-29 15:48:59 -07:00
Peiyong Lin
a5df87065b Merge "[ConfigStore] Clarify hasHDRDisplay spec." am: cd86e194de
am: 30de0d87aa

Change-Id: I4350adeaa454b63ec9167f7150f22b1be59dba6b
2018-08-29 15:44:59 -07:00
Peiyong Lin
30de0d87aa Merge "[ConfigStore] Clarify hasHDRDisplay spec."
am: cd86e194de

Change-Id: Id3054cb55c79275ba51dcbd58f2a3b1e30914a3a
2018-08-29 15:40:57 -07:00
Treehugger Robot
cd86e194de Merge "[ConfigStore] Clarify hasHDRDisplay spec." 2018-08-29 22:34:02 +00:00
Jesse Hall
6389b829fe CleanSpec: Remove stale configstore@1.1-service.rc
Removing this file was inadvertently left out of commit 2b3f826.

Bug: 113292034
Test: build+flash from tree before 2b3f826, sync past 2b3f826,
      apply this change, build+flash again

Change-Id: Ic12e57e2426d2e105e6b846fa8ca076c6100c2ba
2018-08-29 13:52:24 -07:00
sqian
7c042c53b7 [automerger skipped] Merge "Fix setAllowedCarrier" into pie-vts-dev am: 052f207b42 -s ours am: 222caea32d -s ours am: c525730843 -s ours
am: 48e78ef6f6  -s ours

Change-Id: I3b4b60581ad38bdff6994ddccccce910743be4d0
2018-08-29 12:45:47 -07:00
sqian
48e78ef6f6 [automerger skipped] Merge "Fix setAllowedCarrier" into pie-vts-dev am: 052f207b42 -s ours am: 222caea32d -s ours
am: c525730843  -s ours

Change-Id: Ifa3022ee1cb1e03c75c67856d30904c4b3ce83db
2018-08-29 12:29:02 -07:00
sqian
c525730843 [automerger skipped] Merge "Fix setAllowedCarrier" into pie-vts-dev am: 052f207b42 -s ours
am: 222caea32d  -s ours

Change-Id: I7854d76e479809882cde2b1b57e87cacf075cb84
2018-08-29 12:13:56 -07:00
sqian
34bc5407ac [automerger skipped] Merge "Fix setAllowedCarrier" into pie-vts-dev am: 052f207b42 -s ours am: fd1529069a -s ours
am: 11a6b15dfb  -s ours

Change-Id: Ia8870e6def6ff9805131660285b6833882407cf5
2018-08-29 12:09:57 -07:00
sqian
11a6b15dfb [automerger skipped] Merge "Fix setAllowedCarrier" into pie-vts-dev am: 052f207b42 -s ours
am: fd1529069a  -s ours

Change-Id: I77c5aecd2e2512bfd54eb43347e7ad303bf4340d
2018-08-29 12:06:54 -07:00
sqian
fd1529069a [automerger skipped] Merge "Fix setAllowedCarrier" into pie-vts-dev
am: 052f207b42  -s ours

Change-Id: Ic5d81115fef7c0b36231a20e2a032db8a8d6102c
2018-08-29 12:01:52 -07:00
sqian
222caea32d [automerger skipped] Merge "Fix setAllowedCarrier" into pie-vts-dev
am: 052f207b42  -s ours

Change-Id: Ic6f3763761f13361d21d14594042011e797099f1
2018-08-29 11:54:50 -07:00
Treehugger Robot
052f207b42 Merge "Fix setAllowedCarrier" into pie-vts-dev 2018-08-29 18:44:58 +00:00
Emilian Peev
fe40b621b7 Camera: Allow 3% ISO tolerance during ISO burst VTS
The advertised ISO ranges may not be entirely supported on
some devices. Expect a 3% tolerance when comparing the applied
results versus the expected ISO value.

Bug: 80025874
Test: run vts --skip-all-system-status-check --skip-preconditions
--primary-abi-only --module VtsHalCameraProviderV2_4Target -l INFO

Merged-In: Ibd2758e48a0924e81877e35dd27433669274fdb3
Change-Id: Ibd2758e48a0924e81877e35dd27433669274fdb3
(cherry picked from commit 0fdd7cdc0e)
2018-08-29 17:57:11 +00:00
Yu-Han Yang
45f0a8bb67 Set the floor value of time estimate as 2017 Jan 01 00:00:00 GMT
- The VTS test checks if the time estimate is a sane value. Thus, any
arbitrary sane value is acceptable. Here we make it consistent to
IGnssDebug.hal, where a comment mentions 2017 Jan 1 as an example of
the value.

Bug: 110094003
Test: make vts, and tested on device.
Merged-In: Ic4f6b597a718ea3e98a67c7939f9e6930d44d224
Change-Id: Ic4f6b597a718ea3e98a67c7939f9e6930d44d224
(cherry picked from commit 5fa43c83e9)
(cherry picked from commit 4f0d19ebff)
2018-08-29 17:56:51 +00:00
Kevin Rocard
eb2b0093cf Allow getCapturePosition to return 0 frames for unprepared streams
For device supporting getCapturePosition,
VTS only allowed unprepared stream to return INVALID_STATE.
Now also allow for the stream to return 0 frames similarly to the other
non started states.

Test: vts-tradefed run commandAndExit vts --module VtsHalAudioV2_0Target
Bug: 110367728
Cherry-piked from: d01dc3edac9e92981e7ae419d0e7622f753acf94
Merged-In: Ibdf8df8cb8809e98c40a50035371df6893fe4da4
Change-Id: Ibdf8df8cb8809e98c40a50035371df6893fe4da4
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit 6c9c6e62c1)
2018-08-29 10:29:07 -07:00
Shawn Willden
9766c74b44 [automerger skipped] Merge "Change ImportWrappedKeyTest back to SHA1" into pie-vts-dev am: e7300721a0 -s ours am: 171dd95a69 -s ours am: 1cc38b49e1 -s ours
am: 6599763840  -s ours

Change-Id: I0df849f248eb98477da4a5e15671f4427ecafdcf
2018-08-29 01:27:25 -07:00
Shawn Willden
60c71268a1 [automerger skipped] Merge "Require keymaster4 attestations to contain the right version." into pie-vts-dev am: 516718071b -s ours am: 2b0ce83a04 -s ours am: e98a380651 -s ours
am: 6b2ac626e9  -s ours

Change-Id: I3d003c5e636d4078153fd8f6253200c4d22c6f67
2018-08-29 01:27:02 -07:00
nagendra modadugu
0eaaf8ff79 [automerger skipped] Merge "keymaster: skip SHA2 digest tests for strongbox" into pie-vts-dev am: 86104dcc18 -s ours am: ce8636160c -s ours am: 207393e48e -s ours
am: 4ce3a5fabd  -s ours

Change-Id: I6fff6908037e80a3233eebab3d1d9e322b74c437
2018-08-29 01:26:41 -07:00
nagendra modadugu
ff61129f5a [automerger skipped] Merge changes Ic41afbd0,Ibe264d08 into pie-vts-dev am: e101aa87a3 -s ours am: e22dd68ccb -s ours am: ff47f4467e -s ours
am: ae85689274  -s ours

Change-Id: I12f4165734110a5dfc114131ef5ea083fd5a7b02
2018-08-29 01:26:19 -07:00