Commit Graph

36350 Commits

Author SHA1 Message Date
Sarah Chin
0d0dc1e23b Merge "Add JavaDerive toString to AIDL classes" am: 3e8c0d8b22
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2048124

Change-Id: I625e9e30d5c7726e0efd92d2fc6368f1bcd50f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 20:42:49 +00:00
Sarah Chin
3e8c0d8b22 Merge "Add JavaDerive toString to AIDL classes" 2022-03-29 20:23:22 +00:00
Sarah Chin
42b57166ab Add JavaDerive toString to AIDL classes
Test: manually verify logcat
Bug: 223230764
Change-Id: If6d459823d3d6ceb0d7c49ba00f01268482128f6
Merged-In: If6d459823d3d6ceb0d7c49ba00f01268482128f6
2022-03-29 11:46:52 -07:00
chasewu
85662b8f9c Fix the maximum frequency value calculation am: 70da3cc0a1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2046280

Change-Id: Ib6600a8795cdd8b66965c3b9e69cdcbc709fa4c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 17:05:25 +00:00
chasewu
adec7116db Fix the default BandwidthAmplitudeMap contant am: d1a57eaac5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2046279

Change-Id: I25a137c2784daf5bc876d85a4779e919f085bc17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 17:05:23 +00:00
chasewu
70da3cc0a1 Fix the maximum frequency value calculation
Fix: 205250672
Test: VtsHalVibratorTargetTest
Signed-off-by: chasewu <chasewu@google.com>
Change-Id: I908ab93eaee17de2af163c0fe3c50feea567ee48
Merged-In: I908ab93eaee17de2af163c0fe3c50feea567ee48
2022-03-29 19:32:42 +08:00
chasewu
d1a57eaac5 Fix the default BandwidthAmplitudeMap contant
Fix: 225286612
Test: atest VtsHalVibratorTargetTest
Signed-off-by: chasewu <chasewu@google.com>
Change-Id: I5c550426b7cbbdf6e4e9ad90d6248b6ed0523399
Merged-In: I5c550426b7cbbdf6e4e9ad90d6248b6ed0523399
2022-03-29 19:25:42 +08:00
Sneh Bansal
b79c500be8 [automerger skipped] VTS: Check for "ro.board.first_api_level" in GetBarringInfo() am: cefd18a941 -s ours am: 96bfaeb66a -s ours
am skip reason: Merged-In I890f54f80ff3aca3dcb2c51f20db087d453c2927 with SHA-1 c338f29b6d is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2042304

Change-Id: Ib08797ea4ffcdf5369ef288a95f21c7e67097fc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 02:13:41 +00:00
Karthik Ramakrishnan
e3edf90200 VtsHalBluetoothV1_0: Turn off/on BT for all users am: 0dc66a2c69 am: 2a4ed0d3a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16810781

Change-Id: I78fe967b0554884688deb8571cbcf218bf664607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 02:13:36 +00:00
Mikhail Naganov
51c26a8a90 [automerger skipped] VTSHalAudio: Increase test timeout for V6 and V7 am: 8a76d40f99 -s ours am: eb1b535fed -s ours
am skip reason: Merged-In Ie233e014f9f3650f58319c4d5f5a836cfdea87ba with SHA-1 57633e5a78 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16712045

Change-Id: Idffee09ee35ae15a945e6a580ffb97db1dbd298e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 02:13:31 +00:00
Shuzhen Wang
6fd49d934f Camera: VTS: Remove GRF MultiCamera for Android 12 am: 2b2846855f am: cd064b9690
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16672946

Change-Id: I28d37f911c752d16abe98bf93e6c7a16f6eaa955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 02:13:25 +00:00
Sneh Bansal
96bfaeb66a [automerger skipped] VTS: Check for "ro.board.first_api_level" in GetBarringInfo() am: cefd18a941 -s ours
am skip reason: Merged-In I890f54f80ff3aca3dcb2c51f20db087d453c2927 with SHA-1 c338f29b6d is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2042304

Change-Id: If7cab87d14cbb6a5e1532641c68ff53121ddfb6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 01:52:13 +00:00
Karthik Ramakrishnan
2a4ed0d3a0 VtsHalBluetoothV1_0: Turn off/on BT for all users am: 0dc66a2c69
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16810781

Change-Id: I8d8483a32fa39a783a159d4269300bbbb88ac3a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 01:52:05 +00:00
Mikhail Naganov
eb1b535fed [automerger skipped] VTSHalAudio: Increase test timeout for V6 and V7 am: 8a76d40f99 -s ours
am skip reason: Merged-In Ie233e014f9f3650f58319c4d5f5a836cfdea87ba with SHA-1 57633e5a78 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16712045

Change-Id: I50a1e016c8d015767b37bf0cff954d86402dace6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 01:51:56 +00:00
Shuzhen Wang
cd064b9690 Camera: VTS: Remove GRF MultiCamera for Android 12 am: 2b2846855f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16672946

