Commit graph

30444 commits

Author SHA1 Message Date
Alec Mouri
c1dfee14d6 Merge "Add render target bit to output buffer for readback vts" into sc-dev 2021-02-25 23:02:57 +00:00
Amy Zhang
9de2739c9c Merge "Add various filter events callbacks after filter starting in the Filter default impl" into sc-dev 2021-02-25 22:43:06 +00:00
Amy Zhang
013fc38464 Add various filter events callbacks after filter starting in the Filter
default impl

Note: these events are only for testing purpose. This would make sure
that CTS could cover more of the Filter events codes.

Test: atest android.media.tv.tuner.cts
Bug: 181152149
Change-Id: I8b4318a384af75646b61060f849353602ecefc03
2021-02-25 12:20:08 -08:00
Treehugger Robot
5f985651fb Merge "Fixing VTS tests after IKeyMint breakage" am: 8bfd260e3e am: dcebe413e6 am: 89f3a1baca
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1598499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie646d8afe351ef5a8bcdb894f217f4d105708f5d
2021-02-25 05:00:08 +00:00
Treehugger Robot
89f3a1baca Merge "Fixing VTS tests after IKeyMint breakage" am: 8bfd260e3e am: dcebe413e6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1598499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie35e0cebb63f9e758e3a24c994da7b8bb2fe13ba
2021-02-25 03:59:40 +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
TreeHugger Robot
075c8ed089 Merge "Clean up AIDL warnings in GNSS" into sc-dev 2021-02-25 01:35:53 +00:00
Treehugger Robot
3cc3cacbc7 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 am: 37a59e400f am: 685d50cf80
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1597153

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9749f21efe7ef26dbc6bd93cad4a4fa39ca8a1c3
2021-02-24 23:51:34 +00:00
Alec Mouri
43db707407 Add render target bit to output buffer for readback vts
RenderEngine requires the gpu target bit on its output buffers, since
it is a GPU implementation which...uses the GPU.

