Commit Graph

68329 Commits

Author SHA1 Message Date
Eino-Ville Talvala (Eddy)
0200aec661 Merge "Graphics: Migrate graphics.common HAL to version 6" into main 2024-11-15 19:01:02 +00:00
Treehugger Robot
705b90ed78 Merge "Adding protocol for chinese Id in ProtocolDiscoveryConfig AIDL" into main am: f5dcb1fe38 am: 20cbb3e57e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3345140

Change-Id: I29b88753c3cd8b981fe4984fb9d14136b253fd0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 17:49:56 +00:00
Orlando Arbildo
e3b85bddf2 Merge "hwcrypto: Add protectionIDs to keys" into main am: ad793838ae am: f17e304cd0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3122114

Change-Id: Ida5de22ebd7df230125bc36a231d2e0b3a04756e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 17:49:34 +00:00
Catherine Vlasov
0ab832f0aa Merge "Correct comment about Verified Boot key on devices with custom root of trust." into main am: 78ade929e3 am: 8c30ff23e0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3349134

Change-Id: I95c915d38d85f4f3630d1c64095b9eb34bda2889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 17:49:20 +00:00
Treehugger Robot
20cbb3e57e Merge "Adding protocol for chinese Id in ProtocolDiscoveryConfig AIDL" into main am: f5dcb1fe38
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3345140

Change-Id: I8dbffb08b456e2db39004ae474f1934ead5b5743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 17:26:23 +00:00
Orlando Arbildo
f17e304cd0 Merge "hwcrypto: Add protectionIDs to keys" into main am: ad793838ae
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3122114

Change-Id: I9ea1f8c186c95796374ec7caae2f79b33cace5af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 17:26:02 +00:00
Catherine Vlasov
8c30ff23e0 Merge "Correct comment about Verified Boot key on devices with custom root of trust." into main am: 78ade929e3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3349134

Change-Id: Ida7f1bb93b93bf0f841018fd1cfc45ff44972fb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 17:25:49 +00:00
Treehugger Robot
f5dcb1fe38 Merge "Adding protocol for chinese Id in ProtocolDiscoveryConfig AIDL" into main 2024-11-15 17:24:38 +00:00
Orlando Arbildo
ad793838ae Merge "hwcrypto: Add protectionIDs to keys" into main 2024-11-15 17:03:28 +00:00
Catherine Vlasov
78ade929e3 Merge "Correct comment about Verified Boot key on devices with custom root of trust." into main 2024-11-15 17:01:17 +00:00
Orlando Arbildo
60d8a03ecd hwcrypto: Add protectionIDs to keys
Added function to tag keys with protectionIDs. This
allow the key creator to limit the types of buffer
that a key can operate onto.

Bug: 284177057
Test: qemu android build
Change-Id: Ie0eb266c93877c690a1cf27b356c7f8f35b1fd97
2024-11-15 15:24:18 +00:00
Catherine Vlasov
a5439fd7a5 Correct comment about Verified Boot key on devices with custom root of trust.
Updating the comment to match the test expectation. The attested Verified
Boot key should contain the user-set root of trust if the Verified Boot
state is "SelfSigned" (i.e. "yellow").

Bug: 376832222
Test: n/a (comment update)
Change-Id: Ie3c43157f05e40fa42b107768af561644ff5d30f
2024-11-15 15:18:49 +00:00
David Drysdale
1da89ad751 Merge "KeyMint VTS: emit values on failure" into main am: d0b8688a8d am: 79ad008d28
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3350630

Change-Id: I087af47c3e533e62bcdb26c496a444c14744c63e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 11:34:39 +00:00
David Drysdale
79ad008d28 Merge "KeyMint VTS: emit values on failure" into main am: d0b8688a8d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3350630

Change-Id: I09f6586849426cbd72b15e0914002489d3d79a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 11:10:13 +00:00
David Drysdale
d0b8688a8d Merge "KeyMint VTS: emit values on failure" into main 2024-11-15 10:47:00 +00:00
Treehugger Robot
afc91a2623 [automerger skipped] Merge "Drop references to CAN HAL from libnetdevice and libnl++" into main am: 2764f6223c am: 37c5495a5d -s ours
am skip reason: Merged-In I362bb91860fa2e78168b4b27a1c9b36d1c23ba7e with SHA-1 3aa93292c9 is already in history

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

Change-Id: I084a72c15d7b0ead806b62966e8284fe3ef82386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 01:03:43 +00:00
Treehugger Robot
37c5495a5d Merge "Drop references to CAN HAL from libnetdevice and libnl++" into main am: 2764f6223c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3349682

