Commit Graph

27682 Commits

Author SHA1 Message Date
Treehugger Robot
1e63ebcda9 Merge "power/stats: Add more energy consumer types" am: a5ec53d68f am: 807acbb8c4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1584748

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ba202b9865876cbbd604db97e64cd507742eaca
2021-02-17 22:41:20 +00:00
Treehugger Robot
807acbb8c4 Merge "power/stats: Add more energy consumer types" am: a5ec53d68f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1584748

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie661b6a70d04d2f60b196e219868692228537760
2021-02-17 22:24:11 +00:00
Treehugger Robot
a5ec53d68f Merge "power/stats: Add more energy consumer types" 2021-02-17 22:04:34 +00:00
Benjamin Schwartz
e7cdfd9a6d Merge "power/stats: Clean up warnings" am: dfd890a101 am: 9202d2c0a6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1582855

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf31eb2079cf63608ff344e135430cf132d821a5
2021-02-17 20:27:04 +00:00
Shawn Willden
cad4604a2e Add KeyPurpose::ATTEST_KEY. am: 7c13039711 am: 99ac9848df
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac28faafc3980ee813d904961d9fc8ac77d33755
2021-02-17 20:14:55 +00:00
Benjamin Schwartz
eb214d0328 power/stats: Add more energy consumer types
Adding bluetooth, mobile radio, gnss, and wifi types

Bug: 176117316
Test: build
Change-Id: I6e22c426910c31bd65e2ec7cd569983a0d005007
2021-02-17 12:12:11 -08:00
Benjamin Schwartz
9202d2c0a6 Merge "power/stats: Clean up warnings" am: dfd890a101
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1582855

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8166e0764e66f0fd4da3a51e42c3ffe0b52d7b94
2021-02-17 20:09:20 +00:00
Benjamin Schwartz
dfd890a101 Merge "power/stats: Clean up warnings" 2021-02-17 19:58:50 +00:00
Shawn Willden
99ac9848df Add KeyPurpose::ATTEST_KEY. am: 7c13039711
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd239ffc5407842834bb07bb70a50f53a61a771e
2021-02-17 19:42:23 +00:00
Shawn Willden
7c13039711 Add KeyPurpose::ATTEST_KEY.
This allows applications to generate their own attestation keys and
then use them to attest other application-generated keys.

Bug: 171845652
Test: VtsAidlKeyMintTargetTest
Change-Id: I32add16dcc2d1b29665a88024610f7bef7e50200
2021-02-17 08:08:27 -07:00
Treehugger Robot
cb8d07c4ae Merge "Add RemotelyProvisionedComponent HAL." am: 0ace84a193 am: 2a325dff91
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1367566

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9889d30d121dac83712e3be1af02095459f6fb9d
2021-02-17 00:41:46 +00:00
Treehugger Robot
2a325dff91 Merge "Add RemotelyProvisionedComponent HAL." am: 0ace84a193
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1367566

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I831dba611649e52d7a2d21ade4f52700e26ae1dc
2021-02-17 00:10:05 +00:00
Treehugger Robot
0ace84a193 Merge "Add RemotelyProvisionedComponent HAL." 2021-02-16 23:48:44 +00:00
Kalesh Singh
dc6187d38a Merge "VtsHalMemtrackTargetTest: Update test suite" am: 1c402dca96 am: b9d91e2095
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1590513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibca14ce7cd1d3abb5aa99563e1e1200ea99d3db1
2021-02-16 22:29:05 +00:00
Kalesh Singh
b9d91e2095 Merge "VtsHalMemtrackTargetTest: Update test suite" am: 1c402dca96
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1590513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3dfb4d563da366790e4758e7bf077cf6e3783b8
2021-02-16 21:51:09 +00:00
Kalesh Singh
1c402dca96 Merge "VtsHalMemtrackTargetTest: Update test suite" 2021-02-16 21:08:03 +00:00
Treehugger Robot
6d7fb03fb4 Merge "Fix HidlUtils::deviceAddressToHalImpl for HAL V4--6" am: eb4b22027b am: 7fa6d5b808
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1587526

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e22af2b87fa56e8d754e90edef8631d64bd5fce
2021-02-16 20:40:25 +00:00
Treehugger Robot
7fa6d5b808 Merge "Fix HidlUtils::deviceAddressToHalImpl for HAL V4--6" am: eb4b22027b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1587526

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idfd04bfa4bb63076d432b837cdf2dd4c93e7d72a
2021-02-16 20:05:29 +00:00
Treehugger Robot
eb4b22027b Merge "Fix HidlUtils::deviceAddressToHalImpl for HAL V4--6" 2021-02-16 19:35:36 +00:00
Kalesh Singh
6e2d21dbc2 VtsHalMemtrackTargetTest: Update test suite
"vts-core" has been renamed to "vts"

