Commit graph

7589 commits

Author SHA1 Message Date
Edwin Wong
0182fc2c24 Merge "Fix VtsHalDrmV1_0Target clearkey tests." into oc-mr1-dev am: d85a098767
am: cd6c66c430

Change-Id: Ie2c9939fa3b9f26cd9c0f64006fd8f9912f795cd
2017-10-04 16:47:42 +00:00
Edwin Wong
cd6c66c430 Merge "Fix VtsHalDrmV1_0Target clearkey tests." into oc-mr1-dev
am: d85a098767

Change-Id: I29d4ea563a7d855bfd07c4624faf0d89577d6515
2017-10-04 16:42:47 +00:00
TreeHugger Robot
d85a098767 Merge "Fix VtsHalDrmV1_0Target clearkey tests." into oc-mr1-dev 2017-10-04 16:38:02 +00:00
Zhuoyao Zhang
7d92b7db6b Merge "Move android.hardware.tests.libhwbinder@1.0-impl to system.img" into oc-mr1-dev am: 8f56a378bf -s ours
am: 23b9027c00  -s ours

Change-Id: I8e26bae3ed4e7c7d8a554bed9fc02ec8e758f2d6
2017-10-04 13:55:09 +00:00
Zhuoyao Zhang
23b9027c00 Merge "Move android.hardware.tests.libhwbinder@1.0-impl to system.img" into oc-mr1-dev
am: 8f56a378bf  -s ours

Change-Id: I0c9d6778503ac16ee4ced02c4c0c9660710d70a0
2017-10-04 13:47:13 +00:00
TreeHugger Robot
8f56a378bf Merge "Move android.hardware.tests.libhwbinder@1.0-impl to system.img" into oc-mr1-dev 2017-10-04 13:41:00 +00:00
Edwin Wong
48311a8c27 Fix VtsHalDrmV1_0Target clearkey tests.
1. Fix the following issues:
  - queryKeyStatus is now implemented, do not return
    ERROR_DRM_CANNOT_HANDLE anymore
  - expectedKeyRequest and knownKeyResponse should use
    '-' and '_' instead of '+' and '/' for base64Url encode;
    one uint8_t change from 0x2b to 0x2d for each vector

2. Add tests to create clearkey drm and crypto plugin using
both common pssh box format system ID and clearkey scheme
UUID.

Test: Vts test on Marlin and Taimen
  adb shell /data/nativetest/VtsHalDrmV1_0TargetTest/
  VtsHalDrmV1_0TargetTest

Test: Cts ClearKeyTest on Marlin and Taimen
  ANDROIOP= ./android-cts/tools/cts-tradefed run cts
  -m CtsMediaTestCases
  --test android.media.cts.ClearKeySystemTest

Test: ClearKey plugin unit tests
  adb shell LD_LIBRARY_PATH="/vendor/lib/mediadrm"
  /data/nativetest/ClearKeyDrmUnitTest/ClearKeyDrmUnitTest

Test: netflix and Play Movies & TV for sanity check

bug: 66327050
Change-Id: Icfbe715cf246a7c5253d5f104d0fd446618b18bd
2017-10-04 03:31:27 +00:00
Jean-Luc Brouillet
4de64f1309 Merge "Fix problem passing null optional operands." into oc-mr1-dev am: 072811f5fb
am: 4543395961

Change-Id: I6d6029753c7e5728fc49e04cf402b5c4db5d115a
2017-10-04 01:49:06 +00:00
Jean-Luc Brouillet
4543395961 Merge "Fix problem passing null optional operands." into oc-mr1-dev
am: 072811f5fb

Change-Id: I9d5094edbf5c5d9525a6549cbd3fe3d80716cfca
2017-10-04 01:44:57 +00:00
TreeHugger Robot
072811f5fb Merge "Fix problem passing null optional operands." into oc-mr1-dev 2017-10-04 01:40:37 +00:00
TreeHugger Robot
f418e1e7bb Merge changes from topics "switch_to_km_ng", "need_km_interface_fix"
* changes:
  Switch to new NG AndroidKeymaster3Device
  Fix wrong origin assumption for wrapped KM0 hals
  Reflect: Removed KeymasterEnforcement dependencies on openssl
  Software keymaster attestations return 3 as keymaster version
  Relax finish result on RSA operations