Change-Id: I2884f6f4e5aecc23143fa3fc8524242f19b00a7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 00:41:27 +00:00
Treehugger Robot
7278215007 Merge "libnetdevice: Add prefixlen option to setAddr4" into main 2024-11-15 00:11:13 +00:00
Treehugger Robot
2764f6223c Merge "Drop references to CAN HAL from libnetdevice and libnl++" into main 2024-11-15 00:09:45 +00:00
Treehugger Robot
f066f5d424 Merge "Drop references to CAN HAL from libnetdevice and libnl++" into main 2024-11-14 23:08:33 +00:00
Tomasz Wasilczyk
e07129d9a5 libnetdevice: Add prefixlen option to setAddr4
Bug: 310710841
Test: m
Change-Id: I0db4427b426a02a86ed5e1d4161d8254f8207cde
2024-11-14 12:47:46 -08:00
Tomasz Wasilczyk
ef3851752a Drop references to CAN HAL from libnetdevice and libnl++
Bug: 310710841
Test: m
Change-Id: I362bb91860fa2e78168b4b27a1c9b36d1c23ba7e
Merged-In: I362bb91860fa2e78168b4b27a1c9b36d1c23ba7e
2024-11-14 19:37:46 +00:00
Tomasz Wasilczyk
3aa93292c9 Drop references to CAN HAL from libnetdevice and libnl++
Bug: 310710841
Test: m
Change-Id: I362bb91860fa2e78168b4b27a1c9b36d1c23ba7e
2024-11-14 11:36:53 -08:00
Orlando Arbildo
59682e801d Merge "hwcrypto: Add key token export/import" into main am: 293607e427 am: d9f759f875
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3122113

Change-Id: I020b2038d5b4985be49d26efc28938c6364a4e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-14 17:55:54 +00:00
Orlando Arbildo
d9f759f875 Merge "hwcrypto: Add key token export/import" into main am: 293607e427
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3122113

Change-Id: I3591cc84dbc93762489e68a4394a48da317eb2cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-14 17:29:33 +00:00
David Drysdale
0269d49d9a KeyMint VTS: emit values on failure
Test: VtsAidlKeyMintTargetTest
Change-Id: Iac65b379f22eb2ff9b4d1e47b652d41072eaafe9
2024-11-14 17:15:00 +00:00
Orlando Arbildo
293607e427 Merge "hwcrypto: Add key token export/import" into main 2024-11-14 17:10:26 +00:00
Terry Guan
d14da9d133 Merge "Change TEST_MAPPING" into main 2024-11-14 17:00:12 +00:00
David Drysdale
f45e60a213 Merge "KeyMint VTS tests for module hash feature" into main am: 76418972da am: 5b0c5e5fad
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3342780

Change-Id: I974f05e522113051feeaaa2ad46469a2f74a6d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-14 12:08:36 +00:00
David Drysdale
5b0c5e5fad Merge "KeyMint VTS tests for module hash feature" into main am: 76418972da
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3342780

Change-Id: Ibf4606b1601c7be9f6045dbeaefa97557904ca7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-14 12:08:06 +00:00
David Drysdale
76418972da Merge "KeyMint VTS tests for module hash feature" into main 2024-11-14 11:49:16 +00:00
shihchienc
a97d6bd874 threadnetwork: Avoid execute command if service does not exist am: 0afad08ea2 am: bac748d16d am: 1d365aafa9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3343649

Change-Id: Ia38ac205ad6086dffda75496230de3baf2866a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-14 03:12:09 +00:00
Jyoti Bhayana
e9e5046630 Merge "Add multi-client support in camera2" into main 2024-11-14 03:05:05 +00:00
shihchienc
1d365aafa9 threadnetwork: Avoid execute command if service does not exist am: 0afad08ea2 am: bac748d16d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3343649

Change-Id: If7658b14fd9fff4e57b6ea4654dd883e6160207e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-14 02:33:16 +00:00
shihchienc
bac748d16d threadnetwork: Avoid execute command if service does not exist am: 0afad08ea2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3343649

Change-Id: I49499989692fda16b2d92daa42c0d68ba3388ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-14 02:10:22 +00:00
Grzegorz Jaszczyk
dab9aa5931 ExternalCameraDevice: increase max bytes per pixel am: db7be07c9c am: e511bad369
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3302896

Change-Id: I3a7b3f30e8e8e4e7abee093153b0b3b655b4063b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-14 01:44:15 +00:00
Grzegorz Jaszczyk
e511bad369 ExternalCameraDevice: increase max bytes per pixel am: db7be07c9c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3302896

