Commit graph

31441 commits

Author SHA1 Message Date
Janis Danisevskis
250337e2fc Merge "Security: Add @SensitiveData annotation." am: 71eb2258bf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1643003

Change-Id: I1f39f37e206bad8089f4280396c31a09174dda97
2021-04-07 22:55:05 +00:00
Benjamin Schwartz
e2404435a6 power/stats: Get scopedAStatus description in vts test
Bug: 184722506
Test: atest VtsHalPowerStatsTargetTest
Change-Id: I9e1a4f1965e901888963db74f68263d6a74b8204
2021-04-07 15:13:01 -07:00
Janis Danisevskis
71eb2258bf Merge "Security: Add @SensitiveData annotation." 2021-04-07 21:35:26 +00:00
Amy Zhang
210e8ea1f6 Merge "Add dvr dynamic configuration into Tuner 1.0 VTS" into sc-dev 2021-04-07 21:25:10 +00:00
Michael Butler
f03ebd93b9 Update NN utility code and VTS tests with new Memory type
This CL fixes the compiler errors that arose of changing the Memory
representation of the NN AIDL HAL, and updates the conversion and
utility code to work with the new Memory type.

This change also makes libaidlcommonsupport available to apex modules at
min sdk level 29.

Bug: 183118727
Test: mma
Test: VtsHalNeuralnetworksTargetTest
Change-Id: Ief565473b4d82e0bb43785fc3b8275b16bd26cf6
Merged-In: Ief565473b4d82e0bb43785fc3b8275b16bd26cf6
(cherry picked from commit b0fcb3927d)
2021-04-07 12:54:45 -07:00
Michael Butler
dd53d04d8c Improve the structure of NNAPI AIDL Memory
Prior to this change, the NN AIDL HAL created a Memory struct analogous
to hidl_memory, consisting of a name, size, and native handle. However,
this Memory struct is not very structured, and requires both the client
and server to agree on how the data should be interpreted.

This CL tightens the structure of the Memory representation by
introducing Ashmem and MappableFile structs to android.hardware.common
in order to hold specific file descriptors representing memory regions.
Further, this CL redefines android.hardwre.neuralnetworks's Memory
object as a union of the Ashmem, MappableFile, and (existing)
HardwareBuffer memory types.

This change also adds "com.android.neuralnetworks" to the graphics
AIDL HAL's apex_available build rule.

Bug: 183118727
Test: mma
Change-Id: I32322df676b83597c9e95f13662c322a6a80accc
Merged-In: I32322df676b83597c9e95f13662c322a6a80accc
(cherry picked from commit 1158c80ff6)
2021-04-07 12:54:18 -07:00
Michael Butler
fedc0dd565 [automerger skipped] Merge "Change NNAPI time from steady_clock to boot_clock -- hal" am: d1626e1a4a am: 324752c753 am: e1eb6b553d -s ours
am skip reason: skip tag Change-Id I5a7d039a31d9ce98602a301387ec99635f279f42 with SHA-1 4895b4df79 is already in history

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

Change-Id: I23bc6a3f1d927d4f9cf6d292718335506448b1d1
2021-04-07 19:08:36 +00:00
Michael Butler
e1eb6b553d Merge "Change NNAPI time from steady_clock to boot_clock -- hal" am: d1626e1a4a am: 324752c753
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666360

Change-Id: I63453fba652de45d6723a6a89094df35432bef94
2021-04-07 16:56:00 +00:00
Michael Butler
324752c753 Merge "Change NNAPI time from steady_clock to boot_clock -- hal" am: d1626e1a4a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666360

Change-Id: I22238f0ac1c8e943379fb2879d9ac79261e7a3f7
2021-04-07 16:34:36 +00:00
Michael Butler
d1626e1a4a Merge "Change NNAPI time from steady_clock to boot_clock -- hal" 2021-04-07 15:58:45 +00:00
Yuncheol Heo
e3eea4f932 Redirect the Cluster VHAL messages to vendor ones, or vice versa.
- We'll reroute the Cluster VHAL messages to vendor ones, so that our
ClusetrOSDobule can receive them through the vendor properties.

Bug: 181802283
Test: check if ClusterOSDouble gets the vendor messages.
Change-Id: Iee71e7453bec6a633b94aa7f56e8ceec5fc7b9bd
2021-04-06 23:32:39 -07:00
Janis Danisevskis
8b9e58720f Merge "KeyMaster 4.0: Add missing tags to support library." am: 1b45e0c5c1 am: a9827dcd26 am: d73dc82a53
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666159

Change-Id: Icb7ab9f01771da52b4c78a4f59919b62d6c232fd
2021-04-07 04:42:59 +00:00
Janis Danisevskis
d73dc82a53 Merge "KeyMaster 4.0: Add missing tags to support library." am: 1b45e0c5c1 am: a9827dcd26
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666159

