Commit graph

28006 commits

Author SHA1 Message Date
Max Bires
7503f1c86e Merge "COSE unprotected parameters are a map not a bstr" am: 72ca1d2a40 am: ae5a2b8454
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1635692

Change-Id: I637a911e55f1a99d754100364ae16c2776d6e4a1
2021-03-18 16:30:07 +00:00
Max Bires
ae5a2b8454 Merge "COSE unprotected parameters are a map not a bstr" am: 72ca1d2a40
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1635692

Change-Id: I271f6f93695eaacbe59b1fb1a79f2ae1bbf896e7
2021-03-18 15:48:01 +00:00
Max Bires
72ca1d2a40 Merge "COSE unprotected parameters are a map not a bstr" 2021-03-18 15:08:43 +00:00
Xusong Wang
15cc44d705 Merge "Passing padding information to the driver -- hal." am: 5e4453f690 am: af57c4d071
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1637742

Change-Id: I1f174a5add49b9e873f4c406bb23ca4bcc50913f
2021-03-17 20:51:01 +00:00
Yifan Hong
2080fc051f Merge "Add script to get prelim HAL VTS coverage." am: 7665b917eb am: 0b52b10a1e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1637743

Change-Id: I1acae54b8990611f52989cdc49c779b7e87e10f8
2021-03-17 20:50:22 +00:00
Xusong Wang
af57c4d071 Merge "Passing padding information to the driver -- hal." am: 5e4453f690
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1637742

Change-Id: Id2fa960edfbf33fd7946e96e3fe1fc030d875840
2021-03-17 20:48:54 +00:00
Xusong Wang
5e4453f690 Merge "Passing padding information to the driver -- hal." 2021-03-17 20:19:18 +00:00
Yifan Hong
0b52b10a1e Merge "Add script to get prelim HAL VTS coverage." am: 7665b917eb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1637743

Change-Id: I3841464a3bf2cea2b375d83ed211b05932a65d10
2021-03-17 19:43:22 +00:00
Yifan Hong
7665b917eb Merge "Add script to get prelim HAL VTS coverage." 2021-03-17 18:30:52 +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
01d802c729 Merge changes from topic "aosp-nnapi-burst-compat-lib" am: 593f0ecaf4 am: 226d3a6848
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1640843

Change-Id: I3da44f1167fc6d233ba0ef2c8935184f27fd0cf1
2021-03-16 22:17:30 +00:00
Lev Proleev
8dbed29e45 Add canonical types adapters for NNAPI AIDL interface am: 900c28a250 am: 1bca9ab315
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1640842

Change-Id: I7ca57555148ca7768beac642891e589d8e21b528
2021-03-16 22:17:28 +00:00
Lev Proleev
7e21641013 Add missing NNAPI HIDL interface mock tests am: 7b0b54697c am: faa3ea2821
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1640841

Change-Id: Ie788e56dd6783834732acd98e320d5ea6397e1f2
2021-03-16 22:17:25 +00:00
Satya Tangirala
b1aefbe001 Merge "Keystore 2.0: Sync output format of generated headers" am: cfab4c08e1 am: 87ac3808d8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1622544

Change-Id: I8d764396c26905adafc4d00f186dee1d399a999e
2021-03-16 22:16:49 +00:00
Treehugger Robot
226d3a6848 Merge changes from topic "aosp-nnapi-burst-compat-lib" am: 593f0ecaf4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1640843

Change-Id: I892a18e83e3f68f59ec3c9d3343ceb2d90e86903
2021-03-16 21:37:58 +00:00
Lev Proleev
1bca9ab315 Add canonical types adapters for NNAPI AIDL interface am: 900c28a250
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1640842

Change-Id: I6077cc5a7adf58582ba25773e954a8c06b5019fe
2021-03-16 21:37:53 +00:00
Lev Proleev
faa3ea2821 Add missing NNAPI HIDL interface mock tests am: 7b0b54697c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1640841

Change-Id: I5815732368e765807b4b92a9224aa032b74d3894
2021-03-16 21:37:49 +00:00
Satya Tangirala
87ac3808d8 Merge "Keystore 2.0: Sync output format of generated headers" am: cfab4c08e1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1622544

