Commit graph

18784 commits

Author SHA1 Message Date
Jordan Liu
65eddf19ba Merge "Override gtest timeout and add logging" am: cb844d5695
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1352902

Change-Id: I36332a20b0a4e9f6a71a8a640c3d853e6c81cc6e
2020-06-30 19:55:58 +00:00
Jordan Liu
cb844d5695 Merge "Override gtest timeout and add logging" 2020-06-30 19:46:17 +00:00
Matej Pfajfar
2d0bac77ab Change 'blacklist' to 'disallow' am: 26f365b810
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1351587

Change-Id: Icc1eff787af7978953bc3fd915395fa94e427f0f
2020-06-29 22:54:24 +00:00
Jordan Liu
efab6b568f Override gtest timeout and add logging
Note that this just increases the gtest time to match our
highest wait times. Each test still has wait times fitted for the
expected length of that test.

Bug: 159289514
Test: atest VtsHalRadioV1_0TargetTest
Change-Id: I0825305258bae20ea6e13e9b9a65ce30b7153611
Merged-In: I0825305258bae20ea6e13e9b9a65ce30b7153611
2020-06-29 11:43:00 -07:00
Matej Pfajfar
26f365b810 Change 'blacklist' to 'disallow'
Bug: None
Test: mma
Test: atest
Change-Id: I6d1bc4f1cd95a56287127918f4c8111cafd6e833
Merged-In: I6d1bc4f1cd95a56287127918f4c8111cafd6e833
(cherry picked from commit 1bdd58dcf6)
2020-06-29 13:24:11 +01:00
Treehugger Robot
a0ac5fce1e Merge "Build 64-bit audio service on 64-bit-only" am: 01937cb938
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1327194

Change-Id: Ica28808ee17c10396e61dd1b19925fb462b3fd66
2020-06-26 22:59:39 +00:00
Treehugger Robot
01937cb938 Merge "Build 64-bit audio service on 64-bit-only" 2020-06-26 22:49:05 +00:00
Xusong Wang
fa0a1d16bc Revert "Allow compilations in TOCTOU tests to fail with GENERAL_FAILURE." am: 3dca799497
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1351585

Change-Id: Idadf04c6cb02f47b53798a98bbc1c0a02e3e1484
2020-06-26 18:51:56 +00:00
Miao Wang
19971537d4 Remove temporary test filters am: 29a1225561
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1351584

Change-Id: I97d5e680b2f6d94b74e4720a41f9cded813a223c
2020-06-26 18:51:54 +00:00
Xusong Wang
efd9b024c5 Allow compilations in TOCTOU tests to fail with GENERAL_FAILURE. am: 0b617ae022
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1351583

Change-Id: I2b8d60a749f39823cb8daa2735dd8e4f6c7cfd2f
2020-06-26 18:51:51 +00:00
Xusong Wang
3dca799497 Revert "Allow compilations in TOCTOU tests to fail with GENERAL_FAILURE."
This reverts commit 362dfd64d5.

Bug: 157489048
Test: 1.2/1.3 VTS TOCTOU tests
Change-Id: Ifdf4a8fab129cd90a3be019c3c598d980b785aaa
Merged-In: Ifdf4a8fab129cd90a3be019c3c598d980b785aaa
(cherry picked from commit 81fa7605cf)
2020-06-26 15:26:47 +01:00
Miao Wang
29a1225561 Remove temporary test filters
Bug: 155577050
Test: mm
Change-Id: Ibe8a3ed79f640249ba54f94bdde9649f156383ea
Merged-In: Ibe8a3ed79f640249ba54f94bdde9649f156383ea
(cherry picked from commit eeb0068015)
2020-06-26 15:26:44 +01:00
Xusong Wang
0b617ae022 Allow compilations in TOCTOU tests to fail with GENERAL_FAILURE.
A compilation failure is not related to the security aspect of the
TOCTOU test, but it will skip one iteration of security testing. This CL
allows the compilation to fail with GENERAL_FAILURE in TOCTOU tests, and
issues a retry once it happens to ensure enough test coverage.

Bug: 157489048
Test: 1.2/1.3 VTS
Change-Id: Idc88e0365c5d2799187093b6fd7b4abf8f8b463d
Merged-In: Idc88e0365c5d2799187093b6fd7b4abf8f8b463d
(cherry picked from commit 362dfd64d5)
2020-06-26 15:26:40 +01:00
Alistair Delva
cc8dabbf51 Build 64-bit audio service on 64-bit-only
Bug: 158659988
Change-Id: I30f692537971bfafb6bcd931488cf6869477f62e
2020-06-25 09:45:35 -07:00
Treehugger Robot
6223c5fbf3 Merge "Identity: Update for changes to ISO 18013-5." am: 84a6118710
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1344923

