Commit graph

27745 commits

Author SHA1 Message Date
Satya Tangirala
38b3bcee7f Merge "Keystore 2.0: add convertStorageKeyToEphemeral() to IKeymintDevice" 2021-03-24 03:43:38 +00:00
Satya Tangirala
c757c1ba39 Keystore 2.0: add convertStorageKeyToEphemeral() to IKeymintDevice
Add a function convertStorageKeyToEphemeral to IKeymintDevice that vold
can use to get a per-boot ephemeral key from a wrapped storage key.

Bug: 181806377
Bug: 181910578
Change-Id: I1b008423e3e24797132c8eb79ab3899e2b1c68e8
2021-03-22 17:39:36 -07:00
Janis Danisevskis
442a08d3ee security.sharedsecret: Add rust derives and fix docs.
Add rust derives to SecretSharingParameters.

Also fix some comments.

Test: N/A
Change-Id: Id3f02744d2880e59c678d781344bcbb83e8c8864
2021-03-22 15:35:38 -07:00
Treehugger Robot
2d56123a87 Merge "Security: Provide generated java sources." 2021-03-22 22:31:56 +00:00
Henry Fang
edd9dea02c Merge "Close stream at end of OpenAnOpenedStreamsTest" 2021-03-22 21:29:12 +00:00
Janis Danisevskis
61eadb7ce4 Security: Provide generated java sources.
Enable generation of java sources for AIDL interfaces. This allows
enabling the @SensitiveData annotation without causing circular build
dependencies.

Also mark doc comments as @hide to prevent the interface from being
included in the SDK.

Bug: 174857732
Test: N/A
Merged-In: If00e4dfc24bf776f87c7e2b2e3f42350aa4d4379
Change-Id: If00e4dfc24bf776f87c7e2b2e3f42350aa4d4379
2021-03-22 20:02:39 +00:00
Przemyslaw Szczepaniak
e24a7e57e2 Merge changes from topic "nnapi-aidl-burst"
* changes:
  Add Burst tests to NN AIDL HAL VTS
  Add IBurst to NN AIDL HAL -- hal
  Format NN AIDL HAL
2021-03-22 17:07:23 +00:00
Treehugger Robot
a23a3613bc Merge "Move NNAPI type information to types.spec" 2021-03-22 12:42:40 +00:00
Jack Nudelman
55091e2ab4 Merge "Allow REQUEST_NOT_SUPPORTED when requesting data throttling from modem." 2021-03-22 11:38:10 +00:00
Treehugger Robot
bbc243fd44 Merge "audio: Add VTS tests for reads and writes" 2021-03-22 08:40:25 +00:00
Michael Butler
7fc7e3756d Add Burst tests to NN AIDL HAL VTS
Bug: 180492058
Bug: 177267324
Test: mma
Test: VtsHalNeuralnetworksTargetTest
Change-Id: I1744005cbf750b70b42367b81a2fa6b8f24c1904
Merged-In: I1744005cbf750b70b42367b81a2fa6b8f24c1904
(cherry picked from commit 8b7e813868)
2021-03-20 14:20:58 +00:00
Michael Butler
88e6e9e66f Add IBurst to NN AIDL HAL -- hal
Burst executions are a sequence of executions of the same prepared model
that occur in rapid succession, such as frames of a camera capture or
successive audio samples. A burst object is used to control a set of
burst executions, and to preserve resources between executions, enabling
executions to have lower overhead.

This CL has the following changes:
1) Adds an IBurst interface to the NN AIDL HAL
2) Adds IPreparedModel::configureExecutionBurst to create an IBurst
   object
3) Extends VTS's InvalidPreparedModel to implement
   configureExecutionBurst.

Bug: 180492058
Bug: 177267324
Test: mma
Test: VTS+presubmit
Change-Id: I90cb18dcc392f07f342604a7fb2edae041848251
Merged-In: I90cb18dcc392f07f342604a7fb2edae041848251
(cherry picked from commit 5dc72d5485)
2021-03-20 14:20:30 +00:00
Michael Butler
37dcda8704 Format NN AIDL HAL
There were some comment changes made to tha auto-generated AIDL files.