Change-Id: Iea2a9cd69855abc1b8428aed23bb5fd219859bf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 01:51:43 +00:00
Treehugger Robot
cc399cf7b0 Merge "Updated the vts attestation tests for strongbox implementations which do not support factory attestation." am: 950b7b8026
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2027803

Change-Id: Ida610cc178c4eea46faca1638bd0e7d02cc36155
2022-03-24 17:04:26 +00:00
Sneh Bansal
cefd18a941 VTS: Check for "ro.board.first_api_level" in GetBarringInfo()
Some GRF targets launched with S release do not support getBarringInfo()
API.

Check "ro.board.first_api_level" also to return from the test-case
when the response is REQUEST_NOT_SUPPORTED.

Bug: 226017947
Bug: 212384410
Merged-In: I890f54f80ff3aca3dcb2c51f20db087d453c2927
Change-Id: I890f54f80ff3aca3dcb2c51f20db087d453c2927
(cherry picked from commit becb08fac0)
(cherry picked from commit abf00a9309)
2022-03-24 16:58:33 +00:00
Treehugger Robot
950b7b8026 Merge "Updated the vts attestation tests for strongbox implementations which do not support factory attestation." 2022-03-24 16:35:47 +00:00
subrahmanyaman
7d9bc46f6f Updated the vts attestation tests for strongbox implementations which
do not support factory attestation.

Bug: b/219962281
Test: Run vts tests.
Change-Id: Ie3f3f33f773227d879e11f11e2ef0eaee33db648
2022-03-23 22:27:05 +00:00
Treehugger Robot
3303e97603 Merge "Fix CDDL for signatures." am: 1edd38d6ee
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2036743

Change-Id: Id2271575300572e8b0564c812d45773f38460798
2022-03-22 17:03:31 +00:00
Treehugger Robot
1edd38d6ee Merge "Fix CDDL for signatures." 2022-03-22 16:50:39 +00:00
Alan Stokes
ba9f55ee69 Fix CDDL for signatures.
The signature is not CBOR-encoded, it's the raw bytes of the signature
encoded as specified for the specific algorithm.

I've made the references to PureEd25519() / ECDSA() into comments,
since I believe they're not actually legal CDDL but are aimed at
humans. And I've made the two occurrences consistent with each other.

Test: N/A
Change-Id: Ia42362ff3d0ce5458322663256cbd34d258afe76
2022-03-22 15:23:13 +00:00
David Drysdale
1f0d75f1f8 Merge "KeyMint VTS: strict test only for v2+" am: d057fc0cb6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2033925

Change-Id: I18f6f997439f31ea4d2a95deffe318d07f9048b9
2022-03-22 09:50:54 +00:00
David Drysdale
bbbc278300 Merge "KeyMint HAL: clarify ATTEST_KEY is like SIGN" am: afa73442b7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2033928

Change-Id: I2519c3a8525d4196b8a3969d6bdb0a0d73df3f8d
2022-03-22 09:50:14 +00:00
David Drysdale
d057fc0cb6 Merge "KeyMint VTS: strict test only for v2+" 2022-03-22 09:28:52 +00:00
David Drysdale
afa73442b7 Merge "KeyMint HAL: clarify ATTEST_KEY is like SIGN" 2022-03-22 09:26:41 +00:00
Sarah Chin
9257a65735 Merge "Enable IRadio AIDL VTS tests" am: 1b51643add
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2032264

Change-Id: I17f6aae46cd3a5687b938009a6060abd29c5ecc2
2022-03-21 18:10:36 +00:00
Sarah Chin
1b51643add Merge "Enable IRadio AIDL VTS tests" 2022-03-21 17:55:44 +00:00
David Drysdale
bcb2f73475 KeyMint HAL: clarify ATTEST_KEY is like SIGN
Bug: 221280929
Test: None, comment change only (already assumed by VTS tests)
Change-Id: Ifc077c6ce1a89164b0d7c70c6e3353d941eee670
2022-03-21 17:14:59 +00:00
Max Bires
8daddefc18 Merge "More canonicalization checks and canonicalize before signing" am: cf02e97946
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2029343

Change-Id: Iab4fc8bfc9737bfdb1dfd23dfbadd38ac2fd6a5a
2022-03-21 16:44:04 +00:00
Max Bires
cf02e97946 Merge "More canonicalization checks and canonicalize before signing" 2022-03-21 16:33:20 +00:00
Sarah Chin
a6dcde47d3 Fix AIDL VTS setup am: eaf2660625
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2032528