2017-10-04 01:04:32 +00:00
Michael Butler
34c7221688 Merge "NNAPI HAL: Change IEvent to explicit callbacks" into oc-mr1-dev am: 75d2b8651c
am: 20d48dff8c

Change-Id: I2d6c0511dea6bf2d3169dedcff1dd0a71393756b
2017-10-04 00:13:06 +00:00
Michael Butler
20d48dff8c Merge "NNAPI HAL: Change IEvent to explicit callbacks" into oc-mr1-dev
am: 75d2b8651c

Change-Id: I3540c1881f5c9d9a450b1357aad28687cdeae3d0
2017-10-04 00:11:24 +00:00
TreeHugger Robot
75d2b8651c Merge "NNAPI HAL: Change IEvent to explicit callbacks" into oc-mr1-dev 2017-10-04 00:07:22 +00:00
Roshan Pius
aac0f48dbe Merge "wifi(implementation): Increase stop timeout" into oc-mr1-dev am: 558d53cc61
am: b537ec5d6f

Change-Id: I6e9a1f36d85b9e9f421873e79e5df9214bf053a0
2017-10-04 00:02:03 +00:00
Roshan Pius
b537ec5d6f Merge "wifi(implementation): Increase stop timeout" into oc-mr1-dev
am: 558d53cc61

Change-Id: I806ac9ce69cada0a26e481bd121742ddbcf6f4b0
2017-10-03 23:49:11 +00:00
TreeHugger Robot
558d53cc61 Merge "wifi(implementation): Increase stop timeout" into oc-mr1-dev 2017-10-03 23:42:36 +00:00
Jean-Luc Brouillet
578b61c67e Fix problem passing null optional operands.
Allow optional operands to be specified as having no value in the model.
Make sure that both these and model arguements that have no value can
be passed to through the HAL. Change the validation to ensure that all
required ops are there.

Bug: 63905942
Test: Compiled and ran runtime/test and VTS tests.

Change-Id: Ia20954b9712042f5c0571822967521aedb66150b
2017-10-03 23:30:40 +00:00
Janis Danisevskis
5a07ed4802 Switch to new NG AndroidKeymaster3Device
Test: VtsHalKeymasterV3_0TargetTest
Bug: 67358942
Change-Id: Idc7ac599c359b3af2e4866b9eb446a05e96132a0
2017-10-03 16:13:21 -07:00
Janis Danisevskis
b17178a1a4 Fix wrong origin assumption for wrapped KM0 hals
KM0 supports only asymmetric encryption. And for those we cannot
distinguish between imported and generated keys.
This patch adds correct handling for KM0 origin tags.

Test: run vts test with wrapped km0 module from
      system/security/softkeymaster

Bug: 67358942
Bug: 67363396

Test: VtsHalKeymasterV3_0TargetTest
Change-Id: I7f5ddd21dde284dbfbd68b3b83fb75c1457dbd59
2017-10-03 16:13:21 -07:00
Janis Danisevskis
957b1dc654 Reflect: Removed KeymasterEnforcement dependencies on openssl
in system/keymaster.

Test: VtsHalKeymasterV3_0TargetTest

Bug: 67358942
Change-Id: Ie3e1fb94a299635e6c7cf45d78822b03bedf5d11
2017-10-03 16:13:21 -07:00
Janis Danisevskis
7e03f98bd2 Software keymaster attestations return 3 as keymaster version
Bug: 67358942
Bug: 67359348
Test: VtsHalKeymasterV3_0TargetTest
Change-Id: Ia04a55b407343ddddd4467c401ee2556e8fe9bd9
2017-10-03 16:13:21 -07:00
Janis Danisevskis
1235d348e6 Relax finish result on RSA operations
Some RSA operation tests expect ErrorCode::INVALID_ARGUMENT
and others ErrorCode::INVALID_INPUT_LENGTH for the same
diagnosed syndrome, i.e., the input message was too long.

This patch relaxes the expectations on one of these tests
expecting ErrorCode::INVALID_INPUT_LENGTH, to also accept the
more consistent ErrorCode::INVALID_ARGUMENT.

Bug: 67358942
Bug: 67359132
Test: VtsHalKeymasterV3_0TargetTest
Change-Id: I573d3a01b052f0256611064f23ae791007cf7122
2017-10-03 16:13:20 -07:00
Steven Moreland
6a6a71cf38 Merge "Update inheritance test implementation." am: 31fba8cd40 am: 7a5c1b6fda am: e427bde5eb
am: 303035051a

