Merge "Camera: support torch control on external camera"
Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pie-vts-dev
am: 391eb588cf
Change-Id: Id897eee2251eee92267b4e32f7d245aca3eb1e88
am: 391eb588cf
Change-Id: Id897eee2251eee92267b4e32f7d245aca3eb1e88
Merge "Allow getCapturePosition to return 0 frames for unprepared streams" into pie-vts-dev
am: 137194ef5e
Change-Id: Ibef9acb447f71a94c27ad62ffd93b87126637143
am: 137194ef5e
Change-Id: Ibef9acb447f71a94c27ad62ffd93b87126637143
Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pie-vts-dev
Merge "Allow getCapturePosition to return 0 frames for unprepared streams" into pie-vts-dev
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
am: 4e0c7c1760
Change-Id: Ia8b0d2e61772da26e399d5a6d029159eb70b88d7
Merge "Set the floor value of time estimate as 2017 Jan 01 00:00:00 GMT" into pie-vts-dev
Merge "[ConfigStore] Clarify hasHDRDisplay spec."
[automerger skipped] Merge "Fix setAllowedCarrier" into pie-vts-dev
am: 052f207b42 -s ours
Change-Id: Ic6f3763761f13361d21d14594042011e797099f1
am: 052f207b42 -s ours
Change-Id: Ic6f3763761f13361d21d14594042011e797099f1
Merge "Fix setAllowedCarrier" into pie-vts-dev
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 0fdd7cdc0eab249e0f0615fad1034231c09987dd)
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 0fdd7cdc0eab249e0f0615fad1034231c09987dd)
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 5fa43c83e90ccd0f852c89feb0e071aad195d7b2)
(cherry picked from commit 4f0d19ebff1f4a3eb565d8432f44b561ebd4abe2)
- 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 5fa43c83e90ccd0f852c89feb0e071aad195d7b2)
(cherry picked from commit 4f0d19ebff1f4a3eb565d8432f44b561ebd4abe2)
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 6c9c6e62c193461ed0de4666d0995631ba39e009)
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 6c9c6e62c193461ed0de4666d0995631ba39e009)
[automerger skipped] Merge "Change ImportWrappedKeyTest back to SHA1" into pie-vts-dev
am: e7300721a0 -s ours
Change-Id: Ie8af40cfea7a0893f9f90d4c42a7cf8513e38818
am: e7300721a0 -s ours
Change-Id: Ie8af40cfea7a0893f9f90d4c42a7cf8513e38818
[automerger skipped] Merge "Require keymaster4 attestations to contain the right version." into pie-vts-dev
am: 516718071b -s ours
Change-Id: I15537d95bc28ff14aa3942d932378e99d5793f42
am: 516718071b -s ours
Change-Id: I15537d95bc28ff14aa3942d932378e99d5793f42
[automerger skipped] Merge "keymaster: skip SHA2 digest tests for strongbox" into pie-vts-dev
am: 86104dcc18 -s ours
Change-Id: Ib420f757159aaf8bbf462f98d88be3808d84c7d1
am: 86104dcc18 -s ours
Change-Id: Ib420f757159aaf8bbf462f98d88be3808d84c7d1
[automerger skipped] Merge changes Ic41afbd0,Ibe264d08 into pie-vts-dev
am: e101aa87a3 -s ours
Change-Id: Ifff697b20cb2e0c9f89594fe965dde3545447175
am: e101aa87a3 -s ours
Change-Id: Ifff697b20cb2e0c9f89594fe965dde3545447175
Merge "Fixing Keymaster documentation." into pie-vts-dev
am: 33f7970672
Change-Id: I0bd196af03f96817cbd23620b109e7665456f586
am: 33f7970672
Change-Id: I0bd196af03f96817cbd23620b109e7665456f586
Merge "Change ImportWrappedKeyTest back to SHA1" into pie-vts-dev
Merge "Require keymaster4 attestations to contain the right version." into pie-vts-dev
Merge "keymaster: skip SHA2 digest tests for strongbox" into pie-vts-dev
Merge changes Ic41afbd0,Ibe264d08 into pie-vts-dev
* changes:
keymaster: spec does not require that update produce output
Fix attestation test.
* changes:
keymaster: spec does not require that update produce output
Fix attestation test.
Merge "Fixing Keymaster documentation." into pie-vts-dev
[automerger skipped] Allow general errors for getImsiForApp().
am: 1f3d0a68a4 -s ours
Change-Id: I2b7df276429ce16a63e00ed5f3e2654bbb9c63ed
am: 1f3d0a68a4 -s ours
Change-Id: I2b7df276429ce16a63e00ed5f3e2654bbb9c63ed
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 44b129f7288016a4113f5e6ff059d63987d63385)
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 44b129f7288016a4113f5e6ff059d63987d63385)
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 817848e59e18334a30f623ef143cf182716fd3fa)
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 817848e59e18334a30f623ef143cf182716fd3fa)
[automerger skipped] Merge "Loose startNetworkScan cases" into pie-vts-dev
am: 3c233d344c -s ours
Change-Id: Ie83195654dc60810651b9cd883d1a5f1f360f5fa
am: 3c233d344c -s ours
Change-Id: Ie83195654dc60810651b9cd883d1a5f1f360f5fa
[automerger skipped] Merge "Fix missed refactor of serial" into pie-vts-dev
am: d4f9ad2c59 -s ours
Change-Id: I95f73d92932ffa352b6299c7bb8d5fe4ec71e023
am: d4f9ad2c59 -s ours
Change-Id: I95f73d92932ffa352b6299c7bb8d5fe4ec71e023
[automerger skipped] Merge "Allow NOT_SUPPORTED for setLinkCapacityReportingCriteria on GERAN." into pie-vts-dev
am: 429da8656e -s ours
Change-Id: Ie29dbb55092bcfecc0f01a4ba3405ea8dd8db518
am: 429da8656e -s ours
Change-Id: Ie29dbb55092bcfecc0f01a4ba3405ea8dd8db518
Merge "Loose startNetworkScan cases" into pie-vts-dev
[automerger skipped] Merge "Allow REQUEST_NOT_SUPPORTED as an error for startNetworkScan" into pie-vts-dev
am: 00cdcb77f8 -s ours
Change-Id: Ie8c2baaacc0369048448d608ab002c1369b9b68f
am: 00cdcb77f8 -s ours
Change-Id: Ie8c2baaacc0369048448d608ab002c1369b9b68f
Merge "Fix missed refactor of serial" into pie-vts-dev
Merge "Allow NOT_SUPPORTED for setLinkCapacityReportingCriteria on GERAN." into pie-vts-dev
Merge "Allow REQUEST_NOT_SUPPORTED as an error for startNetworkScan" into pie-vts-dev
[automerger skipped] Secure_element: vts: Modify openBasicChannel as per OMAPI standard
am: ecdec18c73 -s ours
Change-Id: I84c5b1003063990e4d70941344a0b920b28a2867
am: ecdec18c73 -s ours
Change-Id: I84c5b1003063990e4d70941344a0b920b28a2867
Loose startNetworkScan cases
startNetworkScan:
Some vendor may not support the required manual GSM search
functionality.
startNetworkScan_GoodRequest1 and startNetworkScan_GoodRequest2:
Some vendor may not support max search time of 360s.
Test: sanity
Bug: 109765420
Merged-In: I456847815057d76561bfb3e840016619ac753476
Change-Id: I456847815057d76561bfb3e840016619ac753476
(cherry picked from commit 12f7d6127b301b140ee81696fed19f81a7ea50c6)
startNetworkScan:
Some vendor may not support the required manual GSM search
functionality.
startNetworkScan_GoodRequest1 and startNetworkScan_GoodRequest2:
Some vendor may not support max search time of 360s.
Test: sanity
Bug: 109765420
Merged-In: I456847815057d76561bfb3e840016619ac753476
Change-Id: I456847815057d76561bfb3e840016619ac753476
(cherry picked from commit 12f7d6127b301b140ee81696fed19f81a7ea50c6)
Fix missed refactor of serial
Bug: 109822806
Test: run vts
Merged-In: If88384699dbb4c2ddd1c580d2b35be38afd0f8e8
Change-Id: If88384699dbb4c2ddd1c580d2b35be38afd0f8e8
(cherry picked from commit c0e2e2b071df5cdff10193556163e2975f0b682c)
Bug: 109822806
Test: run vts
Merged-In: If88384699dbb4c2ddd1c580d2b35be38afd0f8e8
Change-Id: If88384699dbb4c2ddd1c580d2b35be38afd0f8e8
(cherry picked from commit c0e2e2b071df5cdff10193556163e2975f0b682c)
Allow NOT_SUPPORTED for setLinkCapacityReportingCriteria on GERAN.
Test: run vts -m VtsHalRadioV1_2Target
Bug: 110716988
Merged-In: I9a5f014d498db00d818870cbd73e119f66562ef1
Change-Id: I9a5f014d498db00d818870cbd73e119f66562ef1
(cherry picked from commit c7896501db413c9a0fa44d2697da4079610075d8)
Test: run vts -m VtsHalRadioV1_2Target
Bug: 110716988
Merged-In: I9a5f014d498db00d818870cbd73e119f66562ef1
Change-Id: I9a5f014d498db00d818870cbd73e119f66562ef1
(cherry picked from commit c7896501db413c9a0fa44d2697da4079610075d8)
Allow REQUEST_NOT_SUPPORTED as an error for startNetworkScan
We are trying to tighten the APIs. However for this case since the
documentation was not updated, we are allowing NOT_SUPPORTED for
now and will be cleaned up in a later release.
Test: run vts -m VtsHalRadioV1_2Target
Bug: 110118713
Merged-In: Id9dd3d7bac99bed36ceb9c906189f1fea78d5a2c
Change-Id: Id9dd3d7bac99bed36ceb9c906189f1fea78d5a2c
(cherry picked from commit a7587b5a7fdace0d193ad333e6f5cda8b995570b)
We are trying to tighten the APIs. However for this case since the
documentation was not updated, we are allowing NOT_SUPPORTED for
now and will be cleaned up in a later release.
Test: run vts -m VtsHalRadioV1_2Target
Bug: 110118713
Merged-In: Id9dd3d7bac99bed36ceb9c906189f1fea78d5a2c
Change-Id: Id9dd3d7bac99bed36ceb9c906189f1fea78d5a2c
(cherry picked from commit a7587b5a7fdace0d193ad333e6f5cda8b995570b)
Secure_element: vts: Modify openBasicChannel as per OMAPI standard
CHANNEL_NOT_AVAILABLE should be returned when opening basic channel
is not permitted on the secure element
Test: Test with SIM1 HAL
Bug: 110945797
Merged-In: I2dd4eafaf4c534b49a37690a9baadcc5ac93190c
Change-Id: I2dd4eafaf4c534b49a37690a9baadcc5ac93190c
(cherry picked from commit ec5aa6af4d8b330af6c8599830942e29294aa688)
CHANNEL_NOT_AVAILABLE should be returned when opening basic channel
is not permitted on the secure element
Test: Test with SIM1 HAL
Bug: 110945797
Merged-In: I2dd4eafaf4c534b49a37690a9baadcc5ac93190c
Change-Id: I2dd4eafaf4c534b49a37690a9baadcc5ac93190c
(cherry picked from commit ec5aa6af4d8b330af6c8599830942e29294aa688)
Change ImportWrappedKeyTest back to SHA1
Change I5f877b2a1ac66026a876e145416ba078d486e4b5 inadvertently changed
the digest used for ImportWrappedKey, breaking the test. This CL
reverts that portion of the change.
Test: VtsHalKeymasterV4_0TargetTest
Bug: 112279922
Merged-In: Ib8e2e7793ba46ae0d29d8407bb730a35bdb5ea98
Change-Id: Ib8e2e7793ba46ae0d29d8407bb730a35bdb5ea98
(cherry picked from commit 0dba88861267b2b37355b41504b9d1e0d89bbe0f)
Change I5f877b2a1ac66026a876e145416ba078d486e4b5 inadvertently changed
the digest used for ImportWrappedKey, breaking the test. This CL
reverts that portion of the change.
Test: VtsHalKeymasterV4_0TargetTest
Bug: 112279922
Merged-In: Ib8e2e7793ba46ae0d29d8407bb730a35bdb5ea98
Change-Id: Ib8e2e7793ba46ae0d29d8407bb730a35bdb5ea98
(cherry picked from commit 0dba88861267b2b37355b41504b9d1e0d89bbe0f)
Require keymaster4 attestations to contain the right version.
Note that devices with KM4 will fail to pass VTS after this
lands, until the fix from Qualcomm arrives.
Test: VtsHalKeymasterV4_0TargetTest
Bug: 112040197
Merged-In: Ie2cd917af704b9f19de3537297b3a7e4f0c861e9
Change-Id: Ie2cd917af704b9f19de3537297b3a7e4f0c861e9
(cherry picked from commit 4e006c2b92be6ac71927b975b6725ddadf0b3342)
Note that devices with KM4 will fail to pass VTS after this
lands, until the fix from Qualcomm arrives.
Test: VtsHalKeymasterV4_0TargetTest
Bug: 112040197
Merged-In: Ie2cd917af704b9f19de3537297b3a7e4f0c861e9
Change-Id: Ie2cd917af704b9f19de3537297b3a7e4f0c861e9
(cherry picked from commit 4e006c2b92be6ac71927b975b6725ddadf0b3342)
keymaster: skip SHA2 digest tests for strongbox
Strongbox is not required to support SHA-2 digests,
so skip the related tests.
Bug: 109771020
Merged-In: I5f877b2a1ac66026a876e145416ba078d486e4b5
Change-Id: I5f877b2a1ac66026a876e145416ba078d486e4b5
(cherry picked from commit 8cec80be1fc3d2d30fe095fa009dfa83cb7651ce)
Strongbox is not required to support SHA-2 digests,
so skip the related tests.
Bug: 109771020
Merged-In: I5f877b2a1ac66026a876e145416ba078d486e4b5
Change-Id: I5f877b2a1ac66026a876e145416ba078d486e4b5
(cherry picked from commit 8cec80be1fc3d2d30fe095fa009dfa83cb7651ce)
keymaster: spec does not require that update produce output
Remove out of spec enforcement on the amount of data returned
by update, as this is not specified in the HAL.
Bug: 109771020
Test: yes it is
Merged-In: Ic41afbd01d51faf48d3c0fe090409ebcd257cc1e
Change-Id: Ic41afbd01d51faf48d3c0fe090409ebcd257cc1e
(cherry picked from commit 7b75f015a7a7ebc40722fd4f36c9ca70e7e58e59)
Remove out of spec enforcement on the amount of data returned
by update, as this is not specified in the HAL.
Bug: 109771020
Test: yes it is
Merged-In: Ic41afbd01d51faf48d3c0fe090409ebcd257cc1e
Change-Id: Ic41afbd01d51faf48d3c0fe090409ebcd257cc1e
(cherry picked from commit 7b75f015a7a7ebc40722fd4f36c9ca70e7e58e59)
Fix attestation test.
Bug: 77588764
Test: VtsHalKeymasterV4_0TargetTest
Merged-In: Ibe264d08ae7b3333a6949761a92759f5305b3fcb
Change-Id: Ibe264d08ae7b3333a6949761a92759f5305b3fcb
(cherry picked from commit d898d0a4223df75225cfdf23e6f184166933cdb3)
Bug: 77588764
Test: VtsHalKeymasterV4_0TargetTest
Merged-In: Ibe264d08ae7b3333a6949761a92759f5305b3fcb
Change-Id: Ibe264d08ae7b3333a6949761a92759f5305b3fcb
(cherry picked from commit d898d0a4223df75225cfdf23e6f184166933cdb3)
[automerger skipped] Merge changes Ia3b96e83,I80d924cc into pie-vts-dev
am: 0b1461687f -s ours
Change-Id: I8a2912ea0ea9fc396f3d6513db7c466f5cdec0c5
am: 0b1461687f -s ours
Change-Id: I8a2912ea0ea9fc396f3d6513db7c466f5cdec0c5
Fixing Keymaster documentation.
Keymaster HAL documentation documents the bootPatchLevel as having
tag 718, while types.hal indicates the tag value for it is actually
719.
Test: N/A
Bug: 78104779
Merged-In: I0dde0b3c863081f2594e20466d8e82866a5f2d2e
Change-Id: I0dde0b3c863081f2594e20466d8e82866a5f2d2e
(cherry picked from commit ae8da1b70ad563edb79f4f7429b704b54c1a9e19)
Keymaster HAL documentation documents the bootPatchLevel as having
tag 718, while types.hal indicates the tag value for it is actually
719.
Test: N/A
Bug: 78104779
Merged-In: I0dde0b3c863081f2594e20466d8e82866a5f2d2e
Change-Id: I0dde0b3c863081f2594e20466d8e82866a5f2d2e
(cherry picked from commit ae8da1b70ad563edb79f4f7429b704b54c1a9e19)
Merge changes Ia3b96e83,I80d924cc into pie-vts-dev
* changes:
Add REQUEST_NOT_SUPPORTED for pin and pin2 Icc VTS
Add SIM_PUK2 for Icc VTS tests
* changes:
Add REQUEST_NOT_SUPPORTED for pin and pin2 Icc VTS
Add SIM_PUK2 for Icc VTS tests
Improve VTS GNSS 1.1 reliability.
am: 2d86da7b28
Change-Id: I401190490a49bdf529d5fd697216cdf5b051729d
am: 2d86da7b28
Change-Id: I401190490a49bdf529d5fd697216cdf5b051729d
Delete time/position in InjectDelete instead of Delete_all
am: 66fb7a1b88
Change-Id: I6651f1f2e181ad2022ae2cdc6b9f6c1d4a4d0d06
am: 66fb7a1b88
Change-Id: I6651f1f2e181ad2022ae2cdc6b9f6c1d4a4d0d06
Inject last location in InjectBestLocation VTS test
am: 75b0c4bba2
Change-Id: I934dd9ac9a49d1813f10f6d2f31739c3a6a6babf
am: 75b0c4bba2
Change-Id: I934dd9ac9a49d1813f10f6d2f31739c3a6a6babf
Improve VTS GNSS 1.1 reliability.
Allow VTS test for low power mode to handle
certain vendor issues that supply one extra location
at the start of low power mode.
Allow more time for GNSS first fix, and warmup as
needed given limited VTS access to AGPS.
Bug: 110626730
Bug: 110987651
Test: (TODO) Passes on device.
Merged-In: Ieeefd7fcd45890b03dffbbee965e1d9b17805c4c
Change-Id: Ieeefd7fcd45890b03dffbbee965e1d9b17805c4c
(cherry picked from commit 5ea5dda2c33f9d2f1db77d6b4493f0eb356c2937)
Allow VTS test for low power mode to handle
certain vendor issues that supply one extra location
at the start of low power mode.
Allow more time for GNSS first fix, and warmup as
needed given limited VTS access to AGPS.
Bug: 110626730
Bug: 110987651
Test: (TODO) Passes on device.
Merged-In: Ieeefd7fcd45890b03dffbbee965e1d9b17805c4c
Change-Id: Ieeefd7fcd45890b03dffbbee965e1d9b17805c4c
(cherry picked from commit 5ea5dda2c33f9d2f1db77d6b4493f0eb356c2937)
Delete time/position in InjectDelete instead of Delete_all
- DELETE_ALL will delete XTRA.
Bug: 110626730
Test: run VTS test on device.
Merged-In: I4f01430f24f92238193d3de6b6fbb31e81e9f006
Change-Id: I4f01430f24f92238193d3de6b6fbb31e81e9f006
(cherry picked from commit 84cff99b2fcae8757704b0384552aebe290165ed)
- DELETE_ALL will delete XTRA.
Bug: 110626730
Test: run VTS test on device.
Merged-In: I4f01430f24f92238193d3de6b6fbb31e81e9f006
Change-Id: I4f01430f24f92238193d3de6b6fbb31e81e9f006
(cherry picked from commit 84cff99b2fcae8757704b0384552aebe290165ed)
Inject last location in InjectBestLocation VTS test
Bug: 110626730
Test: run VTS on device.
Merged-In: I6f57dd7f9164dacf011f25412e55fcd22821aca0
Change-Id: I6f57dd7f9164dacf011f25412e55fcd22821aca0
(cherry picked from commit bb372e5984a612cb6972e837662d64a90785fbd8)
Bug: 110626730
Test: run VTS on device.
Merged-In: I6f57dd7f9164dacf011f25412e55fcd22821aca0
Change-Id: I6f57dd7f9164dacf011f25412e55fcd22821aca0
(cherry picked from commit bb372e5984a612cb6972e837662d64a90785fbd8)
Merge "Tolerate 1 sv status in GNSS blacklist VTS test" into pie-vts-dev
am: a9ad41d1ad
Change-Id: I0bce1b24e7472bebd96614bc502a863bca020e8f
am: a9ad41d1ad
Change-Id: I0bce1b24e7472bebd96614bc502a863bca020e8f
Merge "VTS: Do not require XML for Audio effect V2" into pie-vts-dev
am: 5e6dd1288e
Change-Id: If389674923030e041dfdb95cd99cd0316603c917
am: 5e6dd1288e
Change-Id: If389674923030e041dfdb95cd99cd0316603c917
Merge "Camera: Don't hold 'mLock' when closing the camera session" into pie-vts-dev
am: 75ceb36b27
Change-Id: I3b3d8c2051dd89b0993bd17af77a6a19cd7792b6
am: 75ceb36b27
Change-Id: I3b3d8c2051dd89b0993bd17af77a6a19cd7792b6
Merge "Tolerate 1 sv status in GNSS blacklist VTS test" into pie-vts-dev
Merge "VTS: Do not require XML for Audio effect V2" into pie-vts-dev
Merge "Camera: Don't hold 'mLock' when closing the camera session" into pie-vts-dev
Merge "Audio VTS was testing wrong uninitialized variable due to typo" into pie-vts-dev
am: b3e86d489a
Change-Id: I13b546ec0e8785040e4096a7658474f2eff6c90e
am: b3e86d489a
Change-Id: I13b546ec0e8785040e4096a7658474f2eff6c90e
Add VTS test to verify scheduling capability
am: 2910e64d24
Change-Id: Ife2f3b299e9c3762d5aad18007b28e62da4fe20f
am: 2910e64d24
Change-Id: Ife2f3b299e9c3762d5aad18007b28e62da4fe20f
[automerger skipped] Add setIndicationFilter response notification in 1.2 VTS
am: 388883a3ec -s ours
Change-Id: Iddbbd11134cc9c05320cec945d513126e6662641
am: 388883a3ec -s ours
Change-Id: Iddbbd11134cc9c05320cec945d513126e6662641
Merge "Audio VTS was testing wrong uninitialized variable due to typo" into pie-vts-dev
Camera: support torch control on external camera
Claim torch API support though there is no device
actually has a flash unit. This is to workaround
an issue in camera service where it falls back
to legacy camera HAL1 control if the device does
not report torch API support (and external camera
HAL does not implement HAL1)
Test: CtsVerifier FlashLight test
Bug: 113336515
Change-Id: I945b35fecfed3b2698b1e9bb1d8faad8699258d2
Claim torch API support though there is no device
actually has a flash unit. This is to workaround
an issue in camera service where it falls back
to legacy camera HAL1 control if the device does
not report torch API support (and external camera
HAL does not implement HAL1)
Test: CtsVerifier FlashLight test
Bug: 113336515
Change-Id: I945b35fecfed3b2698b1e9bb1d8faad8699258d2
Tolerate 1 sv status in GNSS blacklist VTS test
Bug: 110969497
Test: run VTS test on device.
Merged-In: I26345bb62513da8530cb48672e5f59a915817cb4
Change-Id: I26345bb62513da8530cb48672e5f59a915817cb4
(cherry picked from commit 91cc8f4832882e8fa9baa04d717184636a57314d)
Bug: 110969497
Test: run VTS test on device.
Merged-In: I26345bb62513da8530cb48672e5f59a915817cb4
Change-Id: I26345bb62513da8530cb48672e5f59a915817cb4
(cherry picked from commit 91cc8f4832882e8fa9baa04d717184636a57314d)
VTS: Do not require XML for Audio effect V2
In O, the Audio effect V2 HAL allows not to have an audio effect XML
configuration but to use a .conf format.
In P, before this patch, the Audio effect V2 HAL _requires_ to have an
audio effect XML configuration and forbids the use of a .conf format.
This is discouraged by Treble as it means that an unchanged HAL V2
implementation that was compatible with O VTS will not be with P VTS.
As a result, revert to the Oreo behavior for Audio Effect V2 VTS.
Note that the audio effect V4 VTS is not changed by this patch and
still requires an audio effect XML configuration.
Aka device _updating_ to P will not have to upgrade to XML but new
devices lunching on P are still required to have an audio effect
XML configuration.
This commit only changes VTS code.
Test: cd hardware/interfaces/audio/effect/
mmm 2.0/vts/functional 4.0/vts/functional && adb sync data
adb push *.0/xml/audio_effects_conf_V*.xsd /data/local/tmp/
adb shell
cd /data/nativetest64
OPS=--gtest_filter=CheckConfig.audioEffectsConfigurationValidation
VtsHalAudioEffectV2_0TargetTest/VtsHalAudioEffectV2_0TargetTest $OPS
VtsHalAudioEffectV4_0TargetTest/VtsHalAudioEffectV4_0TargetTest $OPS
rm /{odm,vendor,system}/etc/audio_effects.xml || true
VtsHalAudioEffectV2_0TargetTest/VtsHalAudioEffectV2_0TargetTest $OPS
! VtsHalAudioEffectV4_0TargetTest/VtsHalAudioEffectV4_0TargetTest $OPS
Bug: 111421676
Change-Id: Ifb15d65ae4aa65759c8ebaa91cbc8c02234030dc
Merged-In: Ifb15d65ae4aa65759c8ebaa91cbc8c02234030dc
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit b41b575475f3c93fe30216b9cdb2db441b92854b)
In O, the Audio effect V2 HAL allows not to have an audio effect XML
configuration but to use a .conf format.
In P, before this patch, the Audio effect V2 HAL _requires_ to have an
audio effect XML configuration and forbids the use of a .conf format.
This is discouraged by Treble as it means that an unchanged HAL V2
implementation that was compatible with O VTS will not be with P VTS.
As a result, revert to the Oreo behavior for Audio Effect V2 VTS.
Note that the audio effect V4 VTS is not changed by this patch and
still requires an audio effect XML configuration.
Aka device _updating_ to P will not have to upgrade to XML but new
devices lunching on P are still required to have an audio effect
XML configuration.
This commit only changes VTS code.
Test: cd hardware/interfaces/audio/effect/
mmm 2.0/vts/functional 4.0/vts/functional && adb sync data
adb push *.0/xml/audio_effects_conf_V*.xsd /data/local/tmp/
adb shell
cd /data/nativetest64
OPS=--gtest_filter=CheckConfig.audioEffectsConfigurationValidation
VtsHalAudioEffectV2_0TargetTest/VtsHalAudioEffectV2_0TargetTest $OPS
VtsHalAudioEffectV4_0TargetTest/VtsHalAudioEffectV4_0TargetTest $OPS
rm /{odm,vendor,system}/etc/audio_effects.xml || true
VtsHalAudioEffectV2_0TargetTest/VtsHalAudioEffectV2_0TargetTest $OPS
! VtsHalAudioEffectV4_0TargetTest/VtsHalAudioEffectV4_0TargetTest $OPS
Bug: 111421676
Change-Id: Ifb15d65ae4aa65759c8ebaa91cbc8c02234030dc
Merged-In: Ifb15d65ae4aa65759c8ebaa91cbc8c02234030dc
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit b41b575475f3c93fe30216b9cdb2db441b92854b)
Camera: Don't hold 'mLock' when closing the camera session
After flushing the camera requests don't try to close the
camera session while still holding 'mLock'. Different Hals
could still try and return additional results which then will
get blocked on 'mLock'. Closing the session could potentially
introduce a deadlock if the Hal implementation waits for any
of the result calls to return.
Bug: 111836165
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: I0f309f435cc76db3f9b6ba500da65a232b014717
Merged-In: I0f309f435cc76db3f9b6ba500da65a232b014717
(cherry picked from commit 8e920568371136b011c79e6c1d15bcb4c047d0a3)
After flushing the camera requests don't try to close the
camera session while still holding 'mLock'. Different Hals
could still try and return additional results which then will
get blocked on 'mLock'. Closing the session could potentially
introduce a deadlock if the Hal implementation waits for any
of the result calls to return.
Bug: 111836165
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: I0f309f435cc76db3f9b6ba500da65a232b014717
Merged-In: I0f309f435cc76db3f9b6ba500da65a232b014717
(cherry picked from commit 8e920568371136b011c79e6c1d15bcb4c047d0a3)
Audio VTS was testing wrong uninitialized variable due to typo
The test was testing a uninitialized variable instead of testing
the result of the tested method.
Bug: 110963314
Test: vts-tradefed run commandAndExit vts --module VtsHalAudioV2_0Target
Merged-In: I9a212eef690ae627fd7f7dbfaf4a0b4047c491b3
Change-Id: I9a212eef690ae627fd7f7dbfaf4a0b4047c491b3
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit 72641e7ad014a011562c3fd16444b919d32aeb63)
The test was testing a uninitialized variable instead of testing
the result of the tested method.
Bug: 110963314
Test: vts-tradefed run commandAndExit vts --module VtsHalAudioV2_0Target
Merged-In: I9a212eef690ae627fd7f7dbfaf4a0b4047c491b3
Change-Id: I9a212eef690ae627fd7f7dbfaf4a0b4047c491b3
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit 72641e7ad014a011562c3fd16444b919d32aeb63)
Add VTS test to verify scheduling capability
2018+ devices must support GNSS capability scheduling
Test results: go/vts-review-bucket/pi-dev/4267645
Bug: 109642198
Test: atest VtsHalGnssV1_0TargetTest
Merged-In: I7394674abca8f8c40ab30403be6b41bbbb279956
Change-Id: I7394674abca8f8c40ab30403be6b41bbbb279956
(cherry picked from commit e3ff41fc12fb7a80ee533e4459035ef4545c174d)
2018+ devices must support GNSS capability scheduling
Test results: go/vts-review-bucket/pi-dev/4267645
Bug: 109642198
Test: atest VtsHalGnssV1_0TargetTest
Merged-In: I7394674abca8f8c40ab30403be6b41bbbb279956
Change-Id: I7394674abca8f8c40ab30403be6b41bbbb279956
(cherry picked from commit e3ff41fc12fb7a80ee533e4459035ef4545c174d)
Add setIndicationFilter response notification in 1.2 VTS
Test: compile
Bug: 109822806
Merged-In: I95102a148a26cab80235cc68ad83143a9bb6eb39
Change-Id: I95102a148a26cab80235cc68ad83143a9bb6eb39
(cherry picked from commit 0ff41b94b30a0db0ce4a6a5b29600ced5853a762)
Test: compile
Bug: 109822806
Merged-In: I95102a148a26cab80235cc68ad83143a9bb6eb39
Change-Id: I95102a148a26cab80235cc68ad83143a9bb6eb39
(cherry picked from commit 0ff41b94b30a0db0ce4a6a5b29600ced5853a762)
[ConfigStore] Clarify hasHDRDisplay spec.
BUG: 111505327
Test: Build, flash and boot
Change-Id: Ie22d4c7b069a918f039a60317a213dc6a7efb205
Merged-In: Ie22d4c7b069a918f039a60317a213dc6a7efb205
BUG: 111505327
Test: Build, flash and boot
Change-Id: Ie22d4c7b069a918f039a60317a213dc6a7efb205
Merged-In: Ie22d4c7b069a918f039a60317a213dc6a7efb205
Add REQUEST_NOT_SUPPORTED for pin and pin2 Icc VTS
Bug: 111222834
Test: sanity
Change-Id: Ia3b96e83d6173c2c80bdbf7763a876883b167af9
Merged-In: Ia3b96e83d6173c2c80bdbf7763a876883b167af9
(cherry picked from commit c0a06f34c88cf9dc017be6178113b35c3c7fc67e)
Bug: 111222834
Test: sanity
Change-Id: Ia3b96e83d6173c2c80bdbf7763a876883b167af9
Merged-In: Ia3b96e83d6173c2c80bdbf7763a876883b167af9
(cherry picked from commit c0a06f34c88cf9dc017be6178113b35c3c7fc67e)
Add SIM_PUK2 for Icc VTS tests
Add SIM_PUK2 for supplyIccPin2ForApp and changeIccPin2ForApp if sim
card is in the puk2 state.
Bug: 111211929
Test: sanity
Change-Id: I80d924cc4a61565887cbd2a65ee5927a42ad656e
Merged-In: I80d924cc4a61565887cbd2a65ee5927a42ad656e
(cherry picked from commit 4ed0a216adc3bc9460d11d302ba53db9707ded44)
Add SIM_PUK2 for supplyIccPin2ForApp and changeIccPin2ForApp if sim
card is in the puk2 state.
Bug: 111211929
Test: sanity
Change-Id: I80d924cc4a61565887cbd2a65ee5927a42ad656e
Merged-In: I80d924cc4a61565887cbd2a65ee5927a42ad656e
(cherry picked from commit 4ed0a216adc3bc9460d11d302ba53db9707ded44)
[automerger skipped] Add docs for setSignalStrengthReportingCriteria
am: dd06d73cab -s ours
Change-Id: Ia23dd5a7f2a354a6ada49458a4497a46cdd9cfff
am: dd06d73cab -s ours
Change-Id: Ia23dd5a7f2a354a6ada49458a4497a46cdd9cfff
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 529d2fffa02451406f013b354fd7c07164f619b1)
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 529d2fffa02451406f013b354fd7c07164f619b1)
Merge "Add back keymaster@4.0 hash." into pie-vts-dev
am: 6a20e646e4
Change-Id: Id5a125e9a6563a71873e9edcc746c36bc8594c87
am: 6a20e646e4
Change-Id: Id5a125e9a6563a71873e9edcc746c36bc8594c87
Merge "Add back keymaster@4.0 hash." into pie-vts-dev
[automerger skipped] resolve merge conflicts of cd02298b46cfb17954555e0f1d324f63085aa204 to oreo-mr1-vts-dev am: 79cea44239 -s ours
am: 46a5d4f73b
Change-Id: Ie798e2e248a6eea4c8a705d3bd8063f054c79205
am: 46a5d4f73b
Change-Id: Ie798e2e248a6eea4c8a705d3bd8063f054c79205
[automerger skipped] resolve merge conflicts of cd02298b46cfb17954555e0f1d324f63085aa204 to oreo-mr1-vts-dev
am: 79cea44239 -s ours
Change-Id: I17d4a58573074b7746a9d35be04414f9227ec47e
am: 79cea44239 -s ours
Change-Id: I17d4a58573074b7746a9d35be04414f9227ec47e
Effect VTS: Allow an effect proxy as pre/post processing am: 0f0328fc4e
am: a3268e954d
Change-Id: Ic9afa418ca68ed98368ab4696c4d3a3e5e8ccbdb
am: a3268e954d
Change-Id: Ic9afa418ca68ed98368ab4696c4d3a3e5e8ccbdb
Merge "Fix base class of WifiHidlEnvironment_1_2" into pie-vts-dev
am: a73a8c9b2b
Change-Id: I18081c95710d4d505991628994df7a9ebbdc99df
am: a73a8c9b2b
Change-Id: I18081c95710d4d505991628994df7a9ebbdc99df
[automerger skipped] Merge "Fix IUsb version number in vts test" into pie-vts-dev
am: 0a55878d1e -s ours
Change-Id: I612a4597b8689a232e75e97a634aa535ca0730a2
am: 0a55878d1e -s ours
Change-Id: I612a4597b8689a232e75e97a634aa535ca0730a2
Effect VTS: Allow an effect proxy as pre/post processing
am: 0f0328fc4e
Change-Id: I570e2a73de01900cf39b5d08cfed370ee17a0e38
am: 0f0328fc4e
Change-Id: I570e2a73de01900cf39b5d08cfed370ee17a0e38
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
(cherry picked from commit ec720564dbdef01d14fcf46c46ea18294440358b)
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
(cherry picked from commit ec720564dbdef01d14fcf46c46ea18294440358b)
Merge "Fix matrix dep on kernel configs"
Merge changes from topic "share-buffer"
* changes:
Audio default HAL: hidl_memory size must be positive
Aaudio: Implement app shareable flag instead of -size hack
* changes:
Audio default HAL: hidl_memory size must be positive
Aaudio: Implement app shareable flag instead of -size hack
Fix matrix dep on kernel configs
Use global instead of rule variables.
Test: make a change in kernel configs, existing out files
are changed.
Change-Id: Ic731356b4533bc10743d3711309ab16de1d3bd78
Use global instead of rule variables.
Test: make a change in kernel configs, existing out files
are changed.
Change-Id: Ic731356b4533bc10743d3711309ab16de1d3bd78
Change ImportWrappedKeyTest back to SHA1
Change I5f877b2a1ac66026a876e145416ba078d486e4b5 inadvertently changed
the digest used for ImportWrappedKey, breaking the test. This CL
reverts that portion of the change.
Test: VtsHalKeymasterV4_0TargetTest
Bug: 112279922
Bug: 80246122
Change-Id: Ib8e2e7793ba46ae0d29d8407bb730a35bdb5ea98
Change I5f877b2a1ac66026a876e145416ba078d486e4b5 inadvertently changed
the digest used for ImportWrappedKey, breaking the test. This CL
reverts that portion of the change.
Test: VtsHalKeymasterV4_0TargetTest
Bug: 112279922
Bug: 80246122
Change-Id: Ib8e2e7793ba46ae0d29d8407bb730a35bdb5ea98
Require KM4 attestations contain the right version
Note that devices with KM4 will fail to pass VTS after this
lands, until the fix from Qualcomm arrives.
Test: VtsHalKeymasterV4_0TargetTest
Bug: 112040197
Bug: 80246122
Change-Id: Ie2cd917af704b9f19de3537297b3a7e4f0c861e9
Note that devices with KM4 will fail to pass VTS after this
lands, until the fix from Qualcomm arrives.
Test: VtsHalKeymasterV4_0TargetTest
Bug: 112040197
Bug: 80246122
Change-Id: Ie2cd917af704b9f19de3537297b3a7e4f0c861e9
keymaster: skip SHA2 digest tests for strongbox
Strongbox is not required to support SHA-2 digests,
so skip the related tests.
Bug: 109771020
Bug: 80246122
Test: This is the test
Change-Id: I5f877b2a1ac66026a876e145416ba078d486e4b5
Strongbox is not required to support SHA-2 digests,
so skip the related tests.
Bug: 109771020
Bug: 80246122
Test: This is the test
Change-Id: I5f877b2a1ac66026a876e145416ba078d486e4b5
keymaster spec doesn't require update to output
Remove out of spec enforcement on the amount of data returned
by update, as this is not specified in the HAL.
Bug: 109771020
Bug: 80246122
Test: yes it is
Change-Id: Ic41afbd01d51faf48d3c0fe090409ebcd257cc1e
Remove out of spec enforcement on the amount of data returned
by update, as this is not specified in the HAL.
Bug: 109771020
Bug: 80246122
Test: yes it is
Change-Id: Ic41afbd01d51faf48d3c0fe090409ebcd257cc1e
Fix attestation test.
Bug: 77588764
Bug: 80246122
Test: VtsHalKeymasterV4_0TargetTest
Change-Id: Ibe264d08ae7b3333a6949761a92759f5305b3fcb
Bug: 77588764
Bug: 80246122
Test: VtsHalKeymasterV4_0TargetTest
Change-Id: Ibe264d08ae7b3333a6949761a92759f5305b3fcb
Merge "Fix base class of WifiHidlEnvironment_1_2" into pie-vts-dev
Merge "Fix IUsb version number in vts test" into pie-vts-dev
Merge pie-vts-dev into master
Bug: 112170540
Merged-In: I48551f5469289b9fcfc47dd9fd2e455779640329
Change-Id: Icd613751ccf1dc8a0f879525f1d65b11dda7d357
Bug: 112170540
Merged-In: I48551f5469289b9fcfc47dd9fd2e455779640329
Change-Id: Icd613751ccf1dc8a0f879525f1d65b11dda7d357
Handle software keymaster implementations.
Test: VtsHalKeymasterV3_0TargetTest
Change-Id: I0ca923fab3e312c576abc2f51f6dd28482176db7
Test: VtsHalKeymasterV3_0TargetTest
Change-Id: I0ca923fab3e312c576abc2f51f6dd28482176db7
Audio default HAL: hidl_memory size must be positive
hidl_memory size is not used on the framework side but is checked by the
hidl framework to be a sensible value.
Due to a hack in O and P, the value can be negative, this leads to
errors in HIDL.
This patch make sure the hidl_memory size is always positive and thus
not affected by the hack.
Test: adb shell data/nativetest64/write_sine/write_sine -pl -m3 -x
Bug: 38118159
Change-Id: Ie53c46c558e8042d74ee32b55219195da82e4bcc
Signed-off-by: Kevin Rocard <krocard@google.com>
hidl_memory size is not used on the framework side but is checked by the
hidl framework to be a sensible value.
Due to a hack in O and P, the value can be negative, this leads to
errors in HIDL.
This patch make sure the hidl_memory size is always positive and thus
not affected by the hack.
Test: adb shell data/nativetest64/write_sine/write_sine -pl -m3 -x
Bug: 38118159
Change-Id: Ie53c46c558e8042d74ee32b55219195da82e4bcc
Signed-off-by: Kevin Rocard <krocard@google.com>
Merge "Patch for setSimCardPower_1_1"
Patch for setSimCardPower_1_1
Do not expect its affect on cardStatus if it is not successfully returned.
Check the response error before updating sim card status.
Test: sanity
Bug: 111661946
Change-Id: I48551f5469289b9fcfc47dd9fd2e455779640329
Merged-In: I48551f5469289b9fcfc47dd9fd2e455779640329
(cherry picked from commit 7e787e192cd4700d8f4e7cc5f55501bc37590245)
Do not expect its affect on cardStatus if it is not successfully returned.
Check the response error before updating sim card status.
Test: sanity
Bug: 111661946
Change-Id: I48551f5469289b9fcfc47dd9fd2e455779640329
Merged-In: I48551f5469289b9fcfc47dd9fd2e455779640329
(cherry picked from commit 7e787e192cd4700d8f4e7cc5f55501bc37590245)