Commit graph

21760 commits

Author SHA1 Message Date
Shawn Willden
8883f515b1 [automerger skipped] Fix delivery of earlyBootEnded to KM4.1 am: a2a6a33ea9 am: 5ffa73290d -s ours
am skip reason: Change-Id I752b44f5cc20d85bf819188ccaaf0813a5607ba5 with SHA-1 08c7e71236 is in history

Original change: undetermined

Change-Id: I4d28a2a9cb0cb34a42601c7e54857033a6159025
2020-06-02 04:19:20 +00: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
TreeHugger Robot
b2402c7664 Merge "Implemented CREATE_USER and REMOVE_USER on VHAL reference implementation." into rvc-dev am: d7940ccf2f
Original change: undetermined

Change-Id: Ied7f3e3938ce9ee321f9f7907f73d5eaf20b3560
2020-06-02 00:32:14 +00:00
TreeHugger Robot
d7940ccf2f Merge "Implemented CREATE_USER and REMOVE_USER on VHAL reference implementation." into rvc-dev 2020-06-02 00:06:56 +00:00
Jayant Chowdhary
46a82de871 Merge changes from topic "vts-secure-only-camera" into rvc-dev am: ec37ce4947
Original change: undetermined

Change-Id: I7f99fe08f74082881ecdbe38daa8b21ebbc8dacd
2020-06-01 23:02:55 +00:00
Jayant Chowdhary
ec37ce4947 Merge changes from topic "vts-secure-only-camera" into rvc-dev
* changes:
  Camera VTS: Add a minimal test for secure only cameras.
  camera vts: Skip regular vts tests for secure only cameras.
2020-06-01 22:52:53 +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
Jayant Chowdhary
a80974ca8c Camera VTS: Add a minimal test for secure only cameras.
Bug: 156749607

Test: VtsHalCameraProviderV2_4TargetTest
      --gtest_filter=PerInstance/CameraHidlTest.processSecureCaptureRequest* on device which
      SECURE_IMAGE_DATA.

Change-Id: I57f6210b69b383dc4f43cc4ee8272050a0432541
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-06-01 12:15:58 -07:00
Jayant Chowdhary
83b724a23f camera vts: Skip regular vts tests for secure only cameras.
Bug: 156749607

Test: fake mark a camera id as a secure only, see that it doesn't get
      tested unless a test calls getCameraDeviceNames with addSecure = true

Test: VtsHalCameraProviderV2_4TargetTest passes on device without any secure only
      cameras

Change-Id: Ibe428b663bd8024f46f0273ed5dfaa108a90dd43
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-06-01 12:14:47 -07:00
Orion Hodson
293821e269 Merge "Add dependency on jni_headers" am: d2985135d6 am: 28c170427e
Change-Id: I71d75eda1c74b7bfb43b243980dfe188094ea6ce
2020-06-01 09:58:44 +00: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
40eb1a490b Allow unlocked in VTS am: 43dd6e34bd am: 767b4b3c2a
Change-Id: Ia559b9083b1ac7960b93f710fc5cb2d5390dfac7
2020-06-01 04:25:02 +00:00
Bowgo Tsai
767b4b3c2a Allow unlocked in VTS am: 43dd6e34bd
Change-Id: I91e5f63351c465aee0f4fe829d2fd4c003cd55f1
2020-06-01 04:03:29 +00:00
Amy Zhang
484bbd0755 Merge "Add DescramberTests in Tuner VTS" into rvc-dev am: b035b6a80f
Change-Id: Idcb6603a6d324f5c318a9efa3dfc497eb01a3e93
2020-05-30 01:11:31 +00:00
Amy Zhang
b035b6a80f Merge "Add DescramberTests in Tuner VTS" into rvc-dev 2020-05-30 00:57:29 +00:00
Amy Zhang
fd7c644470 Add DescramberTests in Tuner VTS
Note that this test also includes MediaCasService openSession test
to pass the session id as the key token to the IDescrambler

Test: atest VtsHalTvTunerV1_0TargetTest
Bug: 150987138
Change-Id: Iacd4ad5fcd957a6e3bb4a5730337ecaa3adc0aa2
2020-05-29 16:35:18 -07:00
Selene Huang
95b475661f [automerger skipped] Add attestation certificate parsing and validate for IC vts. am: 57b3479394 -s ours
am skip reason: Change-Id Ibe770e6eaf0b0018d60876926d824204e4eaf732 with SHA-1 cab019aae5 is in history

Change-Id: Icda771e7c01bd1bc2543ffb7e03ac76aaaa9f78f
2020-05-29 21:39:19 +00:00
Selene Huang
57b3479394 Add attestation certificate parsing and validate for IC vts.
- Added attestation certificate parsing support.
 - Added various certificate conversion support.
 - Added certification verification support.
 - Added tests for the attestation certificate verification.
 - Updated the old tests to use the new attestation validation
   implementation.
 - Updated GenerateReaderCertificate to use pointer reader private key.

