Peter Lin
239779d664
[automerger skipped] [VTS] Update SetDisplayBrightness test item am: 70d2ef6b34
am: f43004efcf
am: 93871bd98f
am: 5231b4bcb0
-s ours
...
am skip reason: Merged-In I94fb700704bcbd8543f2a608dd75b9e745e40e37 with SHA-1 b9fbd4e3c7
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2883951
Change-Id: I6b13b82ea2cf269b6b3cdccf506391e6a7e366ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 04:08:50 +00:00
Peter Lin
5231b4bcb0
[VTS] Update SetDisplayBrightness test item am: 70d2ef6b34
am: f43004efcf
am: 93871bd98f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2883951
Change-Id: I9f1508c85e7dd4a14bdfc9fffd8c7f0365c503f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 03:34:57 +00:00
Peter Lin
93871bd98f
[VTS] Update SetDisplayBrightness test item am: 70d2ef6b34
am: f43004efcf
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2883951
Change-Id: Ib6dd08b218e4bf0bf1cb40dcf850928fb147f907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 02:45:33 +00:00
Peter Lin
f43004efcf
[VTS] Update SetDisplayBrightness test item am: 70d2ef6b34
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2883951
Change-Id: Ia57991b0f949307764afeb9fe9fa58c67740900e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 02:13:22 +00:00
Treehugger Robot
f4fc926bf8
Merge "Fixed documentation for resolution in SubscriptionOptions.aidl" into main
2023-12-21 01:24:09 +00:00
Yu Shan
08e916ca1b
Merge "Rename to getAllPendingScheduledTasks." into main
2023-12-21 00:23:47 +00:00
Shuzhen Wang
aa2d572093
Merge "Revert "Camera: VTS: Require ConstructDefaultSettings for new HAL"" into main
2023-12-20 22:49:13 +00:00
Yu Shan
59f33e4e31
Rename to getAllPendingScheduledTasks.
...
Rename getAllScheduledTasks to getAllPendingScheduledTasks.
Test: Presubmit
Bug: 305285376
Change-Id: I0a908d3c4cc77ff718883e17468a2ff75df470d3
2023-12-20 22:47:02 +00:00
Shuzhen Wang
7a237d1545
Revert "Camera: VTS: Require ConstructDefaultSettings for new HAL"
...
Revert submission 25658204-EnableFeatureCombination
Reason for revert: b/317270728
Reverted changes: /q/submissionid:25658204-EnableFeatureCombination
Change-Id: Id048e9bd5ba08f7856ccf88fd7bfdca06ce0727c
2023-12-20 22:22:12 +00:00
Shuzhen Wang
a0de1e3727
Merge "Camera: VTS: Require ConstructDefaultSettings for new HAL" into main
2023-12-20 20:43:45 +00:00
Shikha Panwar
1246b8778f
Merge "Clarify Secretkeeper comments" into main am: 99cf847175
am: 5605362e10
am: e0ef257a9c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2885127
Change-Id: I55203e8f170b139cb73769efde17db846bc74bf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 19:49:24 +00:00
Shikha Panwar
f700486439
Secretkeeper/VTS: Per-connection replay protection am: 3d33a135ad
am: 04273c2f59
am: 38e4d70130
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2882814
Change-Id: Ia8afd22f3a976e7f267f7dd4f0d09ac7a0607fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 19:48:54 +00:00
Shikha Panwar
9a14a5ea27
Add SeqNum as an the external_aad in CryptoPayload am: 73f66600e9
am: 27f472d5ad
am: 64b351449a
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2876314
Change-Id: I098e5e8f4767ec7c108d26afd1fd1c077835a109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 19:48:46 +00:00
Shikha Panwar
e0ef257a9c
Merge "Clarify Secretkeeper comments" into main am: 99cf847175
am: 5605362e10
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2885127
Change-Id: I18dd3b8ff043e2ab2b0bacbb2814b36a9d0bbd65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 19:17:15 +00:00
Shikha Panwar
38e4d70130
Secretkeeper/VTS: Per-connection replay protection am: 3d33a135ad
am: 04273c2f59
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2882814
Change-Id: I1b2baa2cc9f049b93383f9ee9e0b0dec05c8bddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 19:16:35 +00:00
Shikha Panwar
64b351449a
Add SeqNum as an the external_aad in CryptoPayload am: 73f66600e9
am: 27f472d5ad
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2876314
Change-Id: I5a1dd0a2a376efdb1509e9dfb697174b8f90e366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 19:16:30 +00:00
Shikha Panwar
5605362e10
Merge "Clarify Secretkeeper comments" into main am: 99cf847175
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2885127
Change-Id: I475d819f43cc892b083c562527b77a63172422d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 18:47:19 +00:00
Shikha Panwar
04273c2f59
Secretkeeper/VTS: Per-connection replay protection am: 3d33a135ad
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2882814
Change-Id: I4c87334c53cc71183117ac8cdc8bc4c1a9139f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 18:46:28 +00:00
Shikha Panwar
27f472d5ad
Add SeqNum as an the external_aad in CryptoPayload am: 73f66600e9
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2876314
Change-Id: I81fd4bae4310011c76513867cc832a3938ea25e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 18:46:22 +00:00
Shikha Panwar
99cf847175
Merge "Clarify Secretkeeper comments" into main
2023-12-20 18:38:51 +00:00
Alan Stokes
45d1faaea8
Clarify Secretkeeper comments
...
Various small wording changes to attempt to clarify some of the
details of the Secretkeeper API.
While I'm here: fix error code naming inconsistency.
Bug: 291224769
Test: N/A
Change-Id: I956b549bc5bf4d2b964dde9867430cb4778e445b
2023-12-20 17:46:14 +00:00
Gil Cukierman
51548b2a9a
Clarify securityALgorithmsUpdated emergency behavior
...
securityAlgorithmsUpdated should be called by modems when the value of isUnprotectedEmergency changes.
Bug: 317205446
Change-Id: I5e1815458119038495c1c38089bea7db69ae183c
Test: m
2023-12-20 17:11:29 +00:00
Shikha Panwar
3d33a135ad
Secretkeeper/VTS: Per-connection replay protection
...
Add test coverage for replay protection in Secretkeeper. Test that:
1. Sk implementation encrypts/decrypts messages using correct
sequence_numbers.
2. Out of order messages are not accepted.
3. The sequence numbers are per-connection ie, new SeqNum is used for a
fresh connection.
Also, refactor code. SeqNumbers are maintained by
libsecretkeeper_client. Have sk_client use a handle to SkSession for
SecretManagement requests. Replay protection tests however require more
fine grained control of SeqNums. For these we have introduced
`secret_management_request_custom_aad()` method.
Bug: 316126411
Test: atest VtsSecretkeeperTargetTest
Change-Id: I385856c04e185d2b300d59a1b54cb8f09cbf836f
2023-12-20 14:41:09 +00:00
Shikha Panwar
73f66600e9
Add SeqNum as an the external_aad in CryptoPayload
...
Introduce sequence number in Secretkeeper packets to prevent replay of
packets with a session.
Bug: 316126411
Test: VTS
Change-Id: I20a5d8489e988bdcbe9058495ab56ed18a07b946
2023-12-20 14:41:09 +00:00
David Drysdale
509fddbd78
Merge "Secretkeeper VTS: check for declared instances" into main am: 91664b85b8
am: fd2439b67a
am: 26f73df792
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2882206
Change-Id: I4f8284811a0dc411958276914b846d44dfcfe43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 12:10:09 +00:00
David Drysdale
0f1a490d0c
Merge "Add ISecretkeeper/default" into main am: e1ac7c65a2
am: 0e0b3459a4
am: fde16f7e0c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2856630
Change-Id: I066129d16f22332467b31d8e791762dee9faef38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 12:09:38 +00:00
David Drysdale
26f73df792
Merge "Secretkeeper VTS: check for declared instances" into main am: 91664b85b8
am: fd2439b67a
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2882206
Change-Id: I20d3891f88a215900bb0651f5be13d9fa88467c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 11:38:46 +00:00
David Drysdale
fde16f7e0c
Merge "Add ISecretkeeper/default" into main am: e1ac7c65a2
am: 0e0b3459a4
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2856630
Change-Id: I1a45955a9432092b34fc164f690306571a1fd1fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 11:38:21 +00:00
David Drysdale
fd2439b67a
Merge "Secretkeeper VTS: check for declared instances" into main am: 91664b85b8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2882206
Change-Id: Ia6c06215552ca0c2427571a8776c69c4c7674aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 10:52:21 +00:00
David Drysdale
0e0b3459a4
Merge "Add ISecretkeeper/default" into main am: e1ac7c65a2
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2856630
Change-Id: I3271802ee66195284b5796a1caacfb84b8089427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 10:51:53 +00:00
David Drysdale
91664b85b8
Merge "Secretkeeper VTS: check for declared instances" into main
2023-12-20 10:25:54 +00:00
David Drysdale
e1ac7c65a2
Merge "Add ISecretkeeper/default" into main
2023-12-20 10:24:11 +00:00
Peter Lin
70d2ef6b34
[VTS] Update SetDisplayBrightness test item
...
Ensure the primary display power on before run the
SetDisplayBrightness test item.
Bug: 313794734
Test: atest VtsHalGraphicsComposer3_TargetTest:PerInstance/
GraphicsComposerAidlCommandTest#SetDisplayBrightness/
0_android_hardware_graphics_composer3_IComposer_default
-- --abi arm64-v8a
Change-Id: I94fb700704bcbd8543f2a608dd75b9e745e40e37
Merged-In: I94fb700704bcbd8543f2a608dd75b9e745e40e37
2023-12-20 06:49:27 +00:00
Treehugger Robot
10c7933608
Merge "Filter unsupported propIds for current version." into main
2023-12-20 03:20:01 +00:00
Bob Wang
cbaf4759b5
Merge "Send DeviceResetCmd after task handle is dropped." into main am: 161a39c309
am: 39b06f389e
am: 28fbbeafd0
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2883606
Change-Id: Ic721558f0f326828cae75a7c0d4da917f12a6fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 03:18:03 +00:00
Bob Wang
28fbbeafd0
Merge "Send DeviceResetCmd after task handle is dropped." into main am: 161a39c309
am: 39b06f389e
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2883606
Change-Id: I4f1dacc56078c62b623d14bcccc26fd569892f5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 02:45:02 +00:00
Bob Wang
39b06f389e
Merge "Send DeviceResetCmd after task handle is dropped." into main am: 161a39c309
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2883606
Change-Id: Ic0afe60bef45764cb274bd3f0f7b99626512c766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 02:13:15 +00:00
Bob Wang
161a39c309
Merge "Send DeviceResetCmd after task handle is dropped." into main
2023-12-20 01:52:05 +00:00
Shuzhen Wang
d7f0d0ab4a
Camera: VTS: Require ConstructDefaultSettings for new HAL
...
Test: Run VTS test on Cuttlefish and Pixel
Bug: 309627704
Change-Id: Ic65ffef691c6b2e9fefbdcbd27598b3666062a9a
2023-12-20 00:27:12 +00:00
Shunkai Yao
af93095530
Merge changes from topic "effect_ dependencies" into main am: 996e1ad8b7
am: 77af530748
am: ecfc88acec
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2875179
Change-Id: I06613c327736afcd090380682ab89336344125bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 23:12:46 +00:00
Shunkai Yao
34d18b2895
Update VTS header includes am: 1283685b4f
am: 56527a5cdd
am: ae22828ac5
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2871438
Change-Id: Ia55ddf658434d93f88e0ba1c0442a9bc224f3359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 23:12:42 +00:00
Shunkai Yao
ecfc88acec
Merge changes from topic "effect_ dependencies" into main am: 996e1ad8b7
am: 77af530748
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2875179
Change-Id: Ifd127e32adc5bc107c2c9511a5c6601c89626ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 22:25:10 +00:00
Shunkai Yao
ae22828ac5
Update VTS header includes am: 1283685b4f
am: 56527a5cdd
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2871438
Change-Id: Ie16a81c8e1193617679de62bc92a7042ce8e2efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 22:25:06 +00:00
Shunkai Yao
77af530748
Merge changes from topic "effect_ dependencies" into main am: 996e1ad8b7
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2875179
Change-Id: I375d8c6b9ce7db75fbe8dc4d83bae2aeb70d115a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 21:54:48 +00:00
Shunkai Yao
56527a5cdd
Update VTS header includes am: 1283685b4f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2871438
Change-Id: Ibd8e5b5c27ecc6c4609301424878501a7c0dff16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 21:54:43 +00:00
ziyiw
965dd14687
Send DeviceResetCmd after task handle is dropped.
...
Previously the command was sent before the task handle is dropped. This
may cause race condition that the DeviceResetRsp may be consumed by the
reader created in open(). In this case, the
consume_device_reset_rsp_and_ntf will wait until timeout.
Bug: 316421259
Test: manual
Change-Id: I680d3ea79344f9b5f07a36877837bfc1b8e0532a
2023-12-19 21:19:24 +00:00
Shunkai Yao
996e1ad8b7
Merge changes from topic "effect_ dependencies" into main
...
* changes:
Effect AIDL: cleanup dependencies
Update VTS header includes
2023-12-19 21:07:35 +00:00
shrikar
43dd9ab7c7
Fixed documentation for resolution in SubscriptionOptions.aidl
...
Bug: 276124296
Test: m
Change-Id: Ia75f4ca8389aedff4636af844dd76dfe8c8b6105
2023-12-19 18:54:22 +00:00
David Drysdale
0bd88b03b3
Secretkeeper VTS: check for declared instances
...
Calling binder::get_interface(name) for a name that isn't declared may
take multiple seconds before failing. Restrict to looking for instance
names that are declared.
Also add a rustfmt.toml file, copied from system/secretkeeper/
Bug: 291228655
Test: VtsSecretkeeperTargetTest on Cuttlefish and Pixel8
Change-Id: I9972bc782fe99f5dc5c2dc3b74fa12a0e000ea6c
2023-12-19 15:14:52 +00:00
Treehugger Robot
59d64f830e
Merge "[VTS] Update SetDisplayBrightness test item" into main
2023-12-19 11:27:19 +00:00