Bug: N/A
Test: mma
Change-Id: I1a360115b82b0c222666c5d9189a220e74390654
Merged-In: I1a360115b82b0c222666c5d9189a220e74390654
(cherry picked from commit 402497e049)
2021-03-20 14:20:07 +00:00
Mikhail Naganov
5a78d9c221 audio: Add VTS tests for reads and writes
Tests verify actual reading / writing from input and output
streams and the capture / presentation position reporting.
Tests use audio policy manager configuration.

Bug: 161253754
Test: atest VtsHalAudioV7_0TargetTest
Change-Id: I408f7ee8df8671b7496040fe5ddd8a380672c21d
2021-03-19 13:33:26 -07:00
Xusong Wang
dfefe265de Merge "Test padded request memories in VTS generated tests." 2021-03-19 17:22:50 +00:00
Mikhail Naganov
2ad6484fc7 Merge "audio: Update OWNERS" 2021-03-19 16:49:12 +00:00
Slava Shklyaev
3fd9089a0a Merge "NNAPI: Add AIDL drivers registration" 2021-03-19 10:37:23 +00:00
Mikhail Naganov
c12d5adea8 audio: Update OWNERS
Add missing OWNERS files for default implementation and
utilities code.

Remove krocard@, add ytai@ to ST HAL default implementations.

Test: N/A
Change-Id: I22734cd7382c0988d0c6001164deb775e9ae55c0
2021-03-18 23:28:58 +00:00
Treehugger Robot
40122ae511 Merge "Document the default alignment and padding value." 2021-03-18 20:38:23 +00:00
Jakub Pawlowski
e5611aa5c6 Add Hardware Offloaded provider parameters for LC3
Bug: 150670922
Tag: #feature
Test: vts-tradefed run vts -m VtsHalBluetoothAudioV2_1TargetTest
Change-Id: I362542eef2afccbcc4b2cffc214651b37a04dbf3
2021-03-18 19:27:36 +00:00
Xusong Wang
16858a6a88 Test padded request memories in VTS generated tests.
This CL modifies the VTS generated tests to specify input and output
padding.

Bug: 179691454
Test: VtsHalNeuralnetworksTargetTest
Change-Id: Iec83199d6f046203acefdbd165887943447984a9
Merged-In: Iec83199d6f046203acefdbd165887943447984a9
(cherry picked from commit a0b82f3235)
2021-03-18 10:11:14 -07:00
Max Bires
72ca1d2a40 Merge "COSE unprotected parameters are a map not a bstr" 2021-03-18 15:08:43 +00:00
Xusong Wang
62445b7d5b Document the default alignment and padding value.
This CL documents the default value of the preferred alignment and
padding for request memories.

Bug: 179799921
Test: m
Change-Id: I89c16c3e20939a0ad68d9e3b0061c4a16dc00d8b
Merged-In: I89c16c3e20939a0ad68d9e3b0061c4a16dc00d8b
(cherry picked from commit e6dcc9a38d)
2021-03-17 13:20:31 -07:00
Xusong Wang
5e4453f690 Merge "Passing padding information to the driver -- hal." 2021-03-17 20:19:18 +00:00
Yifan Hong
7665b917eb Merge "Add script to get prelim HAL VTS coverage." 2021-03-17 18:30:52 +00:00
Slava Shklyaev
6910bec12f Move NNAPI type information to types.spec
See change Ic31ed957.

The changes to the *.t files in this CL do not introduce any changes to
the generated *.hal files.

