Commit graph

36286 commits

Author SHA1 Message Date
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
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
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
7f366ab5dd Merge "KeyMint VTS: add TEST_MAPPING" 2022-03-16 06:49:19 +00:00
Janis Danisevskis
21244fc192 Dice HAL: Add VTS Test.
This CL adds a VTS test for the DICE HAL, and a test specific for
demotion testing. Demotion testing leaves the device in a permanently
modified state untill the next reboot, which is why it needs a special
test config. The current test config restarts the device before testing,
in a followup the device also has to reboot after the test.

Bug: 198197213
Test: atest VtsAidlDiceTargetTest
      atest VtsAidlDiceDemoteTargetTest
Change-Id: I4278a1352df749da50dc8e5d118fc37336026061
2022-03-15 12:39:22 -07:00
Chen Chen
8673f8c28f Merge "SpatialAudio: fix crashes in BluetoothAudioSession" 2022-03-15 17:32:37 +00:00
Steven Moreland
5ceed8997b Merge "Fuzzer for default vibrator service." 2022-03-15 16:02:35 +00:00
David Drysdale
ceedbb0d1a Merge "Prevent test crashes if device sets invalid curve" 2022-03-15 07:35:02 +00:00
Steven Moreland
2e96b9dce1 Fuzzer for default vibrator service.
As an example for a fuzzer of an AIDL service.

Bug: 224646709
Test: run fuzzer for a few minutes (doesn't get very
    deep in the fuzzer - will follow-up with a dictionary
    or a corpus if the fuzzer can't get past the header
    and interface token)
Change-Id: Iac02a1f02500a0098d67823ac22de1706778927b
2022-03-15 01:48:16 +00:00
Chen Chen
3b46c05d95 SpatialAudio: fix crashes in BluetoothAudioSession
Bug: 224578221
Bug: 214615268
Test: build
Change-Id: I0fd7e0887200e39dc996b0d84de421ec13897e94
2022-03-14 18:04:27 -07:00
Mikhail Naganov
f325a1756c Merge "audio: Add OWNERS to aidl folder" 2022-03-15 00:18:17 +00:00
Mikhail Naganov
b62f1ebb19 audio: Add OWNERS to aidl folder
Bug: 205884982
Test: N/A
Change-Id: I9f49d2a9c670c7bbf45dd00d262eff6d445679ea
2022-03-14 22:10:48 +00:00
Tom Pratt
9d268857c8 Add vintf fragment for default broadcastradio
Bug: b/145694104
Test: Build and boot emulator locally. Observe
that CarRadio app shows static data provided by
default broadcast radio.

Change-Id: Ia70e8a040cb281f3d0e8fc7f3a8dd25bcd6d09bd
Merged-In: Ia70e8a040cb281f3d0e8fc7f3a8dd25bcd6d09bd
2022-03-14 21:46:12 +00:00
David Drysdale
d3e783be43 Merge "Add OWNER for keymaster VTS" 2022-03-14 16:04:31 +00:00
David Drysdale
e5c2bf01fc Merge "Key{Mint,Master} VTS: fix incremental AES tags" 2022-03-14 15:45:28 +00:00
David Drysdale
f06d5d3978 Add OWNER for keymaster VTS
Test: TreeHugger
Change-Id: I2ff243a2cadbfcc9bedf634f9a9327b2fa8ccd63
2022-03-14 14:28:27 +00:00
David Drysdale
1a637199e4 Key{Mint,Master} VTS: fix incremental AES tags
Change Id62fdce65131ee00c88e5849955a937f1c171748 split up the AES
incremental encryption tests into individual tests for each encryption
mode.  This meant that each generated key is only valid for a single
mode, which in turn means that for non-GCM mode keys it is not valid
to specify MIN_MAC_LENGTH.