Change-Id: I46e8c5de6f37fda698e00365c01e43b052885829
2017-10-03 22:39:25 +00:00
Dan Willemsen
66d58d3656 Merge "Convert to Android.bp; rename libminijail_vendor" am: cb47aaf493 am: 6e975b1840 am: e7175b50ed
am: 537746c487

Change-Id: Ib8b4fe81cf14b1aaffc1f3635deddbd4401c69b7
2017-10-03 22:31:52 +00:00
Janis Danisevskis
02bc2768d4 Add OWNERS files to keymaster resources am: e6014f69ea am: 1ff3510d29 am: 2d83c98987
am: a0e1f49a11

Change-Id: Ic1eab465d8392c79411ce6c6097c40585748db1f
2017-10-03 22:31:13 +00:00
Steven Moreland
303035051a Merge "Update inheritance test implementation." am: 31fba8cd40 am: 7a5c1b6fda
am: e427bde5eb

Change-Id: Ibb00e5b9acae869d54aeafeac09deec2f0d51acf
2017-10-03 22:25:55 +00:00
Dan Willemsen
537746c487 Merge "Convert to Android.bp; rename libminijail_vendor" am: cb47aaf493 am: 6e975b1840
am: e7175b50ed

Change-Id: I0b3df506bc33aed78742f353e6d5863f57985db5
2017-10-03 22:24:39 +00:00
Steven Moreland
e427bde5eb Merge "Update inheritance test implementation." am: 31fba8cd40
am: 7a5c1b6fda

Change-Id: I213780758114fa5fd8891e8d1b501ae7d9e68929
2017-10-03 22:21:44 +00:00
Dan Willemsen
e7175b50ed Merge "Convert to Android.bp; rename libminijail_vendor" am: cb47aaf493
am: 6e975b1840

Change-Id: If4bfed3a048b53197fd6a7447ce7d60c78c4c384
2017-10-03 22:19:47 +00:00
Steven Moreland
7a5c1b6fda Merge "Update inheritance test implementation."
am: 31fba8cd40

Change-Id: I57935d1a08f1976d2301eee692ed823fb81bfcf4
2017-10-03 22:15:02 +00:00
Dan Willemsen
6e975b1840 Merge "Convert to Android.bp; rename libminijail_vendor"
am: cb47aaf493

Change-Id: I9a17fbb1693111074eb93519f5468020627776ba
2017-10-03 22:12:53 +00:00
Treehugger Robot
31fba8cd40 Merge "Update inheritance test implementation." 2017-10-03 21:49:34 +00:00
Janis Danisevskis
a0e1f49a11 Add OWNERS files to keymaster resources am: e6014f69ea am: 1ff3510d29
am: 2d83c98987

Change-Id: I97cc35b7736319ae679f1ff88f07bf98857acf30
2017-10-03 21:47:46 +00:00
Treehugger Robot
cb47aaf493 Merge "Convert to Android.bp; rename libminijail_vendor" 2017-10-03 21:40:55 +00:00
Janis Danisevskis
2d83c98987 Add OWNERS files to keymaster resources am: e6014f69ea
am: 1ff3510d29

Change-Id: Ida237f73875e70d9d1e24547f1e9b90de12a7729
2017-10-03 21:35:50 +00:00
Janis Danisevskis
1ff3510d29 Add OWNERS files to keymaster resources
am: e6014f69ea

Change-Id: I71c2388fd278869daa652ae10fb8b7848b6e5443
2017-10-03 21:22:58 +00:00
TreeHugger Robot
d7e247d66b Merge "Support NN dev in O-MR1." 2017-10-03 20:42:52 +00:00
Janis Danisevskis
e6014f69ea Add OWNERS files to keymaster resources
This patch adds swillden@ and jdanis@ as owners of keymaster/3.0/vts
and keymaster/3.0/default.

Test: No code changed
Change-Id: I04bc0f741e8fafd53aee7c9dd62954548b81263d
2017-10-03 13:37:19 -07:00
Steven Moreland
9d320e3fbe Update inheritance test implementation.
HIDL_FETCH_IParent returns a child object
when the "child" instance name is requested.