Change-Id: Ic05cf2551212388a6f572874627cfc6695175393
2022-03-21 16:26:20 +00:00
David Drysdale
50a66b8f79 KeyMint VTS: strict test only for v2+
Bug: 223537775
Bug: 197096139
Test: VtsAidlKeyMintTargetTest
Change-Id: Ib77d52e4a91233c936b3a44f5eac71f53b2af450
2022-03-21 15:29:00 +00:00
Max Bires
e74f0bc950 More canonicalization checks and canonicalize before signing
This change makes sure the DeviceInfo CBOR map is canonicalized before
the signature check instead of just separately checking the
canonicalization in a separate call. Additionally, some ASSERTs have
been changed to EXPECTs in validation of the DeviceInfo map more
generally, where it makes sense to avoid failing immediately.

Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I69806c887656772ea6b5e2e3f0af50957e6b05e3
2022-03-21 05:19:15 +00:00
Sarah Chin
eaf2660625 Fix AIDL VTS setup
Setup code was causing all tests to be ignored on devices with AIDL HAL.
Fix the setup code and increase GTEST timeout to prevent the test suite
from crashing.

Test: atest VtsHalRadioTargetTest
Bug: 225032427
Change-Id: Ice60f7fae313863e97e425994bee5ad1d703c807
Merged-In: Ice60f7fae313863e97e425994bee5ad1d703c807
2022-03-20 19:56:26 -07:00
Sarah Chin
a1ae953b4e Merge "Update compatibility matrices for IRadio AIDL" am: 2983842651
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2032266

Change-Id: Ia06cae6174194fa293c0addbd32c59b90741b2ec
2022-03-18 21:40:31 +00:00
Sarah Chin
2983842651 Merge "Update compatibility matrices for IRadio AIDL" 2022-03-18 21:22:13 +00:00
Sarah Chin
9101327a27 Update compatibility matrices for IRadio AIDL
Test: build
Bug: 205355625
Change-Id: I5fb37f2e05a1b6697eb27e1f3340c7d6b3f409b5
Merged-In: I5fb37f2e05a1b6697eb27e1f3340c7d6b3f409b5
2022-03-18 13:10:45 -07:00
Tri Vo
39f920bae3 Merge "KeyMint VTS: Expect empty key if boot state unverfied" am: a26f8cb316
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2014678

Change-Id: Ib537d307ffe6e764cc0737c8fab0b8944808f4ef
2022-03-18 18:30:36 +00:00
Sarah Chin
e555400a9d Enable IRadio AIDL VTS tests
Fix failing SIM tests so test suite can be enabled

Test: atest VtsHalRadioTargetTest passes
Bug: 217574863
Change-Id: Id7ac87ca6da799df4af983cd295a4234e75565d2
Merged-In: Id7ac87ca6da799df4af983cd295a4234e75565d2
2022-03-18 11:28:40 -07:00
Tri Vo
a26f8cb316 Merge "KeyMint VTS: Expect empty key if boot state unverfied" 2022-03-18 18:14:31 +00:00
Gary Jian
96d037bf93 Merge "Fix type conversion from aidl::AccessNetworks to hidl::RadioAccessNetworks" am: b9fbe11dfe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2026284

Change-Id: I87a3ac1796b0ee80643571bad46108643a655478
2022-03-18 04:09:55 +00:00
Gary Jian
b9fbe11dfe Merge "Fix type conversion from aidl::AccessNetworks to hidl::RadioAccessNetworks" 2022-03-18 03:51:42 +00:00
Gary Jian
b611de7c3a Fix type conversion from aidl::AccessNetworks to hidl::RadioAccessNetworks
aidl::AccessNetworks and hidl::RadioAccessNetworks has a different enum

Bug: 223770908
Test: manual
Change-Id: Idd20d77c0090567a4e88334061ecd44415500000
2022-03-17 10:48:30 +08:00
Janis Danisevskis
0b05aae7dc Merge changes from topic "default_dice_hal" am: 49a1688f5e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1896435

Change-Id: I7f49feb6649e95aee8365fc84a7159246576a43a
2022-03-16 20:42:14 +00:00
Janis Danisevskis
49a1688f5e Merge changes from topic "default_dice_hal"
* changes:
  Dice HAL: Add VTS Test.
  Dice HAL: Added default implementation.
2022-03-16 20:16:15 +00:00
David Drysdale
0918368cf8 Merge "Revert "KeyMint VTS: add TEST_MAPPING"" am: 83e3bffe66
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2028363

Change-Id: Ibb0b9575a5c863ce7c206d7bb187a8a207e493ee
2022-03-16 12:06:27 +00:00
David Drysdale
83e3bffe66 Merge "Revert "KeyMint VTS: add TEST_MAPPING"" 2022-03-16 11:43:55 +00:00
David Drysdale
6288f4bbb9 Revert "KeyMint VTS: add TEST_MAPPING"
This reverts commit 7e71fcf852.

Reason for revert: failing tests on git_master on aosp_x86_64-userdebug

Bug: 224951152
Bug: 224951969
Bug: 224950581
Change-Id: I86ae5e8d73cefd6d9d923138384cf98ec80a42df
2022-03-16 11:34:44 +00:00
David Drysdale
4c1b6dfb23 Merge "KeyMint VTS: add TEST_MAPPING" am: 7f366ab5dd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1879916

Change-Id: I067aebeff0f1c730594812af451a7d24ea7b3b22
2022-03-16 07:17:22 +00:00