Commit Graph

31858 Commits

Author SHA1 Message Date
Steven Moreland
86a518cfa6 freeze compat matrix 6 for Android S
The current matrix is left in this same CL because this way, downstream
modifications to the current CL will automatically get absorbed into the
level 7 compatibility matrix. A CL on top of this will disable the 7
matrix and then get reverted in the aosp/master..goog/master merge
path.

Bug: 178221726
Test: boot device, vts_treble_vintf_vendor_test
Test: inspect matrix by diffing matrix with old matrix using:
    m analyze_matrix &&
    system/libvintf/analyze_matrix/hals_for_release.py
Change-Id: Id83986fc5089eefc2292f0042753f739f4e01a44
2021-05-20 23:51:38 +00:00
TreeHugger Robot
e325f3b14e Merge "Fix a bug in reusable burst execution." into sc-dev 2021-05-19 05:25:48 +00:00
TreeHugger Robot
f537517778 Merge "Detach thread so stop_measurement doesn't block" into sc-dev 2021-05-19 02:38:09 +00:00
TreeHugger Robot
827e807060 Merge "Camera: Correct partial result entry count query" into sc-dev 2021-05-19 00:30:38 +00:00
Xusong Wang
2082b871ab Fix a bug in reusable burst execution.
The reusable burst execution incorrectly holds a reference to memory
identifier tokens.

Bug: 188568523
Test: NNT_static and inspect logcat
Change-Id: Ic8fb8be12bf579a316e7df8480ab3ccdc5c0e635
2021-05-18 21:05:06 +00:00
TreeHugger Robot
bb2b88ae7f Merge changes I10c4beea,I0efc30f3 into sc-dev
* changes:
  KeyMint VTS: local RSA encryption
  KeyMint VTS: local asymmetric verification
2021-05-18 13:58:16 +00:00
Hao Chen
cb806689ee Merge "Vehicle HAL client reads the config from the server instead of DefaultConfigs.h" into sc-dev 2021-05-17 20:55:27 +00:00
TreeHugger Robot
e4e3e89d7d Merge "KeyMint HAL: cert dates are in milliseconds" into sc-dev 2021-05-17 20:35:20 +00:00
Hao Chen
4065fbfa46 Vehicle HAL client reads the config from the server instead of DefaultConfigs.h
Test: Launch cf auto instance (with default vhal) and

atest
packages/services/Car/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/CarPropertyTest.java

Bug: 188005769

Change-Id: If98db799be8c894bd9a7ba44bf3075f1f7384e5c
2021-05-17 20:10:01 +00:00
Hao Chen
87527e238d Merge changes I5c55bae2,If418dcdd,I5aff41ac into sc-dev
* changes:
  Remove duplicates in DefaultConfig.h
  Split the utility parts out of DefaultConfig.h
  Use PropStore on the Server Side to Simulate ECU
2021-05-17 19:38:03 +00:00
Kai Wang
afc115199a Merge "Rename Unix_time property to EPOCH_TIME" into sc-dev 2021-05-17 18:16:07 +00:00
Emilian Peev
3177f58e30 Camera: Correct partial result entry count query
Use the partial tag count instead of the
size of the metadata buffer.
Additionally initialize 'collectedResult' to avoid
false positives when checking partial result entries
against invalid/uninitialized accumulated results.

Bug: 187156343
Test: Partner verified
Change-Id: Iff55f53952c7b06bc2a0b9786247d8ec04227705
2021-05-17 09:13:50 -07:00
David Drysdale
2b6c351a40 KeyMint VTS: local RSA encryption
Change RSA encryption (with public key) so it happens locally in the
test, rather than by invoking an ENCRYPT operation against KeyMint.

 - Specify MGF1 digest for OAEP mode as (now) required by AIDL spec.
 - Drop tests for too-long encryption inputs.
 - Adjust test comments to reflect decryption-only nature.
 - Change parameter checking tests to do so on DECRYPT rather than ENCRYPT.

Bug: 188385353
Test: VtsAidlKeyMintTargetTest
Merged-In: I10c4beea28387eecfd0bc7c5dfd59a1b66fec21e
Change-Id: I10c4beea28387eecfd0bc7c5dfd59a1b66fec21e
2021-05-17 15:19:48 +01:00
David Drysdale
fe42aa3a3f KeyMint VTS: local asymmetric verification
Change verification of ECDSA and RSA signatures so it happens locally
in the test, rather than by invoking a VERIFY operation against KeyMint.

Bug: 188385353
Test: VtsAidlKeyMintTargetTest
Merged-In: I0efc30f3c96cd70ac636d34718eff53cc23f1480
Change-Id: I0efc30f3c96cd70ac636d34718eff53cc23f1480
2021-05-17 15:19:32 +01:00
David Drysdale
a8d103dd09 KeyMint HAL: cert dates are in milliseconds
Bug: 188385338
Test: None, comment change only
Merged-In: I6251d4a0ba74d111f4c107f9a54a5c45811aa90f
Change-Id: I6251d4a0ba74d111f4c107f9a54a5c45811aa90f
2021-05-17 14:57:23 +01:00
Kai Wang
3be21ccf01 Rename Unix_time property to EPOCH_TIME
Bug: 188227292
Test: build and flash with google VHAL
      check property from KitchenSink