Bug: 175021432
Test: atest VtsHalMemtrackTargetTest
Change-Id: Idad5d309bc66cf631932bad66c66d5915ba2fe2c
2021-02-16 14:08:43 -05:00
Shawn Willden
274bb55f10 Add RemotelyProvisionedComponent HAL.
Test: VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I51fb01f4c52949c81f3ad2d694a4afdf0fa67788
2021-02-16 07:40:59 -08:00
Treehugger Robot
88acb8b6d7 Merge "Apply aidl_format to NNAPI AIDL interface files" am: 06811c8124 am: 1ac13080b3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1587251

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib02a55923e94f81940467800706854d587a1ec06
2021-02-15 18:27:29 +00:00
Treehugger Robot
1ac13080b3 Merge "Apply aidl_format to NNAPI AIDL interface files" am: 06811c8124
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1587251

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7babc656b3beb72566a1c2468122c5d8fe047e56
2021-02-15 17:59:15 +00:00
Treehugger Robot
06811c8124 Merge "Apply aidl_format to NNAPI AIDL interface files" 2021-02-15 17:24:17 +00:00
Treehugger Robot
63a476625f Merge "Add more tests for limited use key feature." am: 82d8bdd90d am: a624a632da
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1583223

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60161120592a8cf9afb4cace84281abfa0b9510f
2021-02-15 06:58:43 +00:00
Treehugger Robot
a624a632da Merge "Add more tests for limited use key feature." am: 82d8bdd90d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1583223

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2af65704bba11d3cd9da38ec2aabf5db2b7035b1
2021-02-15 06:25:08 +00:00
Treehugger Robot
82d8bdd90d Merge "Add more tests for limited use key feature." 2021-02-15 05:48:12 +00:00
Kalesh Singh
e14044a465 Merge "Memtrack HAL: Remove MemtrackType::NUM_TYPES" am: 5a52686fd6 am: 15bf0b3294
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1587451

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1308e52342a7a5d8a61e56b38dc1b99a1649aba
2021-02-13 23:00:39 +00:00
Treehugger Robot
7262a307d2 Merge changes from topic "keymint_aidl_impl" am: 34a7139467 am: d224907547
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1570080

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bb03549da49cbee335e9e322658eed367b68907
2021-02-13 23:00:26 +00:00
Kalesh Singh
15bf0b3294 Merge "Memtrack HAL: Remove MemtrackType::NUM_TYPES" am: 5a52686fd6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1587451

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae0d8557806b228a383b6359b3ef0a633eb093a1
2021-02-13 22:40:51 +00:00
Treehugger Robot
d224907547 Merge changes from topic "keymint_aidl_impl" am: 34a7139467
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1570080

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a8050d780bc01a27551a99ce74967053bd8cc6f
2021-02-13 22:40:09 +00:00
Kalesh Singh
5a52686fd6 Merge "Memtrack HAL: Remove MemtrackType::NUM_TYPES" 2021-02-13 22:35:11 +00:00
Treehugger Robot
34a7139467 Merge changes from topic "keymint_aidl_impl"
* changes:
  Vts tests for earlyBoot and deviceLocked functionality. Test: atest VtsAidlKeyMintTargetTest Bug: b/171287439.
  The aidl changes related to device locked, entryBootEnded and hw info. Test: atest VtsAidlKeyMintTargetTest Bug: b/178222844, 179062062
2021-02-13 22:11:52 +00:00
Mikhail Naganov
32fe782db4 Fix HidlUtils::deviceAddressToHalImpl for HAL V4--6
Ensure that the busAddress field is used as a fallback
for types of devices that may not necessary have it,
e.g. for built-in microphones.

Add a subset of presubmit tests for HidlUtils of V6
similar to the tests for V7.

Bug: 180143301
Test: atest android.hardware.audio.common@6.0-util_tests
Change-Id: I61fca8bd4342fdf496d1ca5bf2d01399fd3d34c7
2021-02-12 15:49:09 -08:00
Kalesh Singh
1bcbf85110 Memtrack HAL: Remove MemtrackType::NUM_TYPES
Remove NUM_TYPES from MemtrackType enum, since this can cause conflicts
if the enum changes.

Use enum_range to iterate the MemtrackType enum.

Bug: 179432507
Test: atest VtsHalMemtrackTargetTest
Change-Id: Iadad3e0547c1c2f6aaf0f55a2d50e4c625a909e0
2021-02-12 11:29:53 -05:00
Lev Proleev
79bd373c10 Apply aidl_format to NNAPI AIDL interface files
The change also updates the generated files using more up-to-date
version of the aidl code generator. This adds copyright notice to the
generated files.