Change-Id: I388758629a0edbe6f1d531df8a974e95b18791c4
2020-06-24 16:07:44 +00:00
Treehugger Robot
84a6118710 Merge "Identity: Update for changes to ISO 18013-5." 2020-06-24 16:00:34 +00:00
David Zeuthen
2e4533e5c1 Identity: Update for changes to ISO 18013-5.
Key derivation for session encryption and MACing now involves mixing
in SessionTranscriptBytes. Update docs, default implementation, and
VTS tests to reflect this.

Also, the standard changed such that instead of DeviceAuthentication
being MACed or signed, it's instead DeviceAuthenticationBytes which is
defined as #6.24(bstr .cbor DeviceAuthentication). The same also for
ReaderAuthentication, now ReaderAuthenticationBytes is the CBOR which
is signed by the reader.

Also update the URL for CDDL since it's now a published RFC.

Bug: 159482543
Test: atest VtsHalIdentityTargetTest
Test: atest android.security.identity.cts
Change-Id: I73fc7eb48ffb71e00a8b54849266ed814295fa39
2020-06-24 09:27:02 -04:00
Peter Kalauskas
06c0f36e75 Merge "android.hardware.tests.lazy@1.1::ILazy" am: cd6110105e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1322314

Change-Id: Ib675a9871ac0a9f60685597fb98f7d994dc0714f
2020-06-24 02:06:52 +00:00
Peter Kalauskas
cd6110105e Merge "android.hardware.tests.lazy@1.1::ILazy" 2020-06-24 01:56:13 +00:00
Treehugger Robot
cef200f972 Merge "A2DP: Enable AAC VBR Offloading" am: 8ca3229e06
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1341040

Change-Id: Ie7e8e89343e69d0e1717b25d1c53fd6c1f7c36d7
2020-06-22 17:35:34 +00:00
Treehugger Robot
8ca3229e06 Merge "A2DP: Enable AAC VBR Offloading" 2020-06-22 17:22:54 +00:00
Peter Kalauskas
f4efbd5a82 android.hardware.tests.lazy@1.1::ILazy
Introduce minor version increment to ILazy for testing lazy HAL
inheritance.

Bug: 157451814
Bug: 158606505
Test: hidl_lazy_test
Change-Id: Ib418bc002e834edf5eae53043875dcb351b3eaf2
2020-06-19 02:02:22 +00:00
David Zeuthen
7fb435ce16 Identity: More static linking of VTS test binary. am: 780f8c860d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1342874

Change-Id: I3cae9f75a911b40c7b38b3bdaa71354e9d20b905
2020-06-18 15:36:28 +00:00
David Zeuthen
780f8c860d Identity: More static linking of VTS test binary.
The VTS test was dynamically linking some libraries not normally
present on an Android system. Statically link these libraries instead.

Bug: 158150767
Test: atest VtsHalIdentityTargetTest
Change-Id: Ib93620c36b0ff7f5c9f239ff8861a11196605881
2020-06-18 09:44:51 -04:00
Bill Peckham
9046a2025e Fix link error in android.hardware.health@1.0-impl am: 4e27e0f5a2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1322909

Change-Id: I4e6e0ecebb0fb502a58dd908df9e421164c36c7a
2020-06-18 00:15:24 +00:00
Bill Peckham
4e27e0f5a2 Fix link error in android.hardware.health@1.0-impl
Bug: 158134286
Change-Id: If5a1f0b7a76c3faf176a5a85be2f877b40c613a7
2020-06-17 21:03:59 +00:00
Slava Shklyaev
3811c0e847 Log NNAPI VTS test case to logcat am: 3722d6dcfa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1341594

Change-Id: I37b31c19ed7cd3206c91fae59165d81f35a168b6
2020-06-17 15:05:16 +00:00
Slava Shklyaev
3722d6dcfa Log NNAPI VTS test case to logcat
Sample output:

    I VtsHalNeuralnetworksV1_2TargetTest: [Test Case] TestGenerated/GeneratedTest.Test/nnapi_sample_all_add BEGIN
    ...
    I VtsHalNeuralnetworksV1_2TargetTest: [Test Case] TestGenerated/GeneratedTest.Test/nnapi_sample_all_add END

