Commit graph

28335 commits

Author SHA1 Message Date
Michael Butler
7d32a5135a Merge "Enable NN VTS and utility code to use lazy services" am: a546efe5ef am: 08454e9895
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1674540

Change-Id: I2b16a203898715c240c0962954efc08f76f1e2d7
2021-04-14 17:41:36 +00:00
Michael Butler
08454e9895 Merge "Enable NN VTS and utility code to use lazy services" am: a546efe5ef
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1674540

Change-Id: I344d508f27ff68692b47419f69c7b06edccad1b3
2021-04-14 16:55:06 +00:00
Michael Butler
a546efe5ef Merge "Enable NN VTS and utility code to use lazy services" 2021-04-14 16:22:53 +00:00
Treehugger Robot
992f82a2ba Merge "Add Rsa 2048 import key test for strongbox." am: aeb7117596 am: 10dd6c409f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673856

Change-Id: I1e129e3846e3591b67d3e012d5bcf8e69211e4d7
2021-04-14 15:30:10 +00:00
Lev Proleev
65b042531a Merge "Add explanations for FusedActivationFunc values" am: e6273df6b8 am: 0bee214c21
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673486

Change-Id: Ie1f758f24ccc6f5f8f271ee64cbdffa4ab15fef8
2021-04-14 15:30:06 +00:00
Treehugger Robot
10dd6c409f Merge "Add Rsa 2048 import key test for strongbox." am: aeb7117596
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673856

Change-Id: Ib473a080d4cee9e78dd7c9ab0f7c0cf93b683934
2021-04-14 15:06:05 +00:00
Lev Proleev
0bee214c21 Merge "Add explanations for FusedActivationFunc values" am: e6273df6b8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673486

Change-Id: I53ba56a31f9981a51e21af74efe3a14781832408
2021-04-14 15:04:15 +00:00
Treehugger Robot
aeb7117596 Merge "Add Rsa 2048 import key test for strongbox." 2021-04-14 14:49:39 +00:00
Lev Proleev
e6273df6b8 Merge "Add explanations for FusedActivationFunc values" 2021-04-14 14:38:46 +00:00
Bill Yi
0b2538df43 [automerger skipped] Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE am: 89e61b7f9d -s ours am: b4cd937f15 -s ours
am skip reason: skip tag Change-Id Ib56dbbc032236ffe012f36dfb83040b06847f455 with SHA-1 d6a1875bd0 is already in history

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

Change-Id: I890aeaaff79c105b6cef9420728c44549b304e6d
2021-04-14 06:31:20 +00:00
Selene Huang
e5727e66c2 Add Rsa 2048 import key test for strongbox.
Test: atest VtsAidlKeyMintTargetTest
Change-Id: If228b11fe23d2aaaa68e8ff53f0420c5e5ae62fb
2021-04-13 22:51:54 -07:00
Bill Yi
b4cd937f15 [automerger skipped] Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE am: 89e61b7f9d -s ours
am skip reason: skip tag Change-Id Ib56dbbc032236ffe012f36dfb83040b06847f455 with SHA-1 d6a1875bd0 is already in history

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

Change-Id: Ib8bb61385efa0d9031606ecc7e3d8e1d120f7198
2021-04-14 05:46:17 +00:00
Bill Yi
89e61b7f9d Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE
Merged-In: Ib56dbbc032236ffe012f36dfb83040b06847f455
Merged-In: Ia036416d8c0c90400586f9573c3be66b2ff8ea03
Change-Id: I09f542101304af38614d9d3715c25480bbef6c96
2021-04-13 19:29:20 -07:00
Bill Yi
b71330ce85 [automerger skipped] Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 242d60958b -s ours
am skip reason: skip tag Change-Id Ia79a4a3189a84591d35ab2303d2e20be77a21efa with SHA-1 1f7df75f4c is already in history

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

Change-Id: Ia036416d8c0c90400586f9573c3be66b2ff8ea03
2021-04-14 00:31:10 +00:00
Bill Yi
242d60958b Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2021-04-14 00:27:04 +00:00
Michael Butler
d3a6efc22e Enable NN VTS and utility code to use lazy services
This CL enables VtsHalNeuralnetworksTargetTest to use lazy services by
changing from AServiceManager_getService (which will return nullptr for
the service if the service is not able to be loaded within a short
amount of time) to AServiceManager_waitForService (which will wait for a
longer time, allowing lazy services to start up).

Similarly, the utility code is changed from using
AServiceManager_getService to AServiceManager_waitForService where
possible.

This CL also introduces an "InvalidDevice" utility class to the
nnapi/hal/aidl utility code. InvalidDevices are minimal devices that
support no functionality but are still able to pass VTS tests.