Bug: 67104214
Test: hidl's run_all_device_tests.sh
Change-Id: Ie4b85d657e5d066fb77832e188062af29bc2e7c6
2017-10-03 12:52:51 -07:00
Eino-Ville Talvala
da67f485d1 Camera: Update VTS for new camera@3.3 interfaces am: e224f065b8
am: 6e7079328f

Change-Id: Ic41a248e723a35071b75d58317c9c481d26508e1
2017-10-03 19:40:37 +00:00
Emilian Peev
56cf04f628 Camera: Enable VTS tests for 3.3 camera devices am: 5eb1aa3f2b
am: 316ef90e24

Change-Id: I4e4178744c719e334d9d488b7224987b7a4f8fdc
2017-10-03 19:39:27 +00:00
Eino-Ville Talvala
6e7079328f Camera: Update VTS for new camera@3.3 interfaces
am: e224f065b8

Change-Id: I9f2f442528306cc53eef23901cb65e9c8029855d
2017-10-03 19:23:03 +00:00
Emilian Peev
316ef90e24 Camera: Enable VTS tests for 3.3 camera devices
am: 5eb1aa3f2b

Change-Id: I7094bc338c603265a25dcc19831f9cb931cd30e1
2017-10-03 19:22:58 +00:00
Steven Moreland
c6bd2f4296 Support NN dev in O-MR1.
Remove downstream changes to their makefile
which can't be updated in MR1.

Test: pass
Change-Id: I7d621b0366a25d9cbeeb2a4c120d5dd6664ffa2a
2017-10-03 11:04:47 -07:00
Michael Butler
cf22a57c1a NNAPI HAL: Change IEvent to explicit callbacks
IEvent was a synchronization primitive which caused some confusion
in the interface. Originally the event object was paired with an
asynchronous task, and the asynchronous task would signal this event
when the corresponding output was ready to be used.

In the case of IDevice::prepareModel, the function call would return an
IPreparedModel object that was not guaranteed to be prepared until the
runtime had returned from waiting on the corresponding event object.
The event object has been changed to two explicit callbacks--
IPreparedModelCallback and IExecutionCallback. Now,
IDevice::prepareModel no longer returns an unfinished IPreparedModel;
instead, it will pass the IPreparedModel object to the runtime through
IPreparedModelCallback::notify. When the runtime retreives the
IPreparedModel object, the asynchronous task has already finished
preparing the model.

The two callbacks are used for different purposes. Each has its own
version of notify to pass the data back to the runtime:
* IPreparedModelCallback::notify(ErrorStatus, IPreparedModel)
* IExecutionCallback::notify(ErrorStatus)

Bug: 63905942
Test: mm, vts, ml/nn/runtime/tests
Change-Id: I0c88cd262ba762e0af15e9da31ebe813a5d150b2
2017-10-03 18:01:29 +00:00
Eino-Ville Talvala
e224f065b8 Camera: Update VTS for new camera@3.3 interfaces
- Cross check device version in name with ICameraDeviceSession version
- Switch all calls to configureStreams to configureStreams_3_3 when
  a v3.3 ICameraDeviceSession is available

Test: Test passes on v3.3 devices, doesn't regress on v3.2
Bug: 62358514
Change-Id: I7450e5d5119c5ec1fe9f1360bfc99fc8a47d0936
2017-10-02 12:35:32 -07:00
Emilian Peev
5eb1aa3f2b Camera: Enable VTS tests for 3.3 camera devices
A new 3.3 Camera device API is available and devices supporting it
need to be tested as well.

Bug: 67028051
Test: run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO

For passthrough devices: run commandAndExit vts
--skip-all-system-status-check --skip-preconditions --abi armeabi-v7a
--module VtsHalCameraProviderV2_4Target -l INFO

Change-Id: I91adb3c1867cdd8f8f810a2bd5b0a8ba2b0c1fcf
2017-10-02 11:02:16 -07:00
Ram Mohan M
7fe35b2d4a Merge "omxvts: fix binary for 64bit platforms" into oc-mr1-dev am: 7e0286404a
am: db285e9390

Change-Id: I2e79899adf6599684815bea6f6f6a9aaed41de4c
2017-10-01 23:14:48 +00:00
Ram Mohan M
969e586842 Merge "omxvts: misplaced lock can cause race condition" into oc-mr1-dev am: 99c319f781
am: d1817707b7

Change-Id: I3284ba15562b3aab4b705e5f1c776a5169d143bd
2017-10-01 23:14:12 +00:00