Bug: 159060565
Test: VtsHalNeuralnetworksV1_0TargetTest (inspected logcat output)
Test: VtsHalNeuralnetworksV1_1TargetTest (inspected logcat output)
Test: VtsHalNeuralnetworksV1_2TargetTest (inspected logcat output)
Test: VtsHalNeuralnetworksV1_3TargetTest (inspected logcat output)
Change-Id: Ic1a0c90e0853ca84dd925d0f7df65e159bb284aa
Merged-In: Ic1a0c90e0853ca84dd925d0f7df65e159bb284aa
(cherry picked from commit 8c8efd68e8)
2020-06-17 13:48:25 +01:00
Ray Kuo
525050c8e6 A2DP: Enable AAC VBR Offloading
Bug: 155826682
Test: Manual
Change-Id: I55df55bbad18ab561493ec9d4d930345056d8c72
2020-06-17 20:25:40 +08:00
Treehugger Robot
1656988ce4 Merge "Fix the failed case for the VtsHalRadioV1_5TargetTest.PerInstance/RadioHidlTest_v1_5# sendCdmaSmsExpectMore/0_slot1" am: 6d4d3a20da
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1325730

Change-Id: I42607322b7f859e8a95b1a53a9dac05f06c1d226
2020-06-16 22:36:58 +00:00
Treehugger Robot
6d4d3a20da Merge "Fix the failed case for the VtsHalRadioV1_5TargetTest.PerInstance/RadioHidlTest_v1_5# sendCdmaSmsExpectMore/0_slot1" 2020-06-16 22:13:04 +00:00
David Zeuthen
2768f74d50 Identity: Statically link VTS test binary. am: baa41d7945
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1333930

Change-Id: Ie74d5d440df425e4b38687b661d5ba16ee1d0e7a
2020-06-15 13:47:26 +00:00
David Zeuthen
baa41d7945 Identity: Statically link VTS test binary.
The VTS test was dynamically linking some libraries not normally
present on an Android system. Statically link these libraries instead.

Bug: 158150767
Test: atest VtsHalIdentityTargetTest
Change-Id: Ida85ca8835d0243c47f451ccdfa0d11d29ec1bdb
2020-06-12 14:52:37 -04:00
Henry Fang
98920599d9 Remove the enforce to build 32 binary am: d3fbe19e6b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1329537

Change-Id: I75a3cacaf501dfd3e875de5511390235c5d7030c
2020-06-10 23:46:11 +00:00
Henry Fang
d3fbe19e6b Remove the enforce to build 32 binary
cherry-pick from internal master

bug: 157096583
Test: Manual
Change-Id: Ice58cac7adf46f17606be8c4b2c3fe2e4bf1a472
Merged-In: Ice58cac7adf46f17606be8c4b2c3fe2e4bf1a472
2020-06-10 22:22:05 +00:00
yan.cao
268ddbf5a2 Fix the failed case for the
VtsHalRadioV1_5TargetTest.PerInstance/RadioHidlTest_v1_5#
sendCdmaSmsExpectMore/0_slot1

Sendcdmasexpectmoreresponse to the request sendcdmasexpectmore
did not accept the return parameter responseinfo, which caused
the VTS system to wait for a response until it exceeded 60 seconds,
and the VTS determined No test results.
so we can add parameters to receive the parameters of
sendcdmasexpectmoreresponse,and then make subsequent judgment.

