Bart Van Assche
1173feedc7
Merge changes I71b34181,Ibd05137a am: 8f09cb5ba6
am: 860d84cf55
am: 99acf232cf
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2444305
Change-Id: Id6d972f34e5e0cb7194911eb5e4b1c449336a2f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 02:40:20 +00:00
Bart Van Assche
99acf232cf
Merge changes I71b34181,Ibd05137a am: 8f09cb5ba6
am: 860d84cf55
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2444305
Change-Id: Ice77f1c996b455439d67a21a45735f73e2cfe627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 01:20:42 +00:00
Bart Van Assche
860d84cf55
Merge changes I71b34181,Ibd05137a am: 8f09cb5ba6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2444305
Change-Id: I95eb0658b3563effd23722fdb8ba74b30cee8f99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 00:17:07 +00:00
Bart Van Assche
8f09cb5ba6
Merge changes I71b34181,Ibd05137a
...
* changes:
init: Document the locking strategy used in class PropWaiterState
init: Document the locking strategy in class ShutdownState
2023-02-21 23:15:14 +00:00
Bart Van Assche
b6b7ccc24f
init: Document the locking strategy used in class PropWaiterState
...
Let the compiler verify that lock_ is held when any of the data members
are accessed.
Bug: 266255006
Change-Id: I71b341815d84ab530627d934ad4d4681b652b9d8
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2023-02-17 13:55:11 -08:00
Bart Van Assche
68a59e1c72
init: Document the locking strategy in class ShutdownState
...
Let the compiler verify that shutdown_command_lock_ is held when
shutdown_command_ is accessed.
Bug: 266255006
Change-Id: Ibd05137ab65e20f247f35bbb2bb1865e05f51f41
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2023-02-17 13:55:11 -08:00
AleX Pelosi
a45d708de6
Merge "BatteryMonitor: batteryStateOfHealth should be a property" into udc-dev
2023-02-17 19:57:59 +00:00
AleX Pelosi
f4846e2d08
BatteryMonitor: batteryStateOfHealth should be a property
...
Bug: 251427118
Test: m
Ignore-AOSP-First: will cherry-pick to aosp later
Change-Id: I21bcd160f51cf8818d0c3c8c54c615314808e586
Signed-off-by: AleX Pelosi <apelosi@google.com>
2023-02-17 16:05:03 +08:00
Treehugger Robot
b4cdc58392
Merge "Add KM_SET_ATTESTATION_IDS_KM3 to enum list" am: 16ab2b67f7
am: 275a1b0bff
am: f55c4d47d7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2440392
Change-Id: I314e44afd0fc7e82003e9c351649e008c88092e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 06:21:44 +00:00
Treehugger Robot
f55c4d47d7
Merge "Add KM_SET_ATTESTATION_IDS_KM3 to enum list" am: 16ab2b67f7
am: 275a1b0bff
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2440392
Change-Id: Id4b9be9bf5f0893f50d8062cbc5c000cbb516fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 01:39:58 +00:00
Treehugger Robot
275a1b0bff
Merge "Add KM_SET_ATTESTATION_IDS_KM3 to enum list" am: 16ab2b67f7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2440392
Change-Id: I00d40318c75a8a58c34bbd8fe28eccbee95606af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 00:54:48 +00:00
Treehugger Robot
16ab2b67f7
Merge "Add KM_SET_ATTESTATION_IDS_KM3 to enum list"
2023-02-16 23:56:16 +00:00
Donnie Pollitz
dedd899baa
Add KM_SET_ATTESTATION_IDS_KM3 to enum list
...
* This command is needed to support provisioning KeyMintv3 attestation IDs
Bug: 265381212
Test: Ran KM Vts
Change-Id: I9b9bf3753b90c58096fa85a4e7303b47eaafe31f
Signed-off-by: Donnie Pollitz <donpollitz@google.com>
2023-02-16 10:59:47 +01:00
Dmitrii Merkurev
cfeffde01b
Merge "fastboot: Use copy constructor to copy fastboot match callback" am: 45380e4ace
am: 09e817e97a
am: fae3571647
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2438273
Change-Id: Ic7ef35b8c48335ff2bb0778204067830973f5e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 20:42:32 +00:00
Dmitrii Merkurev
eb5086507a
Merge "fastboot: Follow fastboot pattern to show network-connected device status" am: 96ea7b9ccf
am: eff5dbdf4e
am: e74297d583
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2438274
Change-Id: I2c4b0b62f9ef5eba588b361356108d11c2680848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 20:41:07 +00:00
Bart Van Assche
e08efc5131
Merge changes Ib9a6b75b,Ifb71fa24,If329e912 am: 678516efa1
am: 7d85beda6e
am: 5b9d7710d2
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2435914
Change-Id: I8b958402ef9cf92c6ee68ebff4b57cd1411b4944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 20:38:24 +00:00
David Anderson
012a8625bd
Merge "snapuserd: Use fixtures in snapuserd_test." am: 9bbe597b59
am: 6be3810b15
am: 1e21b9f11c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2436355
Change-Id: If5e4a0a217813e70a5f81c80bcda41ee584ede93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 20:36:40 +00:00
Dmitrii Merkurev
fae3571647
Merge "fastboot: Use copy constructor to copy fastboot match callback" am: 45380e4ace
am: 09e817e97a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2438273
Change-Id: I2663eb83fc1c1884e2de3b552bc1158257e0a536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 20:33:37 +00:00
Dmitrii Merkurev
e74297d583
Merge "fastboot: Follow fastboot pattern to show network-connected device status" am: 96ea7b9ccf
am: eff5dbdf4e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2438274
Change-Id: I946ce40cf7107b1fcb7bd8eed47a9afbaeabd1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 20:33:26 +00:00
Bart Van Assche
5b9d7710d2
Merge changes Ib9a6b75b,Ifb71fa24,If329e912 am: 678516efa1
am: 7d85beda6e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2435914
Change-Id: Ie23941faf20987b0dc31f051dc36ddbf123b4623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 20:24:02 +00:00
Dmitrii Merkurev
09e817e97a
Merge "fastboot: Use copy constructor to copy fastboot match callback" am: 45380e4ace
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2438273
Change-Id: I1241f1a3d1feb78c01b25079ff9f8ae1c791de54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 19:39:22 +00:00
Dmitrii Merkurev
eff5dbdf4e
Merge "fastboot: Follow fastboot pattern to show network-connected device status" am: 96ea7b9ccf
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2438274
Change-Id: I6c09cd92f9b022f11e8df1cc888d8991df107241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 19:39:00 +00:00
Bart Van Assche
7d85beda6e
Merge changes Ib9a6b75b,Ifb71fa24,If329e912 am: 678516efa1
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2435914
Change-Id: I0775faf62f3ec146f16ea3d76983cfa4d5b1b5eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 19:38:48 +00:00
David Anderson
1e21b9f11c
Merge "snapuserd: Use fixtures in snapuserd_test." am: 9bbe597b59
am: 6be3810b15
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2436355
Change-Id: I4ffd5fc798db514e457586e04722a989ff3ce6cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 19:31:12 +00:00
Dmitrii Merkurev
45380e4ace
Merge "fastboot: Use copy constructor to copy fastboot match callback"
2023-02-15 19:05:55 +00:00
Dmitrii Merkurev
96ea7b9ccf
Merge "fastboot: Follow fastboot pattern to show network-connected device status"
2023-02-15 19:05:34 +00:00
Bart Van Assche
678516efa1
Merge changes Ib9a6b75b,Ifb71fa24,If329e912
...
* changes:
init_test: Close all file descriptors before calling execv()
init_test: Fix a race condition
init_test: Simplify the gentle_kill test
2023-02-15 18:56:42 +00:00
David Anderson
6be3810b15
Merge "snapuserd: Use fixtures in snapuserd_test." am: 9bbe597b59
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2436355
Change-Id: I68940a117f503bf619daca6f7c1ce372ff36a445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 18:47:54 +00:00
David Anderson
9bbe597b59
Merge "snapuserd: Use fixtures in snapuserd_test."
2023-02-15 17:51:48 +00:00
Bart Van Assche
468067a204
init_test: Close all file descriptors before calling execv()
...
This change improves test reliability.
Change-Id: Ib9a6b75bbd81968eb7e2fd90ea567155bc8355f7
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2023-02-15 09:27:32 -08:00
Bart Van Assche
878560dae0
init_test: Fix a race condition
...
Wait until strace has attached to the service instead of assuming that
it has attached after one second.
Change-Id: Ifb71fa2419563e1334d8500ea867ec92121395e0
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2023-02-15 09:27:32 -08:00
Bart Van Assche
947d75f0b8
init_test: Simplify the gentle_kill test
...
Remove the ConvertToArgv() function. Do not cast the std::string::find()
result. Make the strace path absolute.
Change-Id: If329e91275c834ba375863e40901f6be07a5f347
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2023-02-15 09:27:32 -08:00
Dmitrii Merkurev
c48cd9f6c0
fastboot: Follow fastboot pattern to show network-connected device status
...
Bug: 269348113
Test: checked output
Change-Id: Ie6c48d36bd67fcb060ad3f4a35185fd9cc59ff81
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
2023-02-15 15:34:58 +00:00
Dmitrii Merkurev
b5b8276db1
fastboot: Use copy constructor to copy fastboot match callback
...
Test: fastboot -s 15171FDF6000CV getvar all on OSX
Bug: 269348113
Change-Id: I968626c95ee19ea348bac48cac308e3c817e0d55
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
2023-02-15 15:21:22 +00:00
Treehugger Robot
7c3ca41a3b
Merge "Fastboot: Add new TEXT message to protocol to handle long lines." am: 368a908334
am: 941a2caa4b
am: 5acff5d68e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2372748
Change-Id: I2af163d5b64f36d650ac9bcba610b8aa1e1060ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 15:04:58 +00:00
Treehugger Robot
5acff5d68e
Merge "Fastboot: Add new TEXT message to protocol to handle long lines." am: 368a908334
am: 941a2caa4b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2372748
Change-Id: Ie02cc11159e132955b157da1acb890f71abd8037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 14:00:25 +00:00
Treehugger Robot
941a2caa4b
Merge "Fastboot: Add new TEXT message to protocol to handle long lines." am: 368a908334
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2372748
Change-Id: I24528bb617631ed1af2d6b025c9f8dd8a6aff672
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 13:11:27 +00:00
Treehugger Robot
368a908334
Merge "Fastboot: Add new TEXT message to protocol to handle long lines."
2023-02-15 11:49:24 +00:00
Jeffrey Huang
d031a5cc06
Merge "Create new directory for statsd restricted configs" am: 5c1d43f732
am: 712bc86ae0
am: 631e9fd27a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2435916
Change-Id: I46a28f9184885ee0f518c5aeea9cffea95f284e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 02:25:30 +00:00
Jeffrey Huang
631e9fd27a
Merge "Create new directory for statsd restricted configs" am: 5c1d43f732
am: 712bc86ae0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2435916
Change-Id: Ie160ead7567b92122f6066711303215b0f8265e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 02:24:36 +00:00
Jeffrey Huang
712bc86ae0
Merge "Create new directory for statsd restricted configs" am: 5c1d43f732
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2435916
Change-Id: I8dff675b7dae6e3934852f9315469716e66c4fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 01:36:14 +00:00
David Anderson
5169ec88c6
snapuserd: Use fixtures in snapuserd_test.
...
This refactors snapuserd_test to use SnapuserdTest as a fixture, to
avoid needing a separate harness instance.
Bug: 269361087
Test: snapuserd_test
Change-Id: Iffdc7b621dbe0aff72eff790e7af3f6bb33036ee
2023-02-14 16:59:31 -08:00
Jeffrey Huang
5c1d43f732
Merge "Create new directory for statsd restricted configs"
2023-02-15 00:26:17 +00:00
Treehugger Robot
a9145549c2
Merge "Convert Gatekeeper from HIDL to AIDL" am: d14a7551d5
am: 5c2030d470
am: 1a616959c9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2419421
Change-Id: If680c12a406f096f8cf0d10dcc4d6cbee82e1fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 20:44:30 +00:00
David Anderson
de1d41ef00
Merge "storaged: use correct accumulate variable for publishing disk stats" am: 14c7361f9c
am: 15b9050a40
am: eec6697b6d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2433362
Change-Id: I72244c7b535b3dd118ad74f19790ed5b25e90d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 20:42:48 +00:00
Raphael Herouart
99097cc020
Fastboot: Add new TEXT message to protocol to handle long lines.
...
Trusty Benchmarks need to be evaluated in ABL which is much more
controlled than linux. However fastboot prints evry atomic message from
trusty/abl on its own line starting with "(bootloader)"
Bug: 263454481
Test: - "fastboot oem trusty runtest trusty.hwrng.bench"
Change-Id: I99847a8cc54457c8ec809e219736325dce0ac891
2023-02-14 19:58:42 +00:00
Treehugger Robot
1a616959c9
Merge "Convert Gatekeeper from HIDL to AIDL" am: d14a7551d5
am: 5c2030d470
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2419421
Change-Id: I8796899e4b8211ab21648be2ae3e0569d169264d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 19:41:21 +00:00
David Anderson
eec6697b6d
Merge "storaged: use correct accumulate variable for publishing disk stats" am: 14c7361f9c
am: 15b9050a40
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2433362
Change-Id: I3cb6cbb8e9608002d3dbfdaf26079325ce6c6170
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 19:40:55 +00:00
Jeffrey Huang
01a73d74d8
Create new directory for statsd restricted configs
...
Bug: 264407489
Test: m -j
Change-Id: I10e7d6a4a6d011eb9a7453191ab90771b82aa9b3
2023-02-14 11:25:45 -08:00
Treehugger Robot
5c2030d470
Merge "Convert Gatekeeper from HIDL to AIDL" am: d14a7551d5
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2419421
Change-Id: I2a27fbd3c9e9efd03b042c3657e8e475b3f98be3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 18:56:35 +00:00