Bug: 160667417
Test: generate_api.sh
Change-Id: Ie2dbbc0fc92e52b08adc807a7f514bd8945a055f
Merged-In: Ie2dbbc0fc92e52b08adc807a7f514bd8945a055f
(cherry picked from commit 14c1f985b0)
2021-03-17 13:32:50 +00:00
Lev Proleev
2d7195fd32 NNAPI: Add AIDL drivers registration
Bug: 179015258
Test: adb shell setprop debug.nn.partition 2 && \
Test: NeuralNetworksTest_static
Change-Id: I2c8c9a49ff917b243348043df1158a8d98f131ce
Merged-In: I2c8c9a49ff917b243348043df1158a8d98f131ce
(cherry picked from commit 5f732ff683)
2021-03-17 13:32:43 +00:00
Xusong Wang
5e36ca05e7 Passing padding information to the driver -- hal.
This CL changes the sAIDL interface to enable passing padding
information of the shared memory pool to the driver.

The sAIDL interface defines the padding field explicitly in DataLocation
to make it easy to convert to/from the canonical request.

Bug: 179691454
Test: NNT_static
Test: VtsHalNeuralnetworksTargetTest
Change-Id: Ie13b421531ee4df48822086b027d94a622a3518c
Merged-In: Ie13b421531ee4df48822086b027d94a622a3518c
(cherry picked from commit 6365ea1dbb)
2021-03-17 11:39:20 +00:00
Treehugger Robot
593f0ecaf4 Merge changes from topic "aosp-nnapi-burst-compat-lib"
* changes:
  Implement full canonical Burst in NN util code
  Add canonical types adapters for NNAPI AIDL interface
  Add missing NNAPI HIDL interface mock tests
2021-03-16 20:56:34 +00:00
Satya Tangirala
cfab4c08e1 Merge "Keystore 2.0: Sync output format of generated headers" 2021-03-16 20:49:19 +00:00
Steven Moreland
3af4111932 Merge "Fix incorrect Power destruction" 2021-03-16 20:10:04 +00:00
Shuo Qian
b840a0cdd3 Merge "Fix emergencyDialResponse in VTS 1.6" 2021-03-16 19:42:56 +00:00
Michael Butler
76e491fa46 Implement full canonical Burst in NN util code
Bug: 180492058
Bug: 177267324
Test: mma
Test: presubmit
Change-Id: I5018f6cf2dbaf705f74f4f46318142c64433e19d
Merged-In: I5018f6cf2dbaf705f74f4f46318142c64433e19d
(cherry picked from commit acff4063b6)
2021-03-16 11:57:19 -07:00
Lev Proleev
900c28a250 Add canonical types adapters for NNAPI AIDL interface
Also:
* Add missing AIDL<->CT conversions
* Add AIDL-specific info to neuralnetworks/utils/README.md
* Add mock classes and tests AIDL adapters

Bug: 179015258
Test: neuralnetworks_utils_hal_test
Change-Id: Ifa98fadd46dca5dbf9b3ceb4da811aa8da45b6e4
Merged-In: Ifa98fadd46dca5dbf9b3ceb4da811aa8da45b6e4
(cherry picked from commit 3b93b0b56a)
2021-03-16 11:57:04 -07:00
Lev Proleev
7b0b54697c Add missing NNAPI HIDL interface mock tests
prepareModelFromCache* was tested for handling of errors happening
during the preparation launch but not during the actual preparation.

Bug: 163801800
Test: mma
Test: atest neuralnetworks_utils_hal_common_test
Test: atest neuralnetworks_utils_hal_1_[0-3]_test
Change-Id: I2c4b235fd4877238d7a18be8b0ea051434c1df6b
Merged-In: I2c4b235fd4877238d7a18be8b0ea051434c1df6b
(cherry picked from commit c6cf50ad42)
2021-03-16 11:56:47 -07:00
Yifan Hong
0077a9d530 Add script to get prelim HAL VTS coverage.
See help message for example usage.

Test: doctest
Test: run with and without --csv
Bug: 182810953
Change-Id: I6a4be9b543622618e2c594ba08a75534c60f3136
2021-03-15 17:23:20 -07:00
Mikhail Naganov
f1fa44dd91 Merge "audio: Use strings for EffectDescriptor.{name|implementor}" 2021-03-15 23:39:25 +00:00
Jintao Zhu
9f9047c7d7 Fix incorrect Power destruction
(1) As the following call chain indicating, mModule is indeed not pointing to heap memory object, trying to delete it is illegal.
      HIDL_FETCH_IPower -> hw_get_module -> hw_get_module_by_class -> load(hardware/libhardware/hardware.c)