Bug: 170696939
Test: mma
Test: VtsHalNeuralnetworksTargetTest
Change-Id: I4f806b104ef6af863ec55c2c3f2a2dd1f72b9633
2021-04-13 16:14:13 -07:00
Michael Butler
099b2a573d Merge changes from topic "nnapi-aidl-memory" am: 6594b5f1b4 am: d6a1875bd0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666282

Change-Id: Ibdf46d7e2337a73686a679d49d18715650c2d784
2021-04-13 18:03:05 +00:00
Michael Butler
1b5af25961 Improve the structure of NNAPI AIDL Memory am: dd53d04d8c am: a0f169b2c4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666281

Change-Id: I326976b395838acf0c5301a059c962f84068cf3f
2021-04-13 18:03:04 +00:00
Michael Butler
d6a1875bd0 Merge changes from topic "nnapi-aidl-memory" am: 6594b5f1b4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666282

Change-Id: Ib56dbbc032236ffe012f36dfb83040b06847f455
2021-04-13 17:14:28 +00:00
Michael Butler
a0f169b2c4 Improve the structure of NNAPI AIDL Memory am: dd53d04d8c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666281

Change-Id: Ibcf677a263deaee456d311f8656df442c2aafada
2021-04-13 17:13:36 +00:00
Michael Butler
6594b5f1b4 Merge changes from topic "nnapi-aidl-memory"
* changes:
  Update NN utility code and VTS tests with new Memory type
  Improve the structure of NNAPI AIDL Memory
2021-04-13 16:29:33 +00:00
Treehugger Robot
ae5559faca Merge "vts: Correct the TagType when verify_attestation_record" am: d997c72959 am: e924c7b6c8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1668946

Change-Id: Ia8a1eaebbffdad5fcbf5b16a6040fbb0d1da7fda
2021-04-13 14:34:28 +00:00
Treehugger Robot
e924c7b6c8 Merge "vts: Correct the TagType when verify_attestation_record" am: d997c72959
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1668946

Change-Id: Id9fd71374a32fb37e4b8aace76cf153ec5907fb7
2021-04-13 13:56:05 +00:00
Treehugger Robot
d997c72959 Merge "vts: Correct the TagType when verify_attestation_record" 2021-04-13 13:06:58 +00:00
ChengYou Ho
523354c890 Change WeaverConfig data types to int am: c9945ab2b4 am: 18d02e3a20
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1671790

Change-Id: Ib3da0e815083ba2bb5b37209d72f35cd13a4eee0
2021-04-12 23:21:12 +00:00
ChengYou Ho
18d02e3a20 Change WeaverConfig data types to int am: c9945ab2b4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1671790

Change-Id: I8495a5cbb7b68df7fb48ceec0ae940e8d62e6143
2021-04-12 22:38:51 +00:00
ChengYou Ho
c9945ab2b4 Change WeaverConfig data types to int
also prefix return error codes

Bug: 179432365
Change-Id: I435fb261b1162e9b2f56c434f2defccc1505c842
2021-04-12 21:51:38 +00:00
Treehugger Robot
c0143434f1 Merge "Check that KeyMint provides IRemotelyProvisionedComponent" am: cab97a7d3e am: 9cdb456cf9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1660165

Change-Id: Iae9bfedc5f42b1710d32e14f4f30139eefae4a91
2021-04-12 18:22:15 +00:00
Treehugger Robot
9cdb456cf9 Merge "Check that KeyMint provides IRemotelyProvisionedComponent" am: cab97a7d3e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1660165

Change-Id: I53dff904b91f787f96bdff956bcf2ae6a53f8a75
2021-04-12 17:41:11 +00:00
Treehugger Robot
cab97a7d3e Merge "Check that KeyMint provides IRemotelyProvisionedComponent" 2021-04-12 16:55:03 +00:00
Bill Yi
5137d519a0 Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE
Merged-In: Ia79a4a3189a84591d35ab2303d2e20be77a21efa
Change-Id: I4901e127f503239c93fd7d296867a2fc7bee8c58
2021-04-12 09:28:11 -07:00
Lev Proleev
60aa6c2b03 Add explanations for FusedActivationFunc values
Fix: 183117976
Test: m
Change-Id: I55f4b7e3287e5bfdde6c2a2f94cee757c020c2d0
2021-04-12 16:00:15 +01:00
Przemyslaw Szczepaniak
1f7df75f4c Merge "Set correct API level for NNAPI AIDL service discovery." am: f61f789f86 am: 3d4bd3ef47
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1665884

Change-Id: Ia79a4a3189a84591d35ab2303d2e20be77a21efa
2021-04-12 14:04:10 +00:00
David Drysdale
4dc010739d Check that KeyMint provides IRemotelyProvisionedComponent
Move helper utilities across into KeyMintAidlTestBase to allow re-use.