Change-Id: I7dc1833a000949f246a1a8be6f87970a1478832b
2021-05-14 23:47:00 +00:00
Treehugger Robot
561d79e024 Merge "KeyMint VTS: fix 3DES key sizes" am: 4862e3f6f3 am: 9f4239423d am: ff02c3fc10
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1699808

Change-Id: I26847c3c4f124f774813958ad9b5b93b2c3c83b2
2021-05-14 22:49:12 +00:00
Treehugger Robot
ff02c3fc10 Merge "KeyMint VTS: fix 3DES key sizes" am: 4862e3f6f3 am: 9f4239423d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1699808

Change-Id: I158c42c5e92a864e91a1594b4a07884b991d63f4
2021-05-14 22:31:29 +00:00
Treehugger Robot
9f4239423d Merge "KeyMint VTS: fix 3DES key sizes" am: 4862e3f6f3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1699808

Change-Id: I4d5ab048ce1cf7852bc66e4410694d9c0e1255ea
2021-05-14 22:14:06 +00:00
Hao Chen
d2e8b5fdb2 Remove duplicates in DefaultConfig.h
Test: build and unit tests

Bug: 188005769

Change-Id: I5c55bae2f54725542ac56ebd04ba58de6af63d9e
2021-05-14 14:59:14 -07:00
Hao Chen
f2654a4c73 Split the utility parts out of DefaultConfig.h
So that the client side may use the utilities without introducing the
"default configs". "default configs" should only be visible to the
server, and the vehicle hal server will take care of configs.

Test: build and unit tests

Bug: 188005769

Change-Id: If418dcdd1c5b261179104bb414c52f3eb04d3ea8
2021-05-14 14:59:14 -07:00
Treehugger Robot
36a8274a0c [automerger skipped] Merge changes Id027b742,I486ccad8 am: 44c294e621 am: 6ece4c1da3 am: 0ba331884c -s ours
am skip reason: Merged-In I58bd8b941f6340d9e69153702b5269cc35c646da with SHA-1 0d591fd0a4 is already in history

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

Change-Id: I10aeff652ccd63ecb323b1f731385af4d012d17f
2021-05-14 21:59:13 +00:00
Gareth Fenn
034fa19e4d [automerger skipped] Add additional DVBT settings to TunerTestingConfig am: 8fa4cff4ce am: 86d8d2caf2 am: f6a0ed5136 -s ours
am skip reason: Merged-In I58bd8b941f6340d9e69153702b5269cc35c646da with SHA-1 0d591fd0a4 is already in history

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

Change-Id: I199d0152d1e656f093be53fe4f205dc0e6f3288d
2021-05-14 21:59:11 +00:00
Hao Chen
945c430d19 Use PropStore on the Server Side to Simulate ECU
Test: build and unit tests

Bug: 188005769

Change-Id: I5aff41acbc4795def84ceb8e363019ff9668120c
2021-05-14 14:58:52 -07:00
Treehugger Robot
4862e3f6f3 Merge "KeyMint VTS: fix 3DES key sizes" 2021-05-14 21:55:00 +00:00
Treehugger Robot
0ba331884c Merge changes Id027b742,I486ccad8 am: 44c294e621 am: 6ece4c1da3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705136

Change-Id: I6e76d3a96dc16e4a364eef9283d5f60168fa1a05
2021-05-14 21:34:25 +00:00
Gareth Fenn
f6a0ed5136 Add additional DVBT settings to TunerTestingConfig am: 8fa4cff4ce am: 86d8d2caf2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705148

Change-Id: Ic15fc3050e37fde53008c2f5114768ac90d4db75
2021-05-14 21:34:23 +00:00
Treehugger Robot
6ece4c1da3 Merge changes Id027b742,I486ccad8 am: 44c294e621
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705136

Change-Id: Iaf5b44fc72dd3ad259d22ed04cf20f215f9136c2
2021-05-14 21:18:35 +00:00
Gareth Fenn
86d8d2caf2 Add additional DVBT settings to TunerTestingConfig am: 8fa4cff4ce
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705148

Change-Id: Ia337384e925b7d7109a7985c5e2a582c3b97461d
2021-05-14 21:17:47 +00:00
Treehugger Robot
44c294e621 Merge changes Id027b742,I486ccad8
* changes:
  Add additional DVBT settings example usage to sample_tuner_vts_config.xml
  Add additional DVBT settings to TunerTestingConfig