Bug: 154909726
Test: VtsHalIdentityTargetTest
Test: atest android.security.identity.cts
Merged-In: Ibe770e6eaf0b0018d60876926d824204e4eaf732
Change-Id: I07c2eaf92ed60fa31761816c4b45684806c3305e
2020-05-29 15:50:55 -04:00
Selene Huang
29a26add4d [automerger skipped] Add attestation certificate parsing and validate for IC vts. am: 38ca6961e3 -s ours
am skip reason: Change-Id Ibe770e6eaf0b0018d60876926d824204e4eaf732 with SHA-1 cab019aae5 is in history

Change-Id: Ie01a0cb16b925f6224c0c0d5268ee7d366c3038c
2020-05-29 17:39:03 +00:00
Selene Huang
38ca6961e3 Add attestation certificate parsing and validate for IC vts.
- Added attestation certificate parsing support.
 - Added various certificate conversion support.
 - Added certification verification support.
 - Added tests for the attestation certificate verification.
 - Updated the old tests to use the new attestation validation
   implementation.
 - Updated GenerateReaderCertificate to use pointer reader private key.

Bug: 154909726
Test: VtsHalIdentityTargetTest
Test: atest android.security.identity.cts
Merged-In: Ibe770e6eaf0b0018d60876926d824204e4eaf732
Change-Id: I5d87622cc43241d1e2de59cd1c0f33630e4fcbab
2020-05-29 12:10:57 -04: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
David Zeuthen
e3a111553b [automerger skipped] Merge changes from topic "ic-hal-v2-rvc" into rvc-dev am: fc7b29c5a0 -s ours
am skip reason: Change-Id I7d05413a9ec70225ce419079f3cc9daf026cf744 with SHA-1 a8ed82cbb4 is in history

Change-Id: I8d11d00557c47311495895b6ae889225b48c8c84
2020-05-28 23:36:09 +00:00
David Zeuthen
fc7b29c5a0 Merge changes from topic "ic-hal-v2-rvc" into rvc-dev
* changes:
  Identity Credential: Add method to accept verification token.
  Identity Credential: Pass additional information to HAL.
2020-05-28 22:04:19 +00:00
felipeal
d1803412f6 Implemented CREATE_USER and REMOVE_USER on VHAL reference implementation.
Test: adb shell lshal debug android.hardware.automotive.vehicle@2.0::IVehicle/default --set 299896585 a 1 i 666 i 1 && \
      adb shell lshal debug android.hardware.automotive.vehicle@2.0::IVehicle/default --user-hal

Bug: 150408921
Bug: 150409600

Change-Id: If971c262ecaba604f55582b3ef0a850410d82ff9
2020-05-28 14:47:02 -07:00
Treehugger Robot
b366abb31d [automerger skipped] Merge "Fix GnssMeasurement state range check" am: 43f1d331e3 am: 249b63ced6 -s ours
am skip reason: Change-Id I72f4bf1f09d6271ac6367abc3972ee7747b18155 with SHA-1 15570c4681 is in history

Change-Id: I7b3f578bd2e5083da9390f995b5e4daa32176172
2020-05-27 23:09:55 +00:00
Treehugger Robot
249b63ced6 Merge "Fix GnssMeasurement state range check" am: 43f1d331e3
Change-Id: I245b97dd441e20e59116e3090fd55f3e8ca68307
2020-05-27 22:37:33 +00:00
Treehugger Robot
43f1d331e3 Merge "Fix GnssMeasurement state range check" 2020-05-27 22:22:40 +00:00
TreeHugger Robot
a960704555 Merge "Camera: Allow maxDigitalZoom to be less than maxZoomRatio" into rvc-dev am: 25ff02b703
Change-Id: I81abe5918742929ebe7fd2d19415757d9f27d3e1
2020-05-27 21:36:38 +00:00
TreeHugger Robot
25ff02b703 Merge "Camera: Allow maxDigitalZoom to be less than maxZoomRatio" into rvc-dev 2020-05-27 21:13:33 +00:00
Shuzhen Wang
1d4e72f387 Camera: Allow maxDigitalZoom to be less than maxZoomRatio
For concurrent camera, we allow the maximum digital zoom to be smaller
than the maximum zoom ratio. Adjust VTS test accordingly.

Test: camera VTS test
Bug: 151891611
Change-Id: I1d3813ed93faa83689dcb6a83490fae5581c602f
2020-05-27 12:04:38 -07:00
Elliott Hughes
6143a22320 Use libcutils' host implementation directly. am: 69a08536c2 am: 95d8258b56
Change-Id: I6df2507da17f6b86a613d5265375e491ab8d9894
2020-05-27 17:17:05 +00:00
Elliott Hughes
95d8258b56 Use libcutils' host implementation directly. am: 69a08536c2
Change-Id: If7529366b4d4ff5d350f544f076d10b171e69f54
2020-05-27 17:06:05 +00:00
Orion Hodson
0f8403f606 Add dependency on jni_headers
Preparation for removing implicit include paths for jni.h from soong.

