Commit graph

27665 commits

Author SHA1 Message Date
Christopher Di Bella
06ea5f150a Merge "follows the advice of -Wsign-compare" 2021-02-26 22:59:07 +00:00
Paul Crowley
5d30131709 Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error
A key with the MAX_BOOT_LEVEL tag cannot be used past a particular
stage of device boot.

Test: Treehugger
Bug: 176450483
Change-Id: I113e3101734736a8621a01ed85969a4ecbe12a68
2021-02-26 14:33:46 -08:00
Grzegorz Kołodziejczyk
ac6927f0b7 audio: Introduce read PCM from FMQ session functionality
This is required for audio input direction HAL session support.

Bug:
Tag: #feature
Test: vts-tradefed run vts -m VtsHalBluetoothAudioV2_1TargetTest
Sponsor: jpawlowski@
Change-Id: I3cd25f4af0c5c16074b17dd128de95dd53978379
2021-02-26 21:56:10 +00:00
Rambo Wang
a9c30d17ed Merge "Format all Android.bp files with bpfmt to pass bpfmt buildin hook" am: 64f7fc8dde
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1595304

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2fd52dab6cb07b3a38454eae3b3bab39a128a0b
2021-02-26 21:42:55 +00:00
Jakub Pawlowski
d809c434b5 Add OWNERS file to bluetooth/audio/utils am: ff9deb484c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1609314

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45b88526876723fd6eb3594dd4537beae7386e23
2021-02-26 21:41:40 +00:00
Przemysław Szczepaniak
a8d6fcff16 Make com.android.common visible by neuralnetworks apex.
Test: build image
Bug: 172925288
Change-Id: Iea4403096c94731a3c8f4475386160d8b22031d4
2021-02-26 21:26:31 +00:00
Rambo Wang
64f7fc8dde Merge "Format all Android.bp files with bpfmt to pass bpfmt buildin hook" 2021-02-26 20:57:53 +00:00
Jakub Pawlowski
ff9deb484c Add OWNERS file to bluetooth/audio/utils
Bug: N/A
Test: N/A
Change-Id: Ic0e7b76d7e96251555e05d5829bcd603877b6d14
2021-02-26 20:43:42 +00:00
Kris Alder
fde1ef47a8 Merge "Added vehicleManager_fuzzer" am: e33bc952cf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1510958

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21b3033079689c95a0ac26f0ee00bdcda0f8888c
2021-02-26 18:17:05 +00:00
Kris Alder
338b7bb295 Merge "Added audiocontrolV1.0_fuzzer" am: fd9fdbfa3c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1485160

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a5c5ef4300d590418bef8ae6584f87434a4eb15
2021-02-26 18:16:08 +00:00
Kris Alder
e33bc952cf Merge "Added vehicleManager_fuzzer" 2021-02-26 17:18:22 +00:00
Kris Alder
fd9fdbfa3c Merge "Added audiocontrolV1.0_fuzzer" 2021-02-26 17:17:15 +00:00
Shawn Willden
a073edd20f Merge "Separate updateAad from update & other cleanups" am: 91f8c7c091
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1596894

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2687cb48602bf6c8b0dfcba6cb4191df01e72a65
2021-02-26 17:01:21 +00:00
Shawn Willden
91f8c7c091 Merge "Separate updateAad from update & other cleanups" 2021-02-26 16:04:53 +00:00
Bob Badour
bbff7921dc [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  neuralnetworks/utils/adapter/Android.bp
  security/keymint/aidl/vts/performance/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I139497d894d893a405d9b16df5e23b69dc82674f
2021-02-26 03:45:46 -08:00
Jooyung Han
d33893fef3 neuralnetworks: fix out ParcelFileDescriptor
Refactored "out @nullable ParacelFileDescriptor" into
FencedExecutionResult. It works well with NDK backend, but not with Java
backend. To avoid future incompatibility, AIDL compiler will forbid "out
ParcelFileDescriptor".

This change moves the out parameter to its own parcelable type,
FencedExecutionResult, along with IFencedExecutionCallback.

Bug: 181194872
Test: atest --test-mapping packages/modules/NeuralNetworks
Change-Id: I8e628a7b96d81338fbe59ce8c0b849f98c00536c
2021-02-26 17:36:05 +09:00
Hongbo Zeng
b1ea8dbc19 Support SlicingConfig for 5G Slicing Configuration
- add new HAL APIs getSlicingConfig() and getSlicingConfigResponse()
- create structs SlicingConfig, UrspRule, RouteSelectionDescriptor,
  RouteSelectionDescriptorParams, Nssais, and RejectedSliceInfo
- add SliceRejectionCause

Bug: 178075054
Test: run "atest VtsHalRadioV1_6TargetTest" and check the result for
      getSlicingConfig is PASSED
[3/13] PerInstance/RadioHidlTest_v1_6#getSlicingConfig/0_slot1: PASSED (15ms)

Change-Id: I5dc97d3c49d0bf4726975a5558360ebf9c09224b
Merged-In: I5dc97d3c49d0bf4726975a5558360ebf9c09224b
2021-02-26 16:19:49 +08:00
Hongbo Zeng
55487e1e79 Update HAL 1.6 for 5G Slicing
- add trafficDescriptor and matchAllRuleAllowed to setupDataCall
- add trafficDescriptors to SetupDataCallResult
- create structs TrafficDescriptor and OSAppId base on the
  definition in TS 24.526 Section 5.2
- add MATCH_ALL_RULE_NOT_ALLOWED and ALL_MATCHING_RULES_FAILED
  as DataCallFailCause

Bug: 178075054
Test: make VtsHalRadioV1_6TargetTest
Change-Id: Ibf6d92d50c8c2c3fce51522677d75bf33127320f
Merged-In: Ibf6d92d50c8c2c3fce51522677d75bf33127320f
2021-02-26 16:15:15 +08:00
Treehugger Robot
f74dc4e71a Merge "IRadio 1.6: Public Key Type For IMSI Encryption" am: 20a99acbfb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1380714

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68dee5861e5516d00d14c363d05eff53fd2ea057
2021-02-26 06:03:17 +00:00
Treehugger Robot
20a99acbfb Merge "IRadio 1.6: Public Key Type For IMSI Encryption" 2021-02-26 05:37:25 +00:00
Treehugger Robot
8dc9a0f9b7 Merge "Specify which features the reduced feature set affects" am: f93ea0d270
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1578685

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6da3ba1e45e4f1b1e4783b414f8515187f377fb8
2021-02-26 04:35:21 +00:00
Treehugger Robot
f93ea0d270 Merge "Specify which features the reduced feature set affects" 2021-02-26 04:03:22 +00:00
Haibo Huang
bb68ce436d Merge "matrices: xmllint --quiet" am: ff7508dee5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1607100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b32591f8c03940a09dcfb99a96cdb0996fa8818
2021-02-25 21:21:39 +00:00
Haibo Huang
ff7508dee5 Merge "matrices: xmllint --quiet" 2021-02-25 20:37:33 +00:00
Christopher Di Bella
2ab5c721a1 follows the advice of -Wsign-compare
Bug: 181177782
Test: None
Change-Id: I480e1a35bcac682467d0ff7a97cccfcf78a0a402
2021-02-25 18:39:56 +00:00
Treehugger Robot
dcebe413e6 Merge "Fixing VTS tests after IKeyMint breakage" am: 8bfd260e3e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1598499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54b5febee377618a5a8a4bbe23d040e17a402813
2021-02-25 03:31:08 +00:00
Treehugger Robot
8bfd260e3e Merge "Fixing VTS tests after IKeyMint breakage" 2021-02-25 02:18:31 +00:00
Yifan Hong
5a6c7b13fd matrices: xmllint --quiet
Test: mma
Fixes: 176574965
Change-Id: I4e70279da199e6875feb21036bbccaee461c9c2e
2021-02-24 17:58:49 -08:00
Shawn Willden
92d79c093f Separate updateAad from update & other cleanups
Test: VtsKeyMintAidlTargetTest
Change-Id: Ib4ab43dbf2604a7642fb2b551646fd7f0adac615
2021-02-24 15:54:12 -07:00
Treehugger Robot
37a59e400f Merge "Changes for Vts related to Strongbox. Strongbox is only required to supports 2048 bit keys and optionally required to support Device Unique Attestations. Test: atest VtsHalKeymasterV4_0TargetTest and atest VtsHalKeymasterV4_1TargetTest. Bug: Related to b/150122447." am: 58a8db2148
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1597153

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5748c3367d8f01a08ebdd0b7d424554d1fcd1664
2021-02-24 22:23:40 +00:00
Treehugger Robot
58a8db2148 Merge "Changes for Vts related to Strongbox. Strongbox is only required to supports 2048 bit keys and optionally required to support Device Unique Attestations. Test: atest VtsHalKeymasterV4_0TargetTest and atest VtsHalKeymasterV4_1TargetTest. Bug: Related to b/150122447." 2021-02-24 19:46:19 +00:00
Chirag Pathak
2f408e5e3b Changes for Vts related to Strongbox. Strongbox is only required to supports 2048 bit keys and optionally required to support Device Unique Attestations.
Test: atest VtsHalKeymasterV4_0TargetTest and atest VtsHalKeymasterV4_1TargetTest.
Bug: Related to b/150122447.

Signed-off-by: Chirag Pathak <pathakc@google.com>
Change-Id: I46993aff322dff12af4ce88a46c00316f14f3227
2021-02-24 18:33:24 +00:00
Treehugger Robot
258ed67a3a Merge "Reformat neuralnetworks/1.2/types.hal according to clang-format" am: cefd92ec83
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1599276

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifea6a452e8202e897ee13feefedce1e6f7196301
2021-02-24 01:19:58 +00:00
Michael Butler
734a2b401d Merge changes from topic "nnapi-numberOfConsumers" am: 65de531533
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1600094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9b6be58ea7a7ae5de245f9ba3d38943166d89b8
2021-02-24 01:12:15 +00:00
Michael Butler
0194425127 Make NNAPI countNumberOfConsumers return GeneralResult -- hal am: 68b6926e3c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1600093

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a6a168af09a2ef5861693dc71e7da3bb7d5a365
2021-02-24 01:11:25 +00:00
Treehugger Robot
cefd92ec83 Merge "Reformat neuralnetworks/1.2/types.hal according to clang-format" 2021-02-23 23:11:38 +00:00
Michael Butler
65de531533 Merge changes from topic "nnapi-numberOfConsumers"
* changes:
  Create NNAPI adapter interface
  Make NNAPI countNumberOfConsumers return GeneralResult -- hal
2021-02-23 20:01:01 +00:00
Treehugger Robot
736a899c85 Merge "Non ABI changes to neuralnetworks HAL" am: eff68753f9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1599275

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83c5cc296f7f894139058d0cec57116e5d61d4c9
2021-02-23 15:15:02 +00:00
Treehugger Robot
eff68753f9 Merge "Non ABI changes to neuralnetworks HAL" 2021-02-23 13:11:30 +00:00
TreeHugger Robot
533fbfb117 Merge "Merge ab/7061308 into stage." into stage-aosp-master 2021-02-23 08:45:55 +00:00
Treehugger Robot
fbc1f2282c Merge "composer: increase timeout for VTS" am: 11cee080d7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1597162

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e90793975066eef0db2b01ee3cc9de51779f22c
2021-02-23 08:32:55 +00:00
Treehugger Robot
11cee080d7 Merge "composer: increase timeout for VTS" 2021-02-23 06:02:44 +00:00
Mikhail Naganov
7363426d3c Merge "audio: Put stronger rules on vendor extension enums" am: 2553d042ea
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1596938

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19218c518ccf8cf6ba81c1459a1133f859d9a5b1
2021-02-23 02:48:27 +00:00
Treehugger Robot
5a899a388e Merge "audio: Remove dependency on libxml2 from the default implementation" am: 3731b18cfc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1595307

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c5a200a80c9f089d697ec4e0dcee0ed0561d51f
2021-02-23 01:03:58 +00:00
Mikhail Naganov
2553d042ea Merge "audio: Put stronger rules on vendor extension enums" 2021-02-23 00:17:30 +00:00
Treehugger Robot
3731b18cfc Merge "audio: Remove dependency on libxml2 from the default implementation" 2021-02-23 00:14:51 +00:00
Treehugger Robot
c7e3e264f2 Merge "Added javadoc to apn retry \ throttling related methods" am: 89db74b504
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1598496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ee7288c41f2f0b6df88db4487548aa705412c1c
2021-02-22 17:53:43 +00:00
Slava Shklyaev
f62d99eadd Reformat neuralnetworks/1.2/types.hal according to clang-format
While we cannot run clang-format on types.hal directly, we can do so on
the canonical Types.h (which is generated from the same template) and
observe the difference. See change Ia43936d8.

Bug: 160667417
Test: m
Change-Id: Id6a237f29c8156b213455ab093d11ed4c2015460
Merged-In: Id6a237f29c8156b213455ab093d11ed4c2015460
(cherry picked from commit dfc4a2fa32)
2021-02-22 17:24:49 +00:00
Przemysław Szczepaniak
a02e5e517f Non ABI changes to neuralnetworks HAL
NNAPI HAL comment strings were reformated due to
template changes for new versioning scheme.

Test: Image built
Bug: 177298018
Change-Id: I67b3a38c087edf6ba3c295f5ac43ca02b8359f6a
Merged-In: I67b3a38c087edf6ba3c295f5ac43ca02b8359f6a
(cherry picked from commit 87ff8d20ae)
2021-02-22 17:24:43 +00:00
Treehugger Robot
89db74b504 Merge "Added javadoc to apn retry \ throttling related methods" 2021-02-22 16:43:56 +00:00