Bug: 180650640
Test: atest VtsHalGraphicsComposerV2_2TargetTest
Change-Id: Ie99af44dc1b8804026b889f8342362839a43c945
2021-02-24 23:40:21 +00:00
Treehugger Robot
685d50cf80 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 am: 37a59e400f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1597153

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d82cf74c3a7f7d7c6c534eb0710a0e871f06eca
2021-02-24 22:58:13 +00: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
Yu-Han Yang
8638d754ee Clean up AIDL warnings in GNSS
Bug: 179853357
Test: on cuttlefish
Change-Id: I4f41b1ce7ddce6cfa1b240dc455643d93ce697d1
2021-02-24 13:16:39 -08:00
Amy Zhang
33750d296b Merge "Add more Frontend Status Caps and frontend types in Tuner default impl" into sc-dev 2021-02-24 20:27:11 +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
TreeHugger Robot
d21cabe750 [automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" into rvc-qpr-dev-plus-aosp am: f991f61905 -s ours
am skip reason: Change-Id If5e9ac8023cdc10d2370d16e7dd75a4bbb7085aa with SHA-1 c22b35bf04 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafcb91ce918f3a421d32b5a1625dd27698e4f6e5
2021-02-24 19:01:07 +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
f991f61905 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" into rvc-qpr-dev-plus-aosp 2021-02-24 18:11:26 +00:00
Sarah Chin
3ebcc72027 Merge "API updates for TrafficDescriptr fields" into sc-dev 2021-02-24 17:36:45 +00:00
TreeHugger Robot
1c3453c344 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" into sc-dev 2021-02-24 14:18:27 +00:00
Amy Zhang
7394e62c7a Add more Frontend Status Caps and frontend types in Tuner default impl
This helps the CTS to cover more Frontend JNI/java/client codes

Test: atest android.media.tv.tuner.cts
Bug: 181088182
Change-Id: I6fe079f7691cddaca6262345b10abc2145a5a6f3
2021-02-23 22:35:36 -08:00
Treehugger Robot
1094427f88 Merge "Reformat neuralnetworks/1.2/types.hal according to clang-format" am: cefd92ec83 am: 258ed67a3a am: 8cdbc44d7f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1599276

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4aedff5e2b6425fc79aea23c4eddb5a443504de2
2021-02-24 02:49:08 +00:00
Michael Butler
86a314e6ec Merge changes from topic "nnapi-numberOfConsumers" am: 65de531533 am: 734a2b401d am: 4b4a5e62da
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1600094

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib384889b00603259e2489ffa35fd852b605c826d
2021-02-24 02:46:56 +00:00
Treehugger Robot
8cdbc44d7f Merge "Reformat neuralnetworks/1.2/types.hal according to clang-format" am: cefd92ec83 am: 258ed67a3a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1599276

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e40a46d2baa594189b66cb532e5a4c70511c961
2021-02-24 01:45:18 +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
Bob Badour
06947f4082 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  security/keymint/aidl/vts/performance/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Icc32cf30d46931ab23bc7a3a8343c380774db532
Merged-in: If5e9ac8023cdc10d2370d16e7dd75a4bbb7085aa
2021-02-23 16:31:49 -08:00
Ilya Matyukhin
61d38188a1 Merge "Add REENROLL_REQUIRED to IFace" into sc-dev 2021-02-24 00:12:21 +00:00
Treehugger Robot
cefd92ec83 Merge "Reformat neuralnetworks/1.2/types.hal according to clang-format" 2021-02-23 23:11:38 +00:00
Bob Badour
c22b35bf04 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  atrace/1.0/Android.bp
  atrace/1.0/default/Android.bp
  atrace/1.0/vts/functional/Android.bp
  audio/2.0/Android.bp
  audio/2.0/config/Android.bp
  audio/4.0/Android.bp
  audio/4.0/config/Android.bp
  audio/5.0/Android.bp
  audio/5.0/config/Android.bp
  audio/6.0/Android.bp
  audio/6.0/config/Android.bp
  audio/7.0/Android.bp
  audio/7.0/config/Android.bp
  audio/common/2.0/Android.bp
  audio/common/4.0/Android.bp
  audio/common/5.0/Android.bp
  audio/common/6.0/Android.bp
  audio/common/7.0/Android.bp
  audio/common/7.0/example/Android.bp
  audio/common/all-versions/default/Android.bp
  audio/common/all-versions/default/service/Android.bp
  audio/common/all-versions/test/utility/Android.bp
  audio/common/all-versions/util/Android.bp
  audio/core/all-versions/default/Android.bp
  audio/core/all-versions/default/util/Android.bp
  audio/core/all-versions/vts/functional/Android.bp
  audio/effect/2.0/Android.bp
  audio/effect/2.0/xml/Android.bp
  audio/effect/4.0/Android.bp
  audio/effect/4.0/xml/Android.bp
  audio/effect/5.0/Android.bp
  audio/effect/5.0/xml/Android.bp
  audio/effect/6.0/Android.bp
  audio/effect/6.0/xml/Android.bp
  audio/effect/7.0/Android.bp
  audio/effect/7.0/xml/Android.bp
  audio/effect/all-versions/default/Android.bp
  audio/effect/all-versions/default/util/Android.bp
  audio/effect/all-versions/vts/functional/Android.bp
  audio/policy/1.0/vts/functional/Android.bp
  audio/policy/1.0/xml/Android.bp
  audio/policy/1.0/xml/pfw_schemas/Android.bp
  authsecret/1.0/Android.bp
  authsecret/1.0/default/Android.bp
  authsecret/1.0/vts/functional/Android.bp
  authsecret/aidl/Android.bp
  authsecret/aidl/default/Android.bp
  authsecret/aidl/vts/Android.bp
  automotive/audiocontrol/1.0/Android.bp
  automotive/audiocontrol/1.0/default/Android.bp
  automotive/audiocontrol/1.0/vts/functional/Android.bp
  automotive/audiocontrol/2.0/Android.bp
  automotive/audiocontrol/2.0/default/Android.bp
  automotive/audiocontrol/2.0/vts/functional/Android.bp
  automotive/audiocontrol/aidl/Android.bp
  automotive/audiocontrol/aidl/default/Android.bp
  automotive/audiocontrol/aidl/vts/Android.bp
  automotive/can/1.0/default/libnetdevice/Android.bp
  automotive/can/1.0/default/libnl++/Android.bp
  automotive/can/1.0/hidl-utils/Android.bp
  automotive/can/1.0/tools/Android.bp
  automotive/can/1.0/tools/configurator/Android.bp
  automotive/can/1.0/tools/configurator/proto/Android.bp
  automotive/can/1.0/tools/libcanhaltools/Android.bp
  automotive/can/1.0/vts/functional/Android.bp
  automotive/can/1.0/vts/utils/Android.bp
  automotive/evs/1.0/Android.bp
  automotive/evs/1.0/default/Android.bp
  automotive/evs/1.0/vts/functional/Android.bp
  automotive/evs/1.1/Android.bp
  automotive/evs/1.1/default/Android.bp
  automotive/evs/1.1/vts/functional/Android.bp
  automotive/evs/1.1/vts/fuzzing/Android.bp
  automotive/evs/common/utils/default/Android.bp
  automotive/evs/common/utils/default/test/fuzz/Android.bp
  automotive/occupant_awareness/aidl/Android.bp
  automotive/occupant_awareness/aidl/default/Android.bp
  automotive/occupant_awareness/aidl/mock/Android.bp
  automotive/occupant_awareness/aidl/vts/functional/Android.bp
  automotive/sv/1.0/Android.bp
  automotive/sv/1.0/default/Android.bp
  automotive/sv/1.0/vts/functional/Android.bp
  automotive/vehicle/2.0/Android.bp
  automotive/vehicle/2.0/default/Android.bp
  automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/Android.bp
  automotive/vehicle/2.0/utils/Android.bp
  biometrics/common/aidl/Android.bp
  biometrics/face/1.0/Android.bp
  biometrics/face/1.0/default/Android.bp
  biometrics/face/1.0/vts/functional/Android.bp
  biometrics/face/aidl/Android.bp
  biometrics/face/aidl/default/Android.bp
  biometrics/face/aidl/vts/Android.bp
  biometrics/fingerprint/2.1/Android.bp
  biometrics/fingerprint/2.1/default/Android.bp
  biometrics/fingerprint/2.1/vts/functional/Android.bp
  biometrics/fingerprint/2.2/Android.bp
  biometrics/fingerprint/2.2/default/Android.bp
  biometrics/fingerprint/2.2/vts/functional/Android.bp
  biometrics/fingerprint/2.3/Android.bp
  biometrics/fingerprint/2.3/vts/functional/Android.bp
  biometrics/fingerprint/aidl/Android.bp
  biometrics/fingerprint/aidl/default/Android.bp
  biometrics/fingerprint/aidl/vts/Android.bp
  bluetooth/1.0/Android.bp
  bluetooth/1.0/default/Android.bp
  bluetooth/1.0/vts/functional/Android.bp
  bluetooth/1.1/Android.bp
  bluetooth/1.1/default/Android.bp
  bluetooth/1.1/vts/functional/Android.bp
  bluetooth/a2dp/1.0/Android.bp
  bluetooth/a2dp/1.0/default/Android.bp
  bluetooth/a2dp/1.0/vts/functional/Android.bp
  bluetooth/audio/2.0/Android.bp
  bluetooth/audio/2.0/default/Android.bp
  bluetooth/audio/2.0/vts/functional/Android.bp
  bluetooth/audio/2.1/Android.bp
  bluetooth/audio/2.1/default/Android.bp
  bluetooth/audio/2.1/vts/functional/Android.bp
  bluetooth/audio/utils/Android.bp
  boot/1.0/Android.bp
  boot/1.0/default/Android.bp
  boot/1.0/vts/functional/Android.bp
  boot/1.1/Android.bp
  boot/1.1/default/Android.bp
  boot/1.1/default/boot_control/Android.bp
  boot/1.1/vts/functional/Android.bp
  boot/1.2/Android.bp
  boot/1.2/default/Android.bp
  boot/1.2/vts/functional/Android.bp
  broadcastradio/1.0/Android.bp
  broadcastradio/1.0/default/Android.bp
  broadcastradio/1.0/vts/functional/Android.bp
  broadcastradio/1.1/Android.bp
  broadcastradio/1.1/default/Android.bp
  broadcastradio/1.1/vts/functional/Android.bp
  broadcastradio/2.0/Android.bp
  broadcastradio/2.0/default/Android.bp
  broadcastradio/2.0/vts/functional/Android.bp
  broadcastradio/common/tests/Android.bp
  broadcastradio/common/utils/Android.bp
  broadcastradio/common/utils1x/Android.bp
  broadcastradio/common/utils2x/Android.bp
  broadcastradio/common/vts/utils/Android.bp
  camera/common/1.0/Android.bp
  camera/common/1.0/default/Android.bp
  camera/device/1.0/Android.bp
  camera/device/1.0/default/Android.bp
  camera/device/3.2/Android.bp
  camera/device/3.2/default/Android.bp
  camera/device/3.3/Android.bp
  camera/device/3.3/default/Android.bp
  camera/device/3.4/Android.bp
  camera/device/3.4/default/Android.bp
  camera/device/3.5/Android.bp
  camera/device/3.5/default/Android.bp
  camera/device/3.6/Android.bp
  camera/device/3.6/default/Android.bp
  camera/metadata/3.2/Android.bp
  camera/metadata/3.3/Android.bp
  camera/metadata/3.4/Android.bp
  camera/metadata/3.5/Android.bp
  camera/metadata/3.6/Android.bp
  camera/provider/2.4/Android.bp
  camera/provider/2.4/default/Android.bp
  camera/provider/2.4/vts/functional/Android.bp
  camera/provider/2.5/Android.bp
  camera/provider/2.5/default/Android.bp
  camera/provider/2.6/Android.bp
  cas/1.0/Android.bp
  cas/1.0/default/Android.bp
  cas/1.0/vts/functional/Android.bp
  cas/1.1/Android.bp
  cas/1.1/default/Android.bp
  cas/1.1/vts/functional/Android.bp
  cas/1.2/Android.bp
  cas/1.2/default/Android.bp
  cas/1.2/vts/functional/Android.bp
  cas/native/1.0/Android.bp
  common/aidl/Android.bp
  common/fmq/aidl/Android.bp
  common/support/Android.bp
  compatibility_matrices/Android.bp
  compatibility_matrices/Android.mk
  compatibility_matrices/build/Android.bp
  compatibility_matrices/exclude/Android.bp
  configstore/1.0/Android.bp
  configstore/1.0/vts/functional/Android.bp
  configstore/1.1/Android.bp
  configstore/1.1/default/Android.mk
  configstore/utils/Android.bp
  confirmationui/1.0/Android.bp
  confirmationui/1.0/default/Android.bp
  confirmationui/1.0/vts/functional/Android.bp
  confirmationui/support/Android.bp
  contexthub/1.0/Android.bp
  contexthub/1.0/default/Android.bp
  contexthub/1.0/vts/functional/Android.bp
  contexthub/1.1/Android.bp
  contexthub/1.1/default/Android.bp
  contexthub/1.1/vts/functional/Android.bp
  contexthub/1.2/Android.bp
  contexthub/1.2/default/Android.bp
  contexthub/1.2/vts/functional/Android.bp
  contexthub/common/default/1.X/Android.bp
  contexthub/common/default/1.X/utils/Android.bp
  contexthub/common/vts/Android.bp
  drm/1.0/Android.bp
  drm/1.0/default/Android.bp
  drm/1.0/vts/functional/Android.bp
  drm/1.1/Android.bp
  drm/1.1/vts/functional/Android.bp
  drm/1.2/Android.bp
  drm/1.2/vts/functional/Android.bp
  drm/1.3/Android.bp
  drm/1.3/vts/functional/Android.bp
  drm/1.4/Android.bp
  drm/1.4/vts/functional/Android.bp
  dumpstate/1.0/Android.bp
  dumpstate/1.0/default/Android.bp
  dumpstate/1.0/vts/functional/Android.bp
  dumpstate/1.1/Android.bp
  dumpstate/1.1/default/Android.bp
  dumpstate/1.1/vts/functional/Android.bp
  fastboot/1.0/Android.bp
  fastboot/1.0/default/Android.bp
  fastboot/1.1/Android.bp
  fastboot/1.1/default/Android.bp
  gatekeeper/1.0/Android.bp
  gatekeeper/1.0/default/Android.bp
  gatekeeper/1.0/software/Android.bp
  gatekeeper/1.0/software/tests/Android.bp
  gatekeeper/1.0/vts/functional/Android.bp
  gnss/1.0/Android.bp
  gnss/1.0/default/Android.bp
  gnss/1.0/vts/functional/Android.bp
  gnss/1.1/Android.bp
  gnss/1.1/default/Android.bp
  gnss/1.1/vts/functional/Android.bp
  gnss/2.0/Android.bp
  gnss/2.0/default/Android.bp
  gnss/2.0/vts/functional/Android.bp
  gnss/2.1/Android.bp
  gnss/2.1/default/Android.bp
  gnss/2.1/vts/functional/Android.bp
  gnss/aidl/Android.bp
  gnss/aidl/default/Android.bp
  gnss/aidl/vts/Android.bp
  gnss/common/utils/default/Android.bp
  gnss/common/utils/vts/Android.bp
  gnss/measurement_corrections/1.0/Android.bp
  gnss/measurement_corrections/1.1/Android.bp
  gnss/visibility_control/1.0/Android.bp
  graphics/allocator/2.0/Android.bp
  graphics/allocator/2.0/default/Android.bp
  graphics/allocator/2.0/utils/gralloc1-adapter/Android.bp
  graphics/allocator/2.0/utils/hal/Android.bp
  graphics/allocator/2.0/utils/passthrough/Android.bp
  graphics/allocator/3.0/Android.bp
  graphics/allocator/4.0/Android.bp
  graphics/bufferqueue/1.0/Android.bp
  graphics/bufferqueue/2.0/Android.bp
  graphics/common/1.0/Android.bp
  graphics/common/1.1/Android.bp
  graphics/common/1.2/Android.bp
  graphics/common/aidl/Android.bp
  graphics/composer/2.1/Android.bp
  graphics/composer/2.1/default/Android.bp
  graphics/composer/2.1/utils/command-buffer/Android.bp
  graphics/composer/2.1/utils/hal/Android.bp
  graphics/composer/2.1/utils/hwc2on1adapter/Android.bp
  graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp
  graphics/composer/2.1/utils/passthrough/Android.bp
  graphics/composer/2.1/utils/resources/Android.bp
  graphics/composer/2.1/utils/vts/Android.bp
  graphics/composer/2.1/vts/functional/Android.bp
  graphics/composer/2.2/Android.bp
  graphics/composer/2.2/default/Android.mk
  graphics/composer/2.2/utils/command-buffer/Android.bp
  graphics/composer/2.2/utils/hal/Android.bp
  graphics/composer/2.2/utils/passthrough/Android.bp
  graphics/composer/2.2/utils/resources/Android.bp
  graphics/composer/2.2/utils/vts/Android.bp
  graphics/composer/2.2/vts/functional/Android.bp
  graphics/composer/2.3/Android.bp
  graphics/composer/2.3/default/Android.bp
  graphics/composer/2.3/utils/command-buffer/Android.bp
  graphics/composer/2.3/utils/hal/Android.bp
  graphics/composer/2.3/utils/passthrough/Android.bp
  graphics/composer/2.3/utils/vts/Android.bp
  graphics/composer/2.3/vts/functional/Android.bp
  graphics/composer/2.4/Android.bp
  graphics/composer/2.4/default/Android.bp
  graphics/composer/2.4/utils/command-buffer/Android.bp
  graphics/composer/2.4/utils/hal/Android.bp
  graphics/composer/2.4/utils/passthrough/Android.bp
  graphics/composer/2.4/utils/vts/Android.bp
  graphics/composer/2.4/vts/functional/Android.bp
  graphics/mapper/2.0/Android.bp
  graphics/mapper/2.0/default/Android.bp
  graphics/mapper/2.0/utils/hal/Android.bp
  graphics/mapper/2.0/utils/passthrough/Android.bp
  graphics/mapper/2.0/utils/vts/Android.bp
  graphics/mapper/2.0/vts/functional/Android.bp
  graphics/mapper/2.1/Android.bp
  graphics/mapper/2.1/default/Android.bp
  graphics/mapper/2.1/utils/hal/Android.bp
  graphics/mapper/2.1/utils/passthrough/Android.bp
  graphics/mapper/2.1/utils/vts/Android.bp
  graphics/mapper/2.1/vts/functional/Android.bp
  graphics/mapper/3.0/Android.bp
  graphics/mapper/3.0/utils/vts/Android.bp
  graphics/mapper/3.0/vts/functional/Android.bp
  graphics/mapper/4.0/Android.bp
  graphics/mapper/4.0/utils/vts/Android.bp
  graphics/mapper/4.0/vts/functional/Android.bp
  health/1.0/Android.bp
  health/1.0/default/Android.bp
  health/2.0/Android.bp
  health/2.0/default/Android.bp
  health/2.0/utils/libhealthhalutils/Android.bp
  health/2.0/utils/libhealthservice/Android.bp
  health/2.0/utils/libhealthstoragedefault/Android.bp
  health/2.0/vts/functional/Android.bp
  health/2.1/Android.bp
  health/2.1/default/Android.bp
  health/2.1/vts/functional/Android.bp
  health/storage/1.0/Android.bp
  health/storage/1.0/default/Android.bp
  health/storage/1.0/vts/functional/Android.bp
  health/storage/aidl/Android.bp
  health/storage/aidl/default/Android.bp
  health/storage/aidl/vts/functional/Android.bp
  health/storage/impl_common/Android.bp
  health/storage/test_common/Android.bp
  health/utils/libhealth2impl/Android.bp
  health/utils/libhealthloop/Android.bp
  identity/aidl/Android.bp
  identity/aidl/default/Android.bp
  identity/aidl/vts/Android.bp
  identity/support/Android.bp
  input/classifier/1.0/Android.bp
  input/classifier/1.0/default/Android.bp
  input/classifier/1.0/vts/functional/Android.bp
  input/common/1.0/Android.bp
  ir/1.0/Android.bp
  ir/1.0/default/Android.bp
  ir/1.0/vts/functional/Android.bp
  keymaster/3.0/Android.bp
  keymaster/3.0/default/Android.mk
  keymaster/3.0/vts/functional/Android.bp
  keymaster/4.0/Android.bp
  keymaster/4.0/default/Android.bp
  keymaster/4.0/support/Android.bp
  keymaster/4.0/vts/functional/Android.bp
  keymaster/4.0/vts/performance/Android.bp
  keymaster/4.1/Android.bp
  keymaster/4.1/default/Android.bp
  keymaster/4.1/support/Android.bp
  keymaster/4.1/vts/functional/Android.bp
  keymaster/aidl/Android.bp
  light/2.0/Android.bp
  light/2.0/default/Android.bp
  light/2.0/vts/functional/Android.bp
  light/aidl/Android.bp
  light/aidl/default/Android.bp
  light/aidl/vts/functional/Android.bp
  light/utils/Android.bp
  media/1.0/Android.bp
  media/1.0/xml/Android.mk
  media/Android.bp
  media/bufferpool/1.0/Android.bp
  media/bufferpool/2.0/Android.bp
  media/c2/1.0/Android.bp
  media/c2/1.1/Android.bp
  media/omx/1.0/Android.bp
  media/omx/1.0/vts/functional/audio/Android.bp
  media/omx/1.0/vts/functional/common/Android.bp
  media/omx/1.0/vts/functional/component/Android.bp
  media/omx/1.0/vts/functional/store/Android.bp
  media/omx/1.0/vts/functional/video/Android.bp
  memtrack/1.0/Android.bp
  memtrack/1.0/default/Android.bp
  memtrack/1.0/vts/functional/Android.bp
  memtrack/aidl/Android.bp
  memtrack/aidl/default/Android.bp
  memtrack/aidl/vts/Android.bp
  neuralnetworks/1.0/Android.bp
  neuralnetworks/1.0/utils/Android.bp
  neuralnetworks/1.0/vts/functional/Android.bp
  neuralnetworks/1.1/Android.bp
  neuralnetworks/1.1/utils/Android.bp
  neuralnetworks/1.1/vts/functional/Android.bp
  neuralnetworks/1.2/Android.bp
  neuralnetworks/1.2/utils/Android.bp
  neuralnetworks/1.2/vts/functional/Android.bp
  neuralnetworks/1.3/Android.bp
  neuralnetworks/1.3/utils/Android.bp
  neuralnetworks/1.3/vts/functional/Android.bp
  neuralnetworks/aidl/Android.bp
  neuralnetworks/aidl/utils/Android.bp
  neuralnetworks/aidl/vts/functional/Android.bp
  neuralnetworks/utils/common/Android.bp
  neuralnetworks/utils/service/Android.bp
  nfc/1.0/Android.bp
  nfc/1.0/default/Android.bp
  nfc/1.0/vts/functional/Android.bp
  nfc/1.1/Android.bp
  nfc/1.1/vts/functional/Android.bp
  nfc/1.2/Android.bp
  nfc/1.2/vts/functional/Android.bp
  oemlock/1.0/Android.bp
  oemlock/1.0/vts/functional/Android.bp
  oemlock/aidl/Android.bp
  oemlock/aidl/default/Android.bp
  oemlock/aidl/vts/Android.bp
  power/1.0/Android.bp
  power/1.0/default/Android.bp
  power/1.0/vts/functional/Android.bp
  power/1.1/Android.bp
  power/1.1/vts/functional/Android.bp
  power/1.2/Android.bp
  power/1.2/vts/functional/Android.bp
  power/1.3/Android.bp
  power/1.3/vts/functional/Android.bp
  power/aidl/Android.bp
  power/aidl/default/Android.bp
  power/aidl/vts/Android.bp
  power/stats/1.0/Android.bp
  power/stats/1.0/default/Android.bp
  power/stats/1.0/vts/functional/Android.bp
  power/stats/aidl/Android.bp
  power/stats/aidl/default/Android.bp
  power/stats/aidl/vts/Android.bp
  radio/1.0/Android.bp
  radio/1.0/vts/functional/Android.bp
  radio/1.1/Android.bp
  radio/1.1/vts/functional/Android.bp
  radio/1.2/Android.bp
  radio/1.2/default/Android.bp
  radio/1.2/vts/functional/Android.bp
  radio/1.3/Android.bp
  radio/1.3/vts/functional/Android.bp
  radio/1.4/Android.bp
  radio/1.4/vts/functional/Android.bp
  radio/1.5/Android.bp
  radio/1.5/vts/functional/Android.bp
  radio/1.6/Android.bp
  radio/1.6/vts/functional/Android.bp
  radio/config/1.0/Android.bp
  radio/config/1.0/default/Android.bp
  radio/config/1.0/vts/functional/Android.bp
  radio/config/1.1/Android.bp
  radio/config/1.1/vts/functional/Android.bp
  radio/config/1.2/Android.bp
  radio/config/1.2/vts/functional/Android.bp
  radio/config/1.3/Android.bp
  radio/config/1.3/vts/functional/Android.bp
  radio/deprecated/1.0/Android.bp
  rebootescrow/aidl/Android.bp
  rebootescrow/aidl/default/Android.bp
  rebootescrow/aidl/vts/functional/Android.bp
  renderscript/1.0/Android.bp
  renderscript/1.0/default/Android.bp
  renderscript/1.0/vts/functional/Android.bp
  secure_element/1.0/Android.bp
  secure_element/1.0/vts/functional/Android.bp
  secure_element/1.1/Android.bp
  secure_element/1.1/vts/functional/Android.bp
  secure_element/1.2/Android.bp
  secure_element/1.2/vts/functional/Android.bp
  security/keymint/aidl/Android.bp
  security/keymint/aidl/default/Android.bp
  security/keymint/aidl/vts/functional/Android.bp
  security/keymint/aidl/vts/performance/Android.bp
  security/keymint/support/Android.bp
  security/secureclock/aidl/Android.bp
  security/secureclock/aidl/vts/functional/Android.bp
  security/sharedsecret/aidl/Android.bp
  security/sharedsecret/aidl/vts/functional/Android.bp
  sensors/1.0/Android.bp
  sensors/1.0/default/Android.bp
  sensors/1.0/vts/functional/Android.bp
  sensors/2.0/Android.bp
  sensors/2.0/default/Android.bp
  sensors/2.0/multihal/Android.bp
  sensors/2.0/vts/functional/Android.bp
  sensors/2.1/Android.bp
  sensors/2.1/default/Android.bp
  sensors/2.1/multihal/Android.bp
  sensors/2.1/vts/functional/Android.bp
  sensors/common/default/2.X/Android.bp
  sensors/common/default/2.X/multihal/Android.bp
  sensors/common/default/2.X/multihal/tests/Android.bp
  sensors/common/utils/Android.bp
  sensors/common/vts/2_X/Android.bp
  sensors/common/vts/utils/Android.bp
  soundtrigger/2.0/Android.bp
  soundtrigger/2.0/default/Android.bp
  soundtrigger/2.0/default/Android.mk
  soundtrigger/2.0/vts/functional/Android.bp
  soundtrigger/2.1/Android.bp
  soundtrigger/2.1/default/Android.mk
  soundtrigger/2.1/vts/functional/Android.bp
  soundtrigger/2.2/Android.bp
  soundtrigger/2.2/default/Android.bp
  soundtrigger/2.2/vts/functional/Android.bp
  soundtrigger/2.3/Android.bp
  soundtrigger/2.3/default/Android.bp
  soundtrigger/2.3/vts/functional/Android.bp
  tests/bar/1.0/Android.bp
  tests/bar/1.0/default/Android.bp
  tests/baz/1.0/Android.bp
  tests/baz/1.0/default/Android.bp
  tests/expression/1.0/Android.bp
  tests/extension/light/2.0/Android.bp
  tests/extension/light/2.0/default/Android.bp
  tests/extension/vibrator/aidl/Android.bp
  tests/extension/vibrator/aidl/client/Android.bp
  tests/extension/vibrator/aidl/default/Android.bp
  tests/foo/1.0/Android.bp
  tests/foo/1.0/default/Android.bp
  tests/foo/1.0/default/lib/Android.bp
  tests/hash/1.0/Android.bp
  tests/hash/1.0/default/Android.bp
  tests/inheritance/1.0/Android.bp
  tests/inheritance/1.0/default/Android.bp
  tests/lazy/1.0/Android.bp
  tests/lazy/1.1/Android.bp
  tests/libhwbinder/1.0/Android.bp
  tests/libhwbinder/1.0/default/Android.bp
  tests/libhwbinder/aidl/Android.bp
  tests/memory/1.0/Android.bp
  tests/memory/1.0/default/Android.bp
  tests/memory/2.0/Android.bp
  tests/msgq/1.0/Android.bp
  tests/msgq/1.0/default/Android.bp
  tests/multithread/1.0/Android.bp
  tests/multithread/1.0/default/Android.bp
  tests/safeunion/1.0/Android.bp
  tests/safeunion/1.0/default/Android.bp
  tests/safeunion/cpp/1.0/Android.bp
  tests/safeunion/cpp/1.0/default/Android.bp
  tests/trie/1.0/Android.bp
  tests/trie/1.0/default/Android.bp
  tetheroffload/config/1.0/Android.bp
  tetheroffload/config/1.0/vts/functional/Android.bp
  tetheroffload/control/1.0/Android.bp
  tetheroffload/control/1.0/vts/functional/Android.bp
  tetheroffload/control/1.1/Android.bp
  tetheroffload/control/1.1/vts/functional/Android.bp
  thermal/1.0/Android.bp
  thermal/1.0/default/Android.bp
  thermal/1.0/vts/functional/Android.bp
  thermal/1.1/Android.bp
  thermal/1.1/vts/functional/Android.bp
  thermal/2.0/Android.bp
  thermal/2.0/default/Android.bp
  thermal/2.0/vts/functional/Android.bp
  tv/cec/1.0/Android.bp
  tv/cec/1.0/default/Android.bp
  tv/cec/1.1/Android.bp
  tv/cec/1.1/default/Android.bp
  tv/cec/1.1/vts/functional/Android.bp
  tv/input/1.0/Android.bp
  tv/input/1.0/default/Android.bp
  tv/input/1.0/vts/functional/Android.bp
  tv/tuner/1.0/Android.bp
  tv/tuner/1.0/default/Android.bp
  tv/tuner/1.0/vts/functional/Android.bp
  tv/tuner/1.1/Android.bp
  tv/tuner/1.1/default/Android.bp
  tv/tuner/1.1/vts/functional/Android.bp
  tv/tuner/assets/Android.bp
  usb/1.0/Android.bp
  usb/1.0/default/Android.bp
  usb/1.0/vts/functional/Android.bp
  usb/1.1/Android.bp
  usb/1.1/vts/functional/Android.bp
  usb/1.2/Android.bp
  usb/1.2/vts/functional/Android.bp
  usb/1.3/Android.bp
  usb/1.3/vts/functional/Android.bp
  usb/gadget/1.0/Android.bp
  usb/gadget/1.1/Android.bp
  usb/gadget/1.1/default/Android.bp
  usb/gadget/1.1/default/lib/Android.bp
  usb/gadget/1.2/Android.bp
  usb/gadget/1.2/default/Android.bp
  usb/gadget/1.2/default/lib/Android.bp
  vibrator/1.0/Android.bp
  vibrator/1.0/default/Android.bp
  vibrator/1.0/vts/functional/Android.bp
  vibrator/1.1/Android.bp
  vibrator/1.1/vts/functional/Android.bp
  vibrator/1.2/Android.bp
  vibrator/1.2/vts/functional/Android.bp
  vibrator/1.3/Android.bp
  vibrator/1.3/example/Android.bp
  vibrator/1.3/vts/functional/Android.bp
  vibrator/aidl/Android.bp
  vibrator/aidl/default/Android.bp
  vibrator/aidl/vts/Android.bp
  vibrator/bench/Android.bp
  vr/1.0/Android.bp
  vr/1.0/default/Android.bp
  vr/1.0/vts/functional/Android.bp
  weaver/1.0/Android.bp
  weaver/1.0/vts/functional/Android.bp
  weaver/aidl/Android.bp
  weaver/aidl/default/Android.bp
  weaver/aidl/vts/Android.bp
  wifi/1.0/Android.bp
  wifi/1.0/vts/functional/Android.bp
  wifi/1.1/Android.bp
  wifi/1.1/vts/functional/Android.bp
  wifi/1.2/Android.bp
  wifi/1.2/vts/functional/Android.bp
  wifi/1.3/Android.bp
  wifi/1.3/vts/functional/Android.bp
  wifi/1.4/Android.bp
  wifi/1.4/vts/functional/Android.bp
  wifi/1.5/Android.bp
  wifi/1.5/default/Android.mk
  wifi/1.5/vts/functional/Android.bp
  wifi/hostapd/1.0/Android.bp
  wifi/hostapd/1.0/vts/functional/Android.bp
  wifi/hostapd/1.1/Android.bp
  wifi/hostapd/1.1/vts/functional/Android.bp
  wifi/hostapd/1.2/Android.bp
  wifi/hostapd/1.2/vts/functional/Android.bp
  wifi/hostapd/1.3/Android.bp
  wifi/hostapd/1.3/vts/functional/Android.bp
  wifi/offload/1.0/Android.bp
  wifi/offload/1.0/vts/functional/Android.bp
  wifi/supplicant/1.0/Android.bp
  wifi/supplicant/1.0/vts/functional/Android.bp
  wifi/supplicant/1.1/Android.bp
  wifi/supplicant/1.1/vts/functional/Android.bp
  wifi/supplicant/1.2/Android.bp
  wifi/supplicant/1.2/vts/functional/Android.bp
  wifi/supplicant/1.3/Android.bp
  wifi/supplicant/1.3/vts/functional/Android.bp
  wifi/supplicant/1.4/Android.bp
  wifi/supplicant/1.4/vts/functional/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-NCSA to:
  Android.bp
  automotive/can/1.0/Android.bp
  automotive/can/1.0/default/Android.bp

Added SPDX-license-identifier-NCSA to:
  automotive/can/1.0/default/libc++fs/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: If5e9ac8023cdc10d2370d16e7dd75a4bbb7085aa
2021-02-23 14:26:20 -08:00
Ilya Matyukhin
bf5b361fa8 Add REENROLL_REQUIRED to IFace
Bug: 180723766
Test: m android.hardware.biometrics.face-update-api
Change-Id: I4687828a9e1bcd42633b28f16656d99632b63520
2021-02-23 14:02:42 -08:00
Vince Leung
12cfbb9235 Merge "vibrator: aidl: Add OWNERS" into sc-dev 2021-02-23 20:56:48 +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
Mingguang Xu
56ce3287a2 Merge "WiFi: Get contention time stats from wifi_wmm_ac_stat in link_layer_stats" into sc-dev 2021-02-23 19:22:00 +00:00
Vince Leung
11f6338913 vibrator: aidl: Add OWNERS
Add owners for vibrator related files

Bug: 177325091
Test: m
Change-Id: I213f87b5a99ab0d529742ac01f230a932fc7f09b
2021-02-23 18:55:26 +00:00
Treehugger Robot
0fb5e3fc80 [automerger skipped] Merge "Non ABI changes to neuralnetworks HAL" am: eff68753f9 am: 736a899c85 am: 1d5b0a09d9 -s ours
am skip reason: Change-Id I67b3a38c087edf6ba3c295f5ac43ca02b8359f6a with SHA-1 87ff8d20ae is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4cfb1b56d8be49ea175a38c75245cc93c7659ef
2021-02-23 16:37:51 +00:00
Treehugger Robot
1d5b0a09d9 Merge "Non ABI changes to neuralnetworks HAL" am: eff68753f9 am: 736a899c85
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1599275

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77b2b285e8ec4ae652338f092ad8aed400bafaea
2021-02-23 15:56:33 +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
52de3e6ac8 [automerger skipped] Merge "Merge ab/7061308 into stage." into stage-aosp-master am: 533fbfb117 -s ours am: 17b1890491 -s ours
am skip reason: Change-Id I1512f0aee1f960e809a42448b9aafed0de3dbc2a with SHA-1 2be17732e7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4df8d0f4bcc99529c856f66eaf1f52b54b56ed16
2021-02-23 10:35:10 +00:00
Treehugger Robot
0842efd583 Merge "composer: increase timeout for VTS" am: 11cee080d7 am: fbc1f2282c am: 8c2c72d5ce
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1597162

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib476659d88a618ada17108649ab4421325470f5d
2021-02-23 10:28:26 +00:00
TreeHugger Robot
17b1890491 [automerger skipped] Merge "Merge ab/7061308 into stage." into stage-aosp-master am: 533fbfb117 -s ours
am skip reason: Change-Id I1512f0aee1f960e809a42448b9aafed0de3dbc2a with SHA-1 2be17732e7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4930126e19d855ba6cd216cce41f49832a65302
2021-02-23 09:05:21 +00:00
Treehugger Robot
8c2c72d5ce Merge "composer: increase timeout for VTS" am: 11cee080d7 am: fbc1f2282c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1597162

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If74e20cd29d5aacadf55936f936823900a414f6f
2021-02-23 08:59:48 +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
f2137a93e4 Merge "resolve merge conflicts of 5c715dd65b to sc-dev" into sc-dev 2021-02-23 06:59:56 +00:00