Bug: 152482542
Test: Apply future soong change && m checkbuild
Change-Id: I880eb1f307d995cbd4f0f19e8f8d22c20fc36bef
Merged-In: I880eb1f307d995cbd4f0f19e8f8d22c20fc36bef
Exempt-From-Owner-Approval: build clean-up
(cherry picked from commit 43c1a6a41c)
2020-05-27 17:29:42 +01:00
Xusong Wang
42f198d6eb Merge "Add checks of output shapes when OUTPUT_INSUFFICIENT_SIZE." into rvc-dev am: a5c54b6990
Change-Id: Ia9784a90147a48c64133e3165cb3d02b595fb4ee
2020-05-27 00:30:54 +00:00
Xusong Wang
a5c54b6990 Merge "Add checks of output shapes when OUTPUT_INSUFFICIENT_SIZE." into rvc-dev 2020-05-26 23:56:26 +00:00
Xusong Wang
d454751e00 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
2020-05-26 15:08:12 -07:00
Yu-Han Yang
4f21df3b44 Fix GnssMeasurement state range check
Bug: 157463010
Test: atest VtsHalGnssV2_0TestTarget
Change-Id: I72f4bf1f09d6271ac6367abc3972ee7747b18155
(cherry picked from commit 51d8defb3c)
Merged-In: I72f4bf1f09d6271ac6367abc3972ee7747b18155
2020-05-26 21:22:42 +00:00
TreeHugger Robot
a86a057a8e Merge "Fix GnssMeasurement state range check" into rvc-dev am: 6df119f6a9
Change-Id: Ic6843a2bef8d24f9ba3a5f30c2b72260c54ee768
2020-05-26 20:07:58 +00:00
TreeHugger Robot
6df119f6a9 Merge "Fix GnssMeasurement state range check" into rvc-dev 2020-05-26 19:54:56 +00:00
Yu-Han Yang
15570c4681 Fix GnssMeasurement state range check
Bug: 157463010
Test: atest VtsHalGnssV2_0TestTarget
Change-Id: I72f4bf1f09d6271ac6367abc3972ee7747b18155
2020-05-26 11:07:24 -07:00
TreeHugger Robot
fe6dec9f22 Merge "gralloc4-vts: Allow getFromBufferDescriptorInfo return unsupported" into rvc-dev am: 5f0ce20538
Change-Id: If11bf8b0f2c728199c95b032785af63ef8e2134f
2020-05-25 02:49:51 +00:00
TreeHugger Robot
5f0ce20538 Merge "gralloc4-vts: Allow getFromBufferDescriptorInfo return unsupported" into rvc-dev 2020-05-25 02:33:51 +00:00
Nate Jiang
9f1854e292 Merge "Fix NAN validate interface existence" into rvc-dev am: 8fce7985c0
Change-Id: I9c85385771a46c3040c35c4fc6565a9ec0b60466
2020-05-21 20:12:10 +00:00
Jooyung Han
b3310b3667 Set min_sdk_version to be part of mainline modules am: 350467dac3
Change-Id: Icd49e7d76c50b7bb676a86dfa7f2a78606c5a2f8
2020-05-21 20:10:31 +00:00
Nate Jiang
8fce7985c0 Merge "Fix NAN validate interface existence" into rvc-dev 2020-05-21 20:08:10 +00:00
Jooyung Han
350467dac3 Set min_sdk_version to be part of mainline modules
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Change-Id: Ie6912167932812afb6e5f1ef5325ce7997cd04ae
2020-05-21 22:58:23 +09:00
Yichi Chen
e4f244e26b gralloc4-vts: Allow getFromBufferDescriptorInfo return unsupported
According to the definition of getFromBufferDescriptorInfo, UNSUPPORTED
should be returned if the requested metadata is not defined until a
buffer has been allocated. Before we clarify the necessary metadata,
the patch allows all of them return unsupported.

Bug: 155626288
Test: VtsHalGraphicsMapperV4_0Target

Change-Id: I42a3b07b0b60ca555ebe949bbac0dd68d4e06231
2020-05-21 20:39:21 +08:00
Nate Jiang
63f34eda73 Fix NAN validate interface existence
Bug: 156879576
Test: atest android.hardware.wifi@1.0-service-tests

Change-Id: I8505e343f5b2ea5ea522cbb2ea344ff8914aea3d
2020-05-21 00:01:51 -07:00
TreeHugger Robot
4bbc06b543 [automerger skipped] Merge "Re-enable boot HAL tests and make sure they restore previous slot flags." into rvc-dev am: c669b6bd89 -s ours
am skip reason: Change-Id Icff45d3949d0ad76d22bdf8830c0903e81027b6e with SHA-1 d028b91f4a is in history

Change-Id: I174694f9edb6d03527f1df2c5248270af75f501e
2020-05-20 17:37:10 +00:00