Change-Id: I2e4034485998e2332debdb4d0d8e210dd0a10f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-14 00:48:30 +00:00
Grzegorz Jaszczyk
db7be07c9c ExternalCameraDevice: increase max bytes per pixel
This fixes some USB external camera which fails to initialize with:

  I ExtCamDevSsn@3.4: configureV4l2StreamLocked: V4L2 buffer size is 614989
  E ExtCamDevSsn@3.4: configureV4l2StreamLocked: V4L2 buffer size: 614989 looks invalid. Expected maximum size: 614400
  E ExtCamDevSsn@3.4: V4L configuration failed!, format:MJPG, w 640, h 480

BUG=b:326773369, b:309244873
Test: Manual camera operation verification

Change-Id: I532bef429792f5a841034a4f3d4eadfa6ed78b2a
Reviewed-by: Tomasz Nowicki <tnowicki@google.com>
Tested-by: Tomasz Nowicki <tnowicki@google.com>
Reviewed-by: Konrad Adamczyk <konrada@google.com>
2024-11-13 22:55:21 +00:00
Jyoti Bhayana
18c22936ed Add multi-client support in camera2
Add support for multiple clients to access the same camera
using camera2 api. This is initial set of changes and includes all the
new API changes as well as implementation of opening the camera in shared mode,
new open callbacks, newly added characteristics and creating shared sesion.

After the merge of these initial changes, it will be followed by another set of changes
which will include implementation of startStreaming and stopStreaming APIs and the
capability for multiple clients to stream the camera images.

Bug:265196098
API-Coverage-Bug: 377371012
Test: Tested that a java and native client are able to open the camera
at the same time and get the required callbacks and they are able to get
the shared session configuration using newly added characteristics.
Tested the clientaccessprioritieschanged callback occur appropriately
when new client connects/disconnects.

Change-Id: I0da9b9be84c6cf176dc2dbc1da8a09700d46fd26
2024-11-13 14:34:54 -08:00
Xin Li
2733768bc4 Merge "Merge 24Q4 (ab/12406339) into aosp-main-future" into aosp-main-future am: 1e4e041f75
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3267579

Change-Id: I0fab3e237dab7c251765c185c16fc307c9a315ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-13 21:52:47 +00:00
Xin Li
f6ccc3ab52 [automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: b7e1b4fcfa -s ours
am skip reason: Merged-In I30915c907c06f577d6428af8aa745dd94c674dc1 with SHA-1 3685883c63 is already in history

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

Change-Id: I7129e4d9307c7524f167c21122da81fba57563e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-13 21:52:42 +00:00
Treehugger Robot
4d2bc399bb Merge changes I6a62eea4,I599435cc into main am: c3b754ac34 am: dad0ed46bb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3348145

Change-Id: I843ea2bc470fca17607f8fb494bf6ada8ed50ae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-13 21:52:18 +00:00
Xin Li
1e4e041f75 Merge "Merge 24Q4 (ab/12406339) into aosp-main-future" into aosp-main-future 2024-11-13 21:43:11 +00:00
Treehugger Robot
dad0ed46bb Merge changes I6a62eea4,I599435cc into main am: c3b754ac34
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3348145

Change-Id: Ic178ce30c1cb8affa309e905c205ac9e7813cb18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-13 21:27:30 +00:00
Treehugger Robot
c3b754ac34 Merge changes I6a62eea4,I599435cc into main
* changes:
  Fix AIDL warnings in Radio HAL
  Move deprecated annotation from structs to their fields
2024-11-13 20:51:30 +00:00
Mahesh KKV
13f53a636c Merge "Add secure HE-LTF protocol version to capabilities" into main 2024-11-13 20:34:16 +00:00
Tomasz Wasilczyk
ed43421b66 Fix AIDL warnings in Radio HAL
Bug: 310710841
Test: mma in any HAL implementation folder
Flag: EXEMPT aidl only
Change-Id: I6a62eea436eae6b416c813f44adeacafa7f38453
2024-11-13 11:38:49 -08:00
Xin Li
b7e1b4fcfa Merge 24Q4 (ab/12406339) into aosp-main-future
Bug: 370570306
Merged-In: I30915c907c06f577d6428af8aa745dd94c674dc1
Change-Id: Ib0409a7c7113802cdb08693b81a4e9618071f8cc
2024-11-13 09:48:12 -08:00
Treehugger Robot
8ed5c3f905 Merge changes from topic "bt-cs-hal-v2" into main am: d60f75431e am: 6a448095d7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3324176

Change-Id: If72133363492c81e5efa919c9c60ffb502bbc331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-13 17:38:58 +00:00
Treehugger Robot
6a448095d7 Merge changes from topic "bt-cs-hal-v2" into main am: d60f75431e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3324176

Change-Id: I73af17166e57d6749ebe760a193f0216ef993901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-13 17:16:17 +00:00