Test: VtsHalRemotelyProvisionedComponentTargetTest, VtsAidlKeyMintTargetTest
Change-Id: Ib9e55a7d72fd197016ae1a1f073dadedafa09c25
2021-04-12 14:48:31 +01:00
Przemyslaw Szczepaniak
3d4bd3ef47 Merge "Set correct API level for NNAPI AIDL service discovery." am: f61f789f86
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1665884

Change-Id: I2b8234bf1af2917eeca047709cb382229d75d41c
2021-04-12 13:23:49 +00:00
Przemyslaw Szczepaniak
f61f789f86 Merge "Set correct API level for NNAPI AIDL service discovery." 2021-04-12 12:55:12 +00:00
Max Bires
794ed1a0f2 Merge "Transitioning identity to external_libcppbor" am: 303991b322 am: 561917a36f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1667666

Change-Id: Iec1c554e9f028decc4f1df4b1faa7ad04366ded7
2021-04-09 18:33:38 +00:00
Max Bires
561917a36f Merge "Transitioning identity to external_libcppbor" am: 303991b322
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1667666

Change-Id: If6bf3acdec3a1f26781104c395f89c914a772687
2021-04-09 17:53:17 +00:00
Max Bires
303991b322 Merge "Transitioning identity to external_libcppbor" 2021-04-09 17:13:33 +00:00
Max Bires
a3c7f4c998 Transitioning identity to external_libcppbor
This change removes hardware/interfaces/identity's dependency on its own
libcppbor copy. The copy can not be fully removed until various vendor
dependencies are cleaned up.

Superficial changes are made to the VTS tests to match the slightly
altered namespace on some of the functions.

This migration is a prerequisite for getting the
IRemotelyProvisionedComponent functionality into system/keymaster.
Without migrating to the same library, the build system runs into issues
since there are "two" libcppbor libraries with conflicting namespaces
otherwise.

Bug: 182445123
Test: atest VtsHalIdentityTargetTest
Change-Id: I854ffa31c4adb5a3d1df06539fe66075ccc4625d
2021-04-09 08:57:01 -07:00
Przemysław Szczepaniak
3cc27f5c62 Set correct API level for NNAPI AIDL service discovery.
Use __ANDROID_API_FUTURE__ until the S version is finalized.

Bug: 183657864
Test: Build & flashed CF, run TFLite benchmark util
Change-Id: I1352aa33866487f955136c6fb8e4d0d279225f13
2021-04-09 11:30:28 +01:00
Daniel Norman
703d8c64a8 Merge "Allows injection for the default HINGE_ANGLE sensor." am: d215599f10 am: 4ece0d712e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1668408

Change-Id: Id98abdf219ceaa6de87c105795b5e543bde87177
2021-04-08 17:46:15 +00:00
Daniel Norman
4ece0d712e Merge "Allows injection for the default HINGE_ANGLE sensor." am: d215599f10
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1668408

Change-Id: Ic3bdc075501cc7e74cc073d11062fc61869ee2d6
2021-04-08 17:10:06 +00:00
Daniel Norman
d215599f10 Merge "Allows injection for the default HINGE_ANGLE sensor." 2021-04-08 16:34:55 +00:00
Treehugger Robot
3ca4e532fa Merge "Setting libcppcose to host supported." am: 5bb7be3f8e am: 6e9d2d6677
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1668432

Change-Id: I35d52e72a418ab596b5ffad13e49232e0cb6413e
2021-04-08 06:15:13 +00:00
Treehugger Robot
6e9d2d6677 Merge "Setting libcppcose to host supported." am: 5bb7be3f8e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1668432

Change-Id: Id33882476e9f6bc25bc79cc717a9b9c2daa686d2
2021-04-08 05:31:04 +00:00
Benjamin Schwartz
87905ec84c Merge "power/stats: Split channel name validation test" am: 43374307a3 am: 8ac06fbf1f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1668785

Change-Id: Icf347c3517742e1c0bfb75a605f512cad6f59219
2021-04-08 05:07:41 +00:00
Treehugger Robot
5bb7be3f8e Merge "Setting libcppcose to host supported." 2021-04-08 05:03:45 +00:00
Benjamin Schwartz
8ac06fbf1f Merge "power/stats: Split channel name validation test" am: 43374307a3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1668785

Change-Id: Id99d784fdd3ba2c2422475cf98683086e61f2ba9
2021-04-08 04:45:03 +00:00
Benjamin Schwartz
43374307a3 Merge "power/stats: Split channel name validation test" 2021-04-08 04:08:26 +00:00