Bug: 158542706
Test: run vts -m VtsHalRadioV1_5TargetTest
Change-Id: I1d6214f58850d707520b80634cb93d0e0cc712bb
2020-06-09 18:12:46 +08:00
Xin Li
75a66030ae [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: e129db1ac2 -s ours
am skip reason: Change-Id I967cf8d0f42ec2b9745ce7bd95c7762e032c90d0 with SHA-1 8743730642 is in history

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

Change-Id: I1b5feaea48a8f5293b1bc38e510d725d69deaca6
2020-06-08 15:56:54 +00:00
Xin Li
e129db1ac2 Merge "Merge QQ3A.200605.002 into master" 2020-06-06 01:41:11 +00:00
Treehugger Robot
c31600a243 Merge "Update Identity Credential VTS tests." am: 17ec80b638
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1322407

Change-Id: I6ff5d40629c6754897f8eb3f11010966dfb93190
2020-06-05 13:50:24 +00:00
Treehugger Robot
17ec80b638 Merge "Update Identity Credential VTS tests." 2020-06-05 13:36:47 +00:00
David Zeuthen
ef7395127f Update Identity Credential VTS tests.
These updates are based on input/experiences implementing this
HAL. There are no API changes.

 - Specify that the validity for credentialKey certificate shall be
   from current time and expire at the same time as the attestation
   batch certificate.

 - Require challenge passed to getAttestationCertificate() is
   non-empty.

 - Fix bug in VTS tests where the startPersonlization() result was not
   checked.

 - Remove verifyStartPersonalizationZero test since it cannot be
   completed.

 - Ensure secureUserId is non-zero if user authentication is needed.

 - Specify format for signingKeyBlob in generateSigningKeyPair() same
   way we do for credentialData in finishAddingEntries().

 - Modify EndToEndTest to decrypt/unpack credentialData to obtain
   credentialPrivKey and storageKey and do cross-checks on these.

 - Modify EndToEndTest to decrypt/unpack signingKeyBlob to obtain
   signingKeyPriv and check it matches the public key in the returned
   certificate.

 - Add new VTS tests for user and reader authentication.

 - Relax unnecessary requirements about SessionTranscript structure -
   just require it has X and Y of the ephemeral key created earlier.

 - Allow calls in VTS tests to v2 HAL to fail - this should allow
   these VTS tests to pass on a compliant v1 HAL.

Bug: 156911917
Bug: 158107945
Test: atest VtsHalIdentityTargetTest
Test: atest android.security.identity.cts
Change-Id: I11b79dbd57b1830609c70301fea9c99f9e5080cb
2020-06-04 16:46:54 -04:00
Xin Li
ca126e53d5 Merge QQ3A.200605.002 into master
Bug: 158095402
Merged-In: I967cf8d0f42ec2b9745ce7bd95c7762e032c90d0
Change-Id: I3104c43c60c68ef1206d90858d4aaffa26a860c7
2020-06-03 10:45:04 -07:00
Xusong Wang
8743730642 Add checks of output shapes when OUTPUT_INSUFFICIENT_SIZE. am: 91521ab86b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1308498

Change-Id: I967cf8d0f42ec2b9745ce7bd95c7762e032c90d0
2020-06-03 00:51:43 +00:00
Xusong Wang
91521ab86b Add checks of output shapes when OUTPUT_INSUFFICIENT_SIZE.
Add checks that all returned output dimensions must be at
least as fully specified as the union of the information about the
corresponding operand in the model and in the request.

Bug: 154054474
Test: VTS
Change-Id: I934d084c7665160a98da9828604ce8297fef73b8
Merged-In: I934d084c7665160a98da9828604ce8297fef73b8
(cherry picked from commit d454751e00)
2020-06-02 16:52:56 -07:00
Shawn Willden
5ffa73290d Fix delivery of earlyBootEnded to KM4.1 am: a2a6a33ea9
Original change: undetermined

Change-Id: I80dfc835a8d4b92561e090375ea6343c11734bb8
2020-06-02 04:01:17 +00:00
Shawn Willden
a2a6a33ea9 Fix delivery of earlyBootEnded to KM4.1
Bug: 152932559
Test: Boot and observe that Strongbox gets the message
Merged-In: I752b44f5cc20d85bf819188ccaaf0813a5607ba5
Change-Id: I752b44f5cc20d85bf819188ccaaf0813a5607ba5
2020-06-01 14:08:39 -06:00
Orion Hodson
28c170427e Merge "Add dependency on jni_headers" am: d2985135d6
Change-Id: Ibd4542573f6cb148141b2834b16178cc09102a0f
2020-06-01 09:39:14 +00:00
Orion Hodson
d2985135d6 Merge "Add dependency on jni_headers" 2020-06-01 09:20:10 +00:00
Bowgo Tsai
767b4b3c2a Allow unlocked in VTS am: 43dd6e34bd
Change-Id: I91e5f63351c465aee0f4fe829d2fd4c003cd55f1
2020-06-01 04:03:29 +00:00
Bowgo Tsai
43dd6e34bd Allow unlocked in VTS
VTS was running on a userdebug build GSI before Android 10.
Starting from Android 10, VTS is switched to running on top of a
user build GSI image, plus the device-specific boot-debug.img to
allow adb root.

   https://source.android.com/compatibility/vts/vts-on-gsi

So 'ro.build.type' will be 'user' because the value comes from
/system/build.prop. Switching to using 'ro.debuggable' to decide
whether we should check the device is locked or not. Note that
'ro.debuggable' will be '1' for userdebug/eng images or when a
boot-debug.img is used.

Bug: 154449286
Test: atest VtsHalKeymasterV4_0TargetTest
Change-Id: If5a90d62f77489aa58f96e908553a052cf6d1e18
2020-05-29 07:49:11 +00:00