Baranidharan Muthukumaran
3f200e078e
Merge "Fix KM VTS tests for Strongbox implementations"
...
am: d6b4242d52
Change-Id: I52cd833dfa2c8cc4fb130544f5cb5d35217a0fc4
2018-09-04 03:55:02 -07:00
Treehugger Robot
d6b4242d52
Merge "Fix KM VTS tests for Strongbox implementations"
2018-09-04 10:44:18 +00: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
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
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
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
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
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
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
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
1cc38b49e1
[automerger skipped] Merge "Change ImportWrappedKeyTest back to SHA1" into pie-vts-dev am: e7300721a0
-s ours
...
am: 171dd95a69
-s ours
Change-Id: I1743f0317fb1d535c1bad5593a45463c5488b79d
2018-08-29 01:19:31 -07:00
Shawn Willden
e98a380651
[automerger skipped] Merge "Require keymaster4 attestations to contain the right version." into pie-vts-dev am: 516718071b
-s ours
...
am: 2b0ce83a04
-s ours
Change-Id: I2556f70510c08783e0635377f1702db617c5703d
2018-08-29 01:19:14 -07:00
nagendra modadugu
207393e48e
[automerger skipped] Merge "keymaster: skip SHA2 digest tests for strongbox" into pie-vts-dev am: 86104dcc18
-s ours
...
am: ce8636160c
-s ours
Change-Id: I2031f9cc658dbd602560eb96182996fa6e8faa56
2018-08-29 01:18:57 -07:00
nagendra modadugu
ff47f4467e
[automerger skipped] Merge changes Ic41afbd0,Ibe264d08 into pie-vts-dev am: e101aa87a3
-s ours
...
am: e22dd68ccb
-s ours
Change-Id: Ib63e495474c2137f67774466629eabb3ecc383a6
2018-08-29 01:18:39 -07:00
Eran Messeri
152e192831
[automerger skipped] Merge "Fixing Keymaster documentation." into pie-vts-dev am: 33f7970672
...
am: 8ee59f2aa6
-s ours
Change-Id: I3b8774b3e01c332b830e3aebf6dbe504a430fdfa
2018-08-29 01:18:22 -07:00
Shawn Willden
171dd95a69
[automerger skipped] Merge "Change ImportWrappedKeyTest back to SHA1" into pie-vts-dev
...
am: e7300721a0
-s ours
Change-Id: Ie8af40cfea7a0893f9f90d4c42a7cf8513e38818
2018-08-29 01:13:11 -07:00
Shawn Willden
2b0ce83a04
[automerger skipped] Merge "Require keymaster4 attestations to contain the right version." into pie-vts-dev
...
am: 516718071b
-s ours
Change-Id: I15537d95bc28ff14aa3942d932378e99d5793f42
2018-08-29 01:12:55 -07:00
nagendra modadugu
ce8636160c
[automerger skipped] Merge "keymaster: skip SHA2 digest tests for strongbox" into pie-vts-dev
...
am: 86104dcc18
-s ours
Change-Id: Ib420f757159aaf8bbf462f98d88be3808d84c7d1
2018-08-29 01:12:38 -07:00
nagendra modadugu
e22dd68ccb
[automerger skipped] Merge changes Ic41afbd0,Ibe264d08 into pie-vts-dev
...
am: e101aa87a3
-s ours
Change-Id: Ifff697b20cb2e0c9f89594fe965dde3545447175
2018-08-29 01:12:17 -07:00
Eran Messeri
8ee59f2aa6
Merge "Fixing Keymaster documentation." into pie-vts-dev
...
am: 33f7970672
Change-Id: I0bd196af03f96817cbd23620b109e7665456f586
2018-08-29 01:11:55 -07:00
Treehugger Robot
e7300721a0
Merge "Change ImportWrappedKeyTest back to SHA1" into pie-vts-dev
2018-08-29 08:07:09 +00:00
Treehugger Robot
516718071b
Merge "Require keymaster4 attestations to contain the right version." into pie-vts-dev
2018-08-29 08:06:55 +00:00
Treehugger Robot
86104dcc18
Merge "keymaster: skip SHA2 digest tests for strongbox" into pie-vts-dev
2018-08-29 08:06:40 +00:00
Treehugger Robot
e101aa87a3
Merge changes Ic41afbd0,Ibe264d08 into pie-vts-dev
...
* changes:
keymaster: spec does not require that update produce output
Fix attestation test.
2018-08-29 08:06:38 +00:00
Treehugger Robot
33f7970672
Merge "Fixing Keymaster documentation." into pie-vts-dev
2018-08-29 08:06:31 +00:00
Amit Mahajan
1d20bd5307
[automerger skipped] Allow general errors for getImsiForApp(). am: 1f3d0a68a4
-s ours
...
am: f53ee60533
-s ours
Change-Id: Idbcefb53c1c52e5def7a52c45fec539e3dccc619
2018-08-28 20:01:33 -07:00
Amit Mahajan
f53ee60533
[automerger skipped] Allow general errors for getImsiForApp().
...
am: 1f3d0a68a4
-s ours
Change-Id: I2b7df276429ce16a63e00ed5f3e2654bbb9c63ed
2018-08-28 19:51:27 -07:00
sqian
f27a92e634
Fix setAllowedCarrier
...
If function is not supported or executed successfully, do not
expect its effect on cardStatus.
Bug: 112008372
Test: run vts
Change-Id: I4532a39af2cfcf0e44eafe29c3c7f6779ae101f5
Merged-In: I4532a39af2cfcf0e44eafe29c3c7f6779ae101f5
(cherry picked from commit 44b129f728
)
2018-08-29 01:44:38 +00:00
Amit Mahajan
1f3d0a68a4
Allow general errors for getImsiForApp().
...
This is to match it with other 1.0 tests where general errors are
allowed. For newer tests we have decided to not allow these errors,
but a failure for this old test is reported when run with SIM
present.
Test: run vts -m VtsHalRadioV1_0Target
Bug: 109889468
Change-Id: If36083b7832706a50805932e8ba08e4eb397f3fe
Merged-In: If36083b7832706a50805932e8ba08e4eb397f3fe
(cherry picked from commit 817848e59e
)
2018-08-29 01:42:18 +00:00
sqian
f062aaa3ec
[automerger skipped] Merge "Loose startNetworkScan cases" into pie-vts-dev am: 3c233d344c
-s ours
...
am: 94c311312d
-s ours
Change-Id: I15013e9734767a01faf29ec72041fb8f9e6e8a72
2018-08-28 17:19:18 -07:00
sqian
004b477399
[automerger skipped] Merge "Fix missed refactor of serial" into pie-vts-dev am: d4f9ad2c59
-s ours
...
am: 6907402d39
-s ours
Change-Id: I436ff2104487bec8c513e3badee2e603575057c5
2018-08-28 17:13:07 -07:00
Amit Mahajan
944616a81c
[automerger skipped] Merge "Allow NOT_SUPPORTED for setLinkCapacityReportingCriteria on GERAN." into pie-vts-dev am: 429da8656e
-s ours
...
am: 0a95afe2b5
-s ours
Change-Id: I5930568ca8f9aaebb3b0c80926edf8b5b62a0788
2018-08-28 17:12:47 -07:00
Amit Mahajan
4e1d63a2bb
[automerger skipped] Merge "Allow REQUEST_NOT_SUPPORTED as an error for startNetworkScan" into pie-vts-dev am: 00cdcb77f8
-s ours
...
am: 90edca997b
-s ours
Change-Id: I6220e4895af1edae293fbb118f1dffe2e88488fc
2018-08-28 17:12:27 -07:00
sqian
94c311312d
[automerger skipped] Merge "Loose startNetworkScan cases" into pie-vts-dev
...
am: 3c233d344c
-s ours
Change-Id: Ie83195654dc60810651b9cd883d1a5f1f360f5fa
2018-08-28 16:51:22 -07:00
sqian
6907402d39
[automerger skipped] Merge "Fix missed refactor of serial" into pie-vts-dev
...
am: d4f9ad2c59
-s ours
Change-Id: I95f73d92932ffa352b6299c7bb8d5fe4ec71e023
2018-08-28 16:47:55 -07:00
Amit Mahajan
0a95afe2b5
[automerger skipped] Merge "Allow NOT_SUPPORTED for setLinkCapacityReportingCriteria on GERAN." into pie-vts-dev
...
am: 429da8656e
-s ours
Change-Id: Ie29dbb55092bcfecc0f01a4ba3405ea8dd8db518
2018-08-28 16:47:35 -07:00
Treehugger Robot
3c233d344c
Merge "Loose startNetworkScan cases" into pie-vts-dev
2018-08-28 23:47:27 +00:00
Amit Mahajan
90edca997b
[automerger skipped] Merge "Allow REQUEST_NOT_SUPPORTED as an error for startNetworkScan" into pie-vts-dev
...
am: 00cdcb77f8
-s ours
Change-Id: Ie8c2baaacc0369048448d608ab002c1369b9b68f
2018-08-28 16:47:16 -07:00
Treehugger Robot
d4f9ad2c59
Merge "Fix missed refactor of serial" into pie-vts-dev
2018-08-28 23:42:41 +00:00