Bug: 223934835
Test: VtsAidlKeyMintTargetTest
Change-Id: I38f34f60116bde3d23f203365d62e5b25d7b254b
2022-03-14 09:23:29 +00:00
Treehugger Robot
3192a09b11 Merge "remote_prov_utils: Add instance name in the JSON output" 2022-03-11 12:48:19 +00:00
Eran Messeri
7fc756ee1a Merge "Update the default KeyMint version" 2022-03-10 23:23:45 +00:00
Treehugger Robot
83e8d8178a Merge "Update VtsHalEvsV1_1TargetTest" 2022-03-10 21:35:22 +00:00
Treehugger Robot
1f6ecfbab0 Merge "Update VtsHalEvsV1_*TargetTest" 2022-03-10 21:34:55 +00:00
Janis Danisevskis
86124738cd Dice HAL: Added default implementation.
Test: ... one ...
Bug: 198197213
Change-Id: If855e2a4a0150d80e7cecce0a078cdeca00bdb50
2022-03-10 12:23:59 -08:00
Eran Messeri
bf89c797d0 Update the default KeyMint version
As the current KeyMint version is 2 (200), reflect that in the default
XML.

Devices that ship with older KeyMint/KeyMaster version should override
the default android.hardware.hardware_keystore.xml file with the
version they support.

Test: android.keystore.cts.KeyAttestationTest#testAttestationKmVersionMatchesFeatureVersion
Bug: 222406513
Bug: 216543583
Change-Id: I6f2229019929cff747cec3907fc2a9b8ebebdcf4
2022-03-10 19:16:39 +00:00
David Drysdale
08696a7543 Prevent test crashes if device sets invalid curve
Test: VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: Ib623b3dcdd5a496b34314c1e0d1a310c8beeb18d
2022-03-10 10:54:37 +00:00
Tommy Chiu
cb7d3d0759 remote_prov_utils: Add instance name in the JSON output
Bug: 223509807
Test: libkeymint_remote_prov_support_test
Change-Id: I45d2ee46f6fe3c8a7da55c7cc0b04fc007ddea43
2022-03-10 12:17:39 +08:00
Treehugger Robot
5ee0d1534e Merge "Add ApnType.ENTERPRISE" 2022-03-09 17:17:40 +00:00
Treehugger Robot
26423c74aa Merge "SpatialAudio: Export LatencyMode functions to BluetoothAudioSession" 2022-03-08 17:57:24 +00:00
David Drysdale
1585fdceb5 KeyMint VTS: check for relevant devices
Don't run tests if the appropriate KeyMint device is not available (e.g.
on something that only has Keymaster).  Move to use GTEST_SKIP
consistently.

Bug: 221909227
Test: VtsAidlKeyMintTargetTest
Change-Id: I5dab238519e57e6752b795f3a983681cf4337bdd
2022-03-08 08:07:02 +00:00
Cheney Ni
6ecbc76603 SpatialAudio: Export LatencyMode functions to BluetoothAudioSession
BluetoothAudioSession utility supports latency control functions, so
audio_bluetooth_hw can get / set the LatencyMode easily.

Bug: 214615268
Bug: 218708371
Test: build
Tag: #feature
Change-Id: Ia85581c74fc91f406309539755d60d36c173f5e0
2022-03-08 11:55:41 +08:00
Xin Li
cbc6a3305e Merge Android 12L
Bug: 222710654
Merged-In: Ib7ed106fb09dcfa246bd0a31515fbbb358259de0
Change-Id: Ifb4059c9c03a8a1ff6a1efd952dd088f0e5a8a9d
2022-03-08 00:18:37 +00:00
Treehugger Robot
bfdd991c76 Merge "Split AESincremental VTS test into 4 Tests(For blockmodes-ECB,CBC,GCM,CTR)" am: 90019d46c2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2007030

Change-Id: Ib7ed106fb09dcfa246bd0a31515fbbb358259de0
2022-03-04 18:07:02 +00:00
Treehugger Robot
90019d46c2 Merge "Split AESincremental VTS test into 4 Tests(For blockmodes-ECB,CBC,GCM,CTR)" 2022-03-04 17:39:57 +00:00
Treehugger Robot
1421c4a7ef Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" am: 509a0223c1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2007830