Change-Id: Icf1ca49fdabfa793fc623946d5d6038d4ad4b029
2021-03-16 21:35:37 +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
Steven Moreland
40221ce02e Merge "Fix incorrect Power destruction" am: 3af4111932 am: ab4954afe9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1634024

Change-Id: I3da040f7760cf3bc642c7140240edd5e196f815e
2021-03-16 20:52:06 +00:00
Shuo Qian
696dbed574 Merge "Fix emergencyDialResponse in VTS 1.6" am: b840a0cdd3 am: a6d37dd0c1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1628876

Change-Id: I6a007c75d25fa8fd79173cd84302d3fbfa98d6be
2021-03-16 20:51:53 +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
ab4954afe9 Merge "Fix incorrect Power destruction" am: 3af4111932
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1634024

Change-Id: I98fc53171d242e2ba14ec0b325ffa09a66fe15ec
2021-03-16 20:17:16 +00:00
Shuo Qian
a6d37dd0c1 Merge "Fix emergencyDialResponse in VTS 1.6" am: b840a0cdd3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1628876

Change-Id: I2fae9fe474e30143b41c73a8e8e539c35d4ebe63
2021-03-16 20:16:20 +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
Mikhail Naganov
f953ef463a Merge "audio: Use strings for EffectDescriptor.{name|implementor}" am: f1fa44dd91 am: 760ee4248d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1634059

Change-Id: Iee0016000cfbc32344ed96730e9960c3174e207a
2021-03-16 00:55:56 +00: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
760ee4248d Merge "audio: Use strings for EffectDescriptor.{name|implementor}" am: f1fa44dd91
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1634059

Change-Id: Ieae8eb8e158a64b413ca3c6fb60bdf73f9bcf63a
2021-03-16 00:18:25 +00: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
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
6e3865f99f Merge "ALLOW REQUEST_NOT_SUPPORTED for nr dual connectivity config" am: 5cfbacbb7c am: af7f0f7678
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1629124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I252b38a709254ae7e4e5630269e0f1eced743906
2021-03-15 05:56:51 +00:00
Sooraj Sasindran
af7f0f7678 Merge "ALLOW REQUEST_NOT_SUPPORTED for nr dual connectivity config" am: 5cfbacbb7c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1629124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb10c8fe67d7cfe75585989b5360c7361dccfae2
2021-03-15 05:22:33 +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
02118721a7 Merge "Use ro.boot.qemu to check if the device is an emulator" am: 03fb28b9fc am: f3593338c0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1627762

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9421a57880d57f6a42912222c6f585dc76157931
2021-03-13 02:38:21 +00:00
Roman Kiryanov
f3593338c0 Merge "Use ro.boot.qemu to check if the device is an emulator" am: 03fb28b9fc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1627762

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0643f1feccd2f833d73053f47af4161a3f1c582c
2021-03-13 02:02:42 +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
Yiwei Zhang
d43cbbee5f Enable cpp support for IPowerStats AIDL interface am: 5aae5cb79d am: 6e92dab27b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1628872

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee49696003865dc3f10b1107313f6d77b3980b7e
2021-03-12 23:04:37 +00:00
Yiwei Zhang
6e92dab27b Enable cpp support for IPowerStats AIDL interface am: 5aae5cb79d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1628872

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf4754e16250bfff8d5f8e5c63c5291a5134d2f6
2021-03-12 22:30:28 +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
TreeHugger Robot
d8fa145b04 Merge "Camera: Fix double-free in removeCamera" into rvc-qpr-dev am: 229e07f9b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13732556

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd7ee95e0e51137ec64342dfc308a0420c99ed5c
2021-03-12 18:11:47 +00:00
TreeHugger Robot
229e07f9b9 Merge "Camera: Fix double-free in removeCamera" into rvc-qpr-dev 2021-03-12 17:50:13 +00:00
Treehugger Robot
01650d6992 Merge "Simplify slicing related structs." am: df3a0dcaeb am: d05c09e504
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1626964

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ce6285fb11973d35a2cc520b8033619ca5c16a5
2021-03-12 01:01:51 +00:00