2021-05-14 20:59:39 +00:00
TreeHugger Robot
2f01c57494 Merge "Add timeout configure item and set it as 30m" into sc-dev 2021-05-14 19:34:42 +00:00
Jack Yu
a039c59a6c Merge "Skip tests for single SIM devices" into sc-dev 2021-05-14 19:19:51 +00:00
TreeHugger Robot
9122068452 Merge "Fixed the obsolete VTS owners" into sc-dev 2021-05-14 19:18:40 +00:00
Jack Yu
879b3c0809 Fixed the obsolete VTS owners
Fix: 188209583
Test: None
Change-Id: I783cdedaad088ec1c52c2edfbea08f83c9b7a432
2021-05-14 19:18:29 +00:00
Gareth Fenn
b9722f1236 Add additional DVBT settings example usage to sample_tuner_vts_config.xml
Test: atest VtsHalTvTunerV1_0TargetTest

Change-Id: Id027b74267e97822f76607545bf23174a623e74e
Merged-In: I58bd8b941f6340d9e69153702b5269cc35c646da
2021-05-14 18:23:21 +00:00
Henry Fang
2eaf17e767 Add timeout configure item and set it as 30m
bug: 182519645
Test: atest VtsHalTvTunerV1_0TargetTest
Change-Id: I82c4617ae4c9c3109b972b22984ca6db706c1e5d
2021-05-14 10:53:57 -07:00
Gareth Fenn
8fa4cff4ce Add additional DVBT settings to TunerTestingConfig
Test: atest VtsHalTvTunerV1_0TargetTest

Change-Id: I486ccad855662e6b9fa7cd1be3eb3949356d6a1f
Merged-In: I58bd8b941f6340d9e69153702b5269cc35c646da
2021-05-14 16:34:36 +00:00
Henry Fang
ab839a87d1 Merge "Add more configure items for DVBT" into sc-dev 2021-05-14 16:33:26 +00:00
Treehugger Robot
76a507f2a2 Merge "Adding 1s time gap between slot1 & slot2 setDataThrottling tests" am: 9f7a1e8317 am: 898f676017 am: 5145be25fb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705149

Change-Id: Iff420e3c34498623078cab14452ca62b88cc452a
2021-05-14 07:10:18 +00:00
Treehugger Robot
5145be25fb Merge "Adding 1s time gap between slot1 & slot2 setDataThrottling tests" am: 9f7a1e8317 am: 898f676017
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705149

Change-Id: I769126141b8140dee759da0f3f7b9d38a42f4aaf
2021-05-14 06:40:54 +00:00
Treehugger Robot
898f676017 Merge "Adding 1s time gap between slot1 & slot2 setDataThrottling tests" am: 9f7a1e8317
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705149

Change-Id: I8906af50a9ae7f8f058bed623335806ce0ddf6e0
2021-05-14 06:25:13 +00:00
Treehugger Robot
9f7a1e8317 Merge "Adding 1s time gap between slot1 & slot2 setDataThrottling tests" 2021-05-14 06:13:08 +00:00
Aaron Tsai
36dbe44529 Merge "Fix VTS crash for getAvailableNetworks in Radio 1.6" am: 058de98e44 am: 90f0c0e3be am: 63f6d9bb3a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1699825

Change-Id: I9b26440107d6213c405683204a656406c59f0d92
2021-05-14 04:39:38 +00:00
Aaron Tsai
63f6d9bb3a Merge "Fix VTS crash for getAvailableNetworks in Radio 1.6" am: 058de98e44 am: 90f0c0e3be
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1699825

Change-Id: I17209d9f01e8673f1e327968f20b2a0e75945e22
2021-05-14 03:49:24 +00:00
Aaron Tsai
90f0c0e3be Merge "Fix VTS crash for getAvailableNetworks in Radio 1.6" am: 058de98e44
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1699825

Change-Id: I1d76c931f944a62f59f71b4e26ab4257ee1c5b29
2021-05-14 03:24:24 +00:00
Aaron Tsai
058de98e44 Merge "Fix VTS crash for getAvailableNetworks in Radio 1.6" 2021-05-14 03:02:50 +00:00
Henry Fang
0d591fd0a4 Add more configure items for DVBT
bug: 182519645

Test: atest VtsHalTvTunerV1_0TargetTest
Change-Id: I58bd8b941f6340d9e69153702b5269cc35c646da
2021-05-14 01:50:18 +00:00
Treehugger Robot
d459723072 [automerger skipped] Merge "Use proper alignment and padding for pointer arguments -- HAL." am: 0a3ca7b629 am: 56ffb53709 am: f989c1bae5 -s ours
am skip reason: Merged-In I22591640fa047d5f75d437edac1a7645d3b05526 with SHA-1 8bfa243972 is already in history

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

Change-Id: I80c53a953159cfa2cc893aee2fe8d7f2eb870756
2021-05-14 01:38:28 +00:00
Treehugger Robot
f989c1bae5 Merge "Use proper alignment and padding for pointer arguments -- HAL." am: 0a3ca7b629 am: 56ffb53709
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1702587

Change-Id: I860fb3ff5fccc5bb047f543ccb3c9322b17d1e83
2021-05-14 01:14:31 +00:00
Treehugger Robot
56ffb53709 Merge "Use proper alignment and padding for pointer arguments -- HAL." am: 0a3ca7b629
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1702587

Change-Id: I7a91601496932132d9c7d7fe42e265f5efd46a29
2021-05-14 00:45:15 +00:00