(2) Fix by removing 'delete'

Test: monkey test

Signed-off-by: Jintao Zhu <zhujtcsieee@gmail.com>
Signed-off-by: Steven Moreland <smoreland@google.com>
Change-Id: If95bd8823354cd862d105b96101f910dc1ca95a6
2021-03-15 23:32:45 +00:00
Shuo Qian
2b254862a7 Fix emergencyDialResponse in VTS 1.6
Test: vts
Bug: 182496282
Change-Id: Ifdd60210ec30dd0a576cb366ad49c9bfe1924938
2021-03-15 23:21:46 +00:00
Satya Tangirala
66e371f3d6 Keystore 2.0: Sync output format of generated headers
The output format of headers generated by
"m android.hardware.security.keymint-update-api" has changed. This patch
updates the format of those generated files in the tree.

Change-Id: If00a194f136c67197c96081b3c211d615fad5f07
2021-03-15 14:43:14 -07:00
Jack Nudelman
ace227242e Allow REQUEST_NOT_SUPPORTED when requesting data throttling from modem.
Test: make
Bug: 173806949
Change-Id: Icbf1febdc489e8b8cea91fcc4a149afafb01b1b9
2021-03-15 10:43:46 -07:00
David Drysdale
31a2b56ca2 COSE unprotected parameters are a map not a bstr
As per RFC 8152 section 3, the unprotected parameters in the headers
of COSE objects are just encoded as a map, not as a bstr that contains
the CBOR-encoding of a map.

Test: TreeHugger presubmit
Change-Id: Id4eeb023d3a81ad1398d78d410c8224bf941f9b1
2021-03-15 14:56:29 +00:00
Sooraj Sasindran
5cfbacbb7c Merge "ALLOW REQUEST_NOT_SUPPORTED for nr dual connectivity config" 2021-03-15 04:38:24 +00:00
Roman Kiryanov
03fb28b9fc Merge "Use ro.boot.qemu to check if the device is an emulator" 2021-03-13 01:27:30 +00:00
Mikhail Naganov
660a86de6a audio: Use strings for EffectDescriptor.{name|implementor}
The use of fixed size char arrays was a direct copy
of the C structure approach. In HIDL, the canonical approach
is to use strings.

Bug: 181883090
Test: atest android.hardware.audio.effect@7.0-util_tests
Change-Id: I468810e07e5ba8b3bd6f03c5acfa24009ef2e48a
2021-03-13 00:07:59 +00:00
Sooraj Sasindran
4b272a5b68 ALLOW REQUEST_NOT_SUPPORTED for nr dual connectivity config
ALLOW REQUEST_NOT_SUPPORTED for nr dual connectivity configuration
and query

Bug: 181648176
Test: build
Change-Id: Iaa64b018a07367ea9d68783ecec1ea1a616ad6b4
2021-03-12 13:34:48 -08:00
Yiwei Zhang
5aae5cb79d Enable cpp support for IPowerStats AIDL interface
Bug: 178219601
Test: build
Change-Id: If29ff4760da866e91471874e17c1288be7877e27
2021-03-12 00:53:08 +00:00
Treehugger Robot
df3a0dcaeb Merge "Simplify slicing related structs." 2021-03-12 00:25:17 +00:00
Benjamin Schwartz
777542355a Merge "power/stats: Return exception codes on error" 2021-03-11 23:49:49 +00:00
Benjamin Schwartz
be0e2ed7ae power/stats: Return exception codes on error
Bug: 182406354
Bug: 181598864
Test: Presubmit
Change-Id: I00d359ce400d52e774ea43f1330b85775414f88c
2021-03-11 10:47:51 -08:00