Change-Id: I8fc6e6dfe3b35479434188fcef7f181894ff18de
2021-04-07 03:56:32 +00:00
Janis Danisevskis
a9827dcd26 Merge "KeyMaster 4.0: Add missing tags to support library." am: 1b45e0c5c1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666159

Change-Id: Ieea68aa5c45048f1493b50fbbfc64f66fd006553
2021-04-07 03:06:23 +00:00
Wei Wang
12495d2ddd power: refine comment for pause/resume session
Bug: 163794808
Test: Build
Change-Id: I37d15e0b0ae6646b89b63efde3731368181a01d4
2021-04-06 19:45:51 -07:00
Janis Danisevskis
1b45e0c5c1 Merge "KeyMaster 4.0: Add missing tags to support library." 2021-04-07 02:33:23 +00:00
Edwin Wong
d744206716 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into qt-dev am: 91a4fcb311 am: c7c4045f14 -s ours am: 09d70a56f4 am: 041e19dd25 am: 64e98c4f25 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9403589df96dba844d554f24adf5f527acd1c057
2021-04-07 01:19:25 +00:00
Edwin Wong
4401cfb1dd [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: 9fcd4886a3 am: be8d2c6ebb -s ours am: 21f97ec264 am: db639ecf17 am: 6ed862f81e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5bf5f4664c0c9a36c43685256742e1a71958b80b
2021-04-07 01:19:23 +00:00
Edwin Wong
ce6ca588b1 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into qt-dev am: 91a4fcb311 am: c7c4045f14 -s ours am: 09d70a56f4 am: 647f9a62c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ae3c4e959cba6b0d8e2c17997cfadd075a8e861
2021-04-07 00:36:49 +00:00
Edwin Wong
1f35d252f9 [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: 9fcd4886a3 am: be8d2c6ebb -s ours am: 21f97ec264 am: d156e5f12c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I07612adb6fd1d1c9ed88cc530e085c9602476720
2021-04-07 00:36:48 +00:00
Edwin Wong
64e98c4f25 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into qt-dev am: 91a4fcb311 am: c7c4045f14 -s ours am: 09d70a56f4 am: 041e19dd25
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: I1d98b0de22c008cb8bd20eeb39832ac915fc79ab
2021-04-07 00:32:25 +00:00
Edwin Wong
6ed862f81e [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: 9fcd4886a3 am: be8d2c6ebb -s ours am: 21f97ec264 am: db639ecf17
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: I1092d90e6718ae9c86e625ac44fbc3d637187802
2021-04-07 00:32:23 +00:00
Edwin Wong
647f9a62c6 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into qt-dev am: 91a4fcb311 am: c7c4045f14 -s ours am: 09d70a56f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: Icfe6a2f32e48af137f319a02d3efd40a17ef9be6
2021-04-06 23:52:20 +00:00
Edwin Wong
d156e5f12c [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: 9fcd4886a3 am: be8d2c6ebb -s ours am: 21f97ec264
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: Id64a35f0d060f62376d8948a74996553fb282263
2021-04-06 23:52:20 +00:00
Edwin Wong
041e19dd25 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into qt-dev am: 91a4fcb311 am: c7c4045f14 -s ours am: 09d70a56f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: I8bca8f892023177f641f2afd725a2155fd2237ef
2021-04-06 23:47:35 +00:00
Edwin Wong
db639ecf17 [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: 9fcd4886a3 am: be8d2c6ebb -s ours am: 21f97ec264
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: Ia253d97d385ff379972eb112b6c76a038167929d
2021-04-06 23:47:32 +00:00
Edwin Wong
09d70a56f4 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into qt-dev am: 91a4fcb311 am: c7c4045f14 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic106b0e8d0d109dbf986c50cc97b93386c12427e
2021-04-06 23:27:22 +00:00
Edwin Wong
21f97ec264 [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: 9fcd4886a3 am: be8d2c6ebb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide0c8906230f88e4d3d8d8fdf434ca0223315532
2021-04-06 23:27:19 +00:00
Edwin Wong
c7c4045f14 Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into qt-dev am: 91a4fcb311
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: Ida94a5318e928a10b9c6348ef46faeb92b5f3254
2021-04-06 23:06:29 +00:00
Edwin Wong
be8d2c6ebb [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: 9fcd4886a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: Ida447099c859dced6cd88744bc7ac2ba7c54188d
2021-04-06 23:06:28 +00:00
Edwin Wong
e1e2d9f593 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into rvc-dev am: 8e96e47c73 am: 05d2bd5975 am: 60d80d4717 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2523392f94693e1bd4271b9a631d8837f6d21fdf
2021-04-06 22:49:38 +00:00
Edwin Wong
ddd170f453 [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: a4e76aab23 am: 6effd16a8b am: 5cb6291b8c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I290e1c1a01777bd7fe9f44cb967e58fc8022ca78
2021-04-06 22:49:36 +00:00
Amy Zhang
e50f08d05f Add dvr dynamic configuration into Tuner 1.0 VTS
Test: atest VtsHalTvTunerV1_0TargetTest
Bug: 182519645
CTS-Coverage-Bug: 184077478

Change-Id: I04ef708064179e62c0c7b8c790fe844543b3eac8
2021-04-06 22:29:49 +00:00
Edwin Wong
91a4fcb311 Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into qt-dev 2021-04-06 22:27:14 +00:00
Edwin Wong
fa75337fa3 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into rvc-dev am: 8e96e47c73 am: ad95ed74bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib1d6fdafe3fa884e7120953637b7e793c380cd41
2021-04-06 22:27:02 +00:00
Edwin Wong
69a138feff [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: a4e76aab23 am: 0d561c4b13 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id414dc129dc6857470c13af9a4c34c434473ac8c
2021-04-06 22:27:00 +00:00
Edwin Wong
60d80d4717 Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into rvc-dev am: 8e96e47c73 am: 05d2bd5975
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193

Change-Id: I58240a530ebe9560b54fab47dd23474260965012
2021-04-06 22:23:06 +00:00
Edwin Wong
5cb6291b8c [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: a4e76aab23 am: 6effd16a8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193

Change-Id: I9f61c6d6a2ead1a76c0af77caee2c18f922c79e3
2021-04-06 22:23:03 +00:00
Michael Butler
382d513dff Change NNAPI time from steady_clock to boot_clock -- hal
Previously, the NNAPI used std::chrono::steady_clock to represent and
measure timings. However, steady_clock does not count while the system
is suspended. Instead, boot_clock is monotonic like steady_clock but
does include the time when the system is suspended.

This change also indicates that services may convert from
std::chrono::steady_clock::time_point to
android::base::boot_clock::time_point in the HIDL 1.3 NN HAL.

Bug: 183118340
Test: mma
Test: VtsHalNeuralnetworksV1_3TargetTest
Test: VtsHalNeuralnetworksTargetTest
Test: presubmit
Change-Id: I5a7d039a31d9ce98602a301387ec99635f279f42
Merged-In: I5a7d039a31d9ce98602a301387ec99635f279f42
(cherry picked from commit b8cf54cf5a)
2021-04-06 15:00:49 -07:00
Edwin Wong
ad95ed74bf Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into rvc-dev am: 8e96e47c73
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193

Change-Id: Ib71f3b54204743170ab9aa45a2566317df789fe8
2021-04-06 21:53:49 +00:00
Edwin Wong
0d561c4b13 [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: a4e76aab23
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193

Change-Id: I9b33bb61f1c8b6ea3e7d71bdd7a299a16fc72f93
2021-04-06 21:53:48 +00:00
Edwin Wong
05d2bd5975 Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into rvc-dev am: 8e96e47c73
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193

Change-Id: I7cef0f328ce49e592f0bed6f48900517810ce198
2021-04-06 21:49:17 +00:00
Edwin Wong
6effd16a8b [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: a4e76aab23
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193

Change-Id: I59565fec934a5be32b5c5f32b6586965a7d9a932
2021-04-06 21:49:14 +00:00
Edwin Wong
8e96e47c73 Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into rvc-dev 2021-04-06 21:06:40 +00:00
Michael Butler
e5aeed6a9f Merge "Change NNAPI time from steady_clock to boot_clock -- hal" into sc-dev 2021-04-06 20:37:32 +00:00
Janis Danisevskis
9d363652af KeyMaster 4.0: Add missing tags to support library.
keymaster_tags.h was missing the tags
ATTESTATION_ID_SERIAL/IMEI/MEID.

Test: N/A
Bug: 183412538
Change-Id: I7216971a30fa1f42f152035bf79959f21bdbc09b
2021-04-06 12:54:57 -07:00
Wei Wang
876960ac1c Merge "power: bump default example implementation to version 2" into sc-dev 2021-04-06 18:32:15 +00:00
Treehugger Robot
dc1dfc75b5 Merge "Adds new error code which is required by keystore to handle strongbox hal related functionality. Test: N/A Bug: b/184306647" am: 0ff57e62a8 am: 65e7f5e54e am: dac506d64d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663579

Change-Id: Ifd646eab7624c9d1b465e5b5179d72286cb50211
2021-04-06 18:22:51 +00:00
Treehugger Robot
dac506d64d Merge "Adds new error code which is required by keystore to handle strongbox hal related functionality. Test: N/A Bug: b/184306647" am: 0ff57e62a8 am: 65e7f5e54e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663579

Change-Id: I7fe48071e375f65a411dbe8f613fd31e546bd05c
2021-04-06 17:36:25 +00:00
Andy Hung
a468cac258 Audio: Add AUDIO_FORMAT_DTS_UHD
See ETSI TS 103 491 V1.2.1 (2019-05)
DTS-UHD Audio Format; Delivery of Channels,
Objects and Ambisonic Sound Fields

Test: atest AudioFormatTest
Bug: 184538197
Change-Id: I4123efb29a95a599982af85068f8e4468ff15159
2021-04-06 10:30:36 -07:00