Bug: 180101047
Test: no presubmit hooks erros
Change-Id: I8535eee96078eda3fadcea130f123a9bdbf1edec
2021-02-12 14:58:20 +00:00
Treehugger Robot
344e972590 Merge "The implementation of vts and default implementation to support ISecureClock and ISharedSecret AIDLs. Test: atest VtsAidlSecureClockTargetTest, atest VtsAidlSharedSecretTargetTest Bug: b/175136979, b/175141176" am: 9717a37b6a am: 9abd32b602
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1562810

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I650c5d1ebc6bd1f1d9f85f4cdd70233c96f879c7
2021-02-12 05:17:32 +00:00
Treehugger Robot
9abd32b602 Merge "The implementation of vts and default implementation to support ISecureClock and ISharedSecret AIDLs. Test: atest VtsAidlSecureClockTargetTest, atest VtsAidlSharedSecretTargetTest Bug: b/175136979, b/175141176" am: 9717a37b6a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1562810

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0424942af64d493e556df6d8ffc93375123a0ff3
2021-02-12 04:47:47 +00:00
Treehugger Robot
9717a37b6a Merge "The implementation of vts and default implementation to support ISecureClock and ISharedSecret AIDLs. Test: atest VtsAidlSecureClockTargetTest, atest VtsAidlSharedSecretTargetTest Bug: b/175136979, b/175141176" 2021-02-12 02:42:35 +00:00
Treehugger Robot
f05dcc4cbd Merge "Identity: Fix breakage caused by recent changes in libsoft_attestation_cert." am: aef57a826a am: fb669b9e39
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1584471

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae7a3c70e790f1211c4ce7c7de6f2df69106b07a
2021-02-11 23:44:00 +00:00
Treehugger Robot
fb669b9e39 Merge "Identity: Fix breakage caused by recent changes in libsoft_attestation_cert." am: aef57a826a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1584471

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icde3291dbd1813cb068ff07e9d4810e871793dc7
2021-02-11 23:12:56 +00:00
Jakub Pawlowski
999ab57db7 Disable failing VTS tests am: 3d5cd48f92 am: eebcaea5b2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1584988

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ce8eacaf0849cc31cee4d8dca0230cccf38f3b6
2021-02-11 22:57:17 +00:00
Treehugger Robot
aef57a826a Merge "Identity: Fix breakage caused by recent changes in libsoft_attestation_cert." 2021-02-11 22:42:29 +00:00
Jakub Pawlowski
eebcaea5b2 Disable failing VTS tests am: 3d5cd48f92
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1584988

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4aa8368f5394da332f94c00f688e4d013d8bfd9
2021-02-11 22:34:30 +00:00
Jakub Pawlowski
3d5cd48f92 Disable failing VTS tests
These will be reenabled in patches that add missing implementation

Test: atest VtsHalBluetoothAudioV2_1TargetTest
Bug: 150670922
Bug: 179790901
Bug: 179936318
Change-Id: I4c124ab5c4bcd9db50d35f41f8227a8bd2fb6744
2021-02-11 20:43:23 +00:00
Qi Wu
8e727f799b Add more tests for limited use key feature.
Verify that when keymint implementation supports rollback resistance,
it must also enforce the single use key in hardware by secure hardware.

Test: atest -c VtsAidlKeyMintTargetTest
Change-Id: Ib984003247906ded7266da620e2d82e826d916bc
2021-02-11 16:37:32 +00:00
David Zeuthen
37388b36bf Identity: Fix breakage caused by recent changes in libsoft_attestation_cert.
CL:1566356 changed the notBefore and notAfter fields in the X.509
attestation certificate returned by generate_attestation_from_EVP().
This broke the default implementation of the Identity Credential HAL.

Fixed by setting TAG_CERTIFICATE_NOT_BEFORE and
TAG_CERTIFICATE_NOT_AFTER to the expected values.

Test: atest VtsHalIdentityTargetTest
Bug: 179933300
Change-Id: I2dbca41c1e905c17cd2bc565d2e987945b86273a
2021-02-11 08:44:51 -05:00
Treehugger Robot
98a3f25f5c Merge "health 2.1 impl: log values properly." am: 709382fcc5 am: 5fef7e1de0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1581063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3da65b3034eb1ea4f83dcde2b7db22a1f9d56284
2021-02-10 23:46:12 +00:00
Chirag Pathak
9ea6a0addc Vts tests for earlyBoot and deviceLocked functionality.
Test: atest VtsAidlKeyMintTargetTest
Bug: b/171287439.

Change-Id: I41c0b7b6b608b26147669b007225ad6f2d3cdfed
2021-02-10 23:42:44 +00:00
Treehugger Robot
5fef7e1de0 Merge "health 2.1 impl: log values properly." am: 709382fcc5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1581063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcb9d6655fe837f70d4c71a63901db19bbc4ed26
2021-02-10 23:23:58 +00:00