Change-Id: I765a7a945896e8e9eaf74412a13c7498f5c84e78
2022-03-04 01:54:36 +00:00
Treehugger Robot
509a0223c1 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" 2022-03-04 01:29:05 +00:00
Michael Butler
c7d8c19823 Merge "Make NN canonical->HIDL adapter execute* methods synchronous" am: f955569c8a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2005130

Change-Id: Icff3acb7b47cc84518222e9f37b7515d6783cb73
2022-03-04 01:01:09 +00:00
Michael Butler
f955569c8a Merge "Make NN canonical->HIDL adapter execute* methods synchronous" 2022-03-04 00:41:10 +00:00
Bob Badour
8fbe33dfbe [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  automotive/can/1.0/default/tests/fuzzer/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: Id04cc3a1ae434664be40944cc86c8ffc2e19db24
2022-03-03 10:37:24 -08:00
anil.hiranniah
19a4ca17ea Split AESincremental VTS test into 4 Tests(For blockmodes-ECB,CBC,GCM,CTR)
Change mentioned above is done in VTS for Keymaster4.0
and Keymint

Test: VTS tests with tradefed
Change-Id: Id62fdce65131ee00c88e5849955a937f1c171748
2022-03-03 18:02:04 +05:30
Yifan Hong
577ea5663a Merge "health: batterymonitor uses AIDL HealthInfo." am: e9cb1bedfd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2004612

Change-Id: Ic95ccd4d9740774ad9d76491329b61b609874c4a
2022-03-02 19:41:59 +00:00
Yifan Hong
e9cb1bedfd Merge "health: batterymonitor uses AIDL HealthInfo." 2022-03-02 19:20:31 +00:00
Cory Barker
96c8da665f Merge "Added automotiveCanV1.0_fuzzer" am: 20b69d76d0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1991533

Change-Id: Iccc4e6a9349cc2fc865dfdbd608462673318e964
2022-03-02 18:46:12 +00:00
Cory Barker
20b69d76d0 Merge "Added automotiveCanV1.0_fuzzer" 2022-03-02 18:22:12 +00:00
Treehugger Robot
3b6c35b95e Merge "Support for P256 curve in RKP for Strongbox Test: Run Rkp Vts tests." am: 55419fd935
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1969799

Change-Id: I8e1f6d577c20c1c583fb92b351c947479142dc7a
2022-03-02 12:09:43 +00:00
Treehugger Robot
55419fd935 Merge "Support for P256 curve in RKP for Strongbox Test: Run Rkp Vts tests." 2022-03-02 11:45:05 +00:00
Michael Butler
d65dc06ddc Make NN canonical->HIDL adapter execute* methods synchronous
This change alters the asynchronous execute* methods to be handled
synchronously (from the same thread) for three reasons:
1) To remove the need to use IPreparedModel::getUnderlyingResource
2) To simplify the code
3) To make the code more performant

Bug: N/A
Test: mma
Test: presubmit
Change-Id: I2c37deb03d1b1c34b0173bd741e55fce4de757f7
2022-03-01 16:16:26 -08:00
Yifan Hong
bc84a7903a health: batterymonitor uses AIDL HealthInfo.
As a side effect, chargerDockOnline is properly set.

Test: TH
Bug: 222120465
Change-Id: I660e8ac0d1897ce30e3ae5d4f402a0b9ccac3c5c
2022-03-01 12:27:13 -08:00
David Drysdale
7e71fcf852 KeyMint VTS: add TEST_MAPPING
Test: TreeHugger
Change-Id: If4e19f189a3cd58e143672a562837365d78da69d
2022-03-01 16:41:52 +00:00
David Drysdale
85ce9e2530 KeyMint VTS: fix fixture setup name am: 795f758780
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2003891

Change-Id: I556e90e4e9551fb365cad11263a966157fdff92b
2022-03-01 16:10:01 +00:00