Commit graph

74809 commits

Author SHA1 Message Date
Yifan Hong
bec22faf12 Merge "healthd: batterymonitor uses AIDL HealthInfo." am: 0326984c42
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2004731

Change-Id: I04af2fc284637ea5f371e81a28a62c603de2f34d
2022-03-02 19:41:59 +00:00
Yifan Hong
0326984c42 Merge "healthd: batterymonitor uses AIDL HealthInfo." 2022-03-02 19:20:31 +00:00
Yifan Hong
b99d15c529 healthd: batterymonitor uses AIDL HealthInfo.
This change cleans up technical debt. As a side
effect, this change also exposes chargerDockOnline
properly to health HAL implementations.

Test: TH
Bug: 222120465
Change-Id: I306bd0538d94b310a69befb93b5862dd7208447f
2022-03-02 16:20:35 +08:00
Treehugger Robot
029e47a6b0 Merge "vts_fs_test: Statically link libfs_mgr." am: 1e80f2d47d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2004734

Change-Id: I0ace3058906f70c4be34e719479fc40b81b9db9a
2022-03-02 02:57:18 +00:00
Treehugger Robot
1e80f2d47d Merge "vts_fs_test: Statically link libfs_mgr." 2022-03-02 02:29:44 +00:00
David Anderson
0a9c083b87 vts_fs_test: Statically link libfs_mgr.
Bug: 222065493
Test: builds
Change-Id: I9ce4aa2594a4e946c79a51f0ed3d2121c7eaee36
2022-03-01 14:12:26 -08:00
Bart Van Assche
baa911e297 Merge changes I5a6f587e,I972f4e60,Ib8e1e87f am: 8b162ac936
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2003092

Change-Id: Idd0103676a9840591deabff0b7c9d374f0bca438
2022-03-01 15:47:35 +00:00
Bart Van Assche
8b162ac936 Merge changes I5a6f587e,I972f4e60,Ib8e1e87f
* changes:
  Introduce the RunService() method
  Introduce the ConfigureMemcg() method
  Introduce the Service::CheckConsole() method
2022-03-01 15:20:03 +00:00
Bart Van Assche
bd73665e68 Introduce the RunService() method
The Service::Start() method is so long that its length negatively
affects readability of the code. Hence this patch that splits
Service::Start().

Test: Booted Android in Cuttlefish.
Change-Id: I5a6f587ecc5e6470137de6cceda7e685bce28ced
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-03-01 15:17:33 +00:00
Bart Van Assche
f2222aab6a Introduce the ConfigureMemcg() method
The Service::Start() method is so long that its length negatively
affects readability of the code. Hence this patch that splits
Service::Start().

Test: Booted Android in Cuttlefish.
Change-Id: I972f4e60844bb0d133b1cca1fd4e06bb89fc5f37
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-03-01 15:17:33 +00:00
Bart Van Assche
847b80a112 Introduce the Service::CheckConsole() method
The Service::Start() method is so long that its length negatively
affects readability of the code. Hence this patch that splits
Service::Start().

Test: Booted Android in Cuttlefish.
Change-Id: Ib8e1e87fbd335520cbe3aac2a88d250fcf3b4ff0
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-03-01 15:17:33 +00:00
David Drysdale
bdeef4b0ed Merge "Include correct authorization_set.h header" am: b99ace4af1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1992925

Change-Id: I259e564d82ec1a8202faa771e6b3af01b0f2b87c
2022-03-01 11:02:21 +00:00
David Drysdale
b99ace4af1 Merge "Include correct authorization_set.h header" 2022-03-01 10:31:26 +00:00
Wei Wang
6bf71e0cdd Merge "Support process path for WriteFileAction" am: a323e0233d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1979310

Change-Id: I051ae3978453680b00fa9f16e5f54bd846ac476f
2022-03-01 00:23:30 +00:00
Wei Wang
a323e0233d Merge "Support process path for WriteFileAction" 2022-03-01 00:06:57 +00:00
Treehugger Robot
dbc6027fde Merge "Update to KeyMint & iRPC v2" am: 8e4b2bfd5b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2002271

Change-Id: I1207f05e419109cc38f8944d7b1b1ce9fbaef87b
2022-02-28 22:04:25 +00:00
Treehugger Robot
8e4b2bfd5b Merge "Update to KeyMint & iRPC v2" 2022-02-28 21:46:00 +00:00
Shawn Willden
0485712141 Update to KeyMint & iRPC v2
Bug: 221390931
Test: run vts -m vts_treble_vintf_vendor_test
Change-Id: I1749439700f78433d31b52067edb32a031cc8777
2022-02-28 09:35:43 -07:00
Rick Yiu
9221b1eeae Support process path for WriteFileAction
Currently, there is no distinguish between SetTaskProfiles and
SetProcessProfiles in WriteFileAction because they use the same task
path. Add ProcFilePath attribute so that WriteFileAction could use
a separate path for process in SetProcessProfiles.

Bug: 218684257
Test: function works
Change-Id: I004b8c8799240c54f1ef1fed0566fa5057341cf4
2022-02-26 12:38:03 +00:00
Devin Moore
793e1777b5 Merge "Update init/README.md to mention bootconfig for androidboot argument" am: 192b5569b0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2000397

Change-Id: Ic2544524b5406a55e60bb4a755aae90621437db3
2022-02-25 23:29:03 +00:00
Devin Moore
192b5569b0 Merge "Update init/README.md to mention bootconfig for androidboot argument" 2022-02-25 23:00:17 +00:00
Treehugger Robot
fb78f6f5e4 Merge "Fix OkOrFail<status_t> conversion ambiguities" am: 5a1f51b070
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2000911

Change-Id: I1cd7d265fa2499060f2fba42652ebbf2258f3fcf
2022-02-25 21:49:11 +00:00
Treehugger Robot
5a1f51b070 Merge "Fix OkOrFail<status_t> conversion ambiguities" 2022-02-25 21:15:57 +00:00
Atneya Nair
dde6034eac Fix OkOrFail<status_t> conversion ambiguities
OkOrFail<status_t> has specialized conversions for Result<int, StatusT>
to avoid ambiguous implicit conversion sequences. Since user conversion
operators sequences can be followed by integral promotion, specializing
for integral types is necessary.

Specialize ResultError<StatusT> so calling code() returns a status_t
instead of a StatusT and message() is implemented even when not carrying
a string.
Eventually, these classes should be combined.

Add equality operators for ResultError<StatusT>.

Bug: 219580167
Test: atest Errors_test.cpp
Merged-In: I14acecfd2aef33c40e79ddb091e2f4af9291d837
Change-Id: Ifb5ed3c2d3452b10901e4aeb19368d873225d9ce
2022-02-25 14:27:41 -05:00
Tri Vo
a4174c8c39 Merge "Bumping the HAL client version." am: 96686aaf60
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1978106

Change-Id: I01249369a8ae59a1835ab8a1a0b7122426c87e72
2022-02-25 18:25:12 +00:00
Tri Vo
96686aaf60 Merge "Bumping the HAL client version." 2022-02-25 18:03:20 +00:00
Devin Moore
07ec259a54 Update init/README.md to mention bootconfig for androidboot argument
In Android S and later, androidboot.* kernel cmdline parameters are
moved to bootconfig instead the kernel cmdline. This includes the
androidboot.force_normal_boot.

Bug: 219951268
Test: N/A
Change-Id: Id0328ad09a34d654de9936e37a576a8a9f44de6c
2022-02-25 17:04:45 +00:00
Akilesh Kailash
3ecce81c83 Merge "snapuserd: Fallback to synchronous I/O if any errors observed during async merge." am: 806c29721a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1995474

Change-Id: I7f46b07c6a136788960b317cc4b84310b6ab687d
2022-02-25 01:25:53 +00:00
Akilesh Kailash
806c29721a Merge "snapuserd: Fallback to synchronous I/O if any errors observed during async merge." 2022-02-25 00:58:19 +00:00
Akilesh Kailash
325e2acbb9 snapuserd: Fallback to synchronous I/O if any errors observed during
async merge.

If there are any I/O errors during async merge, we will
retry the I/O in synchronous I/O path. For this to happen,
we have to reset the iterator so that we replay the blocks
which were partially completed during async merge. Furthermore,
we will disable the async merge and continue to do the I/O
in synchronous path.

Additionally, cut down the queue depth to 8 so that
it will decerease the number of the async offload. We don't
want to have a big queue depth with async offload.

Bug: 220991038
Test: Instrument the code to fail the Async I/O's
randomly and make sure merge is completed. Instrumentation
was done both on readahead and merge code path.

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I0db6d0f46054ca5b8423201a598c726b2c3d21ac
2022-02-24 06:08:26 +00:00
Treehugger Robot
4d15ed6aeb Merge "Make task profiles easier to debug" am: 7a7c8e4607
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1962322

Change-Id: I7fa67d9116090a0e65f9a840cea4399082f12526
2022-02-24 02:52:23 +00:00
Treehugger Robot
7a7c8e4607 Merge "Make task profiles easier to debug" 2022-02-24 02:27:55 +00:00
Treehugger Robot
34d513fa71 Merge "Provide alternate SE RoT provisioning path." am: df62d41eeb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1990815

Change-Id: I1edc13ec029fa51a81bd034ea606bb30623d8cb4
2022-02-23 18:24:13 +00:00
Tri Vo
f1c2531383 Merge "trusty: Convert Trusty driver tests to python_test" am: 7da30bd9f8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1989168

Change-Id: I86943d3e312bf068bb4b7da3a7173cbd56d7f355
2022-02-23 18:21:17 +00:00
Treehugger Robot
df62d41eeb Merge "Provide alternate SE RoT provisioning path." 2022-02-23 18:13:01 +00:00
Tri Vo
7da30bd9f8 Merge "trusty: Convert Trusty driver tests to python_test" 2022-02-23 17:58:06 +00:00
Shawn Willden
0f89bc1270 Provide alternate SE RoT provisioning path.
On some devices it is infeasible to provision the KeyMint RoT bits in
the Android Bootloader.  This provides an alternate path to provision
them from the TEE during early boot.

Bug: 219076736
Test: VtsAidlKeyMintTargetTest
Change-Id: Ibae9050b9a102dad3710f9495d3dfa43fa1d1b3f
Merged-In: Ibae9050b9a102dad3710f9495d3dfa43fa1d1b3f
2022-02-22 23:51:15 -07:00
David Drysdale
74f763961a Include correct authorization_set.h header
Bug: 206470603
Test: TreeHugger
Change-Id: I748660d45a539c9e2c2e13605d1d4f61b1b2fb5e
2022-02-23 06:27:16 +00:00
Tri Vo
ccc11f4969 trusty: Convert Trusty driver tests to python_test
Original tests are implemented as shell scripts here:
https://android.googlesource.com/trusty/vendor/google/aosp/+/refs/heads/master/scripts/test-map#100

Bug: 219992178
Test: trusty_driver_test
Change-Id: I8a55cb660bb0cb27bb4ef32aaa0658d0c17c36e3
2022-02-22 17:40:29 -08:00
Yi-yo Chiang
0f7d591189 Merge "TransformFstabForDsu: Insert synthesised entry at end of mount group" am: ae0f4d5e45
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1991619

Change-Id: Ia422a6d63e90dd730f302734d77b278d8035c51e
2022-02-20 06:03:18 +00:00
Yi-yo Chiang
ae0f4d5e45 Merge "TransformFstabForDsu: Insert synthesised entry at end of mount group" 2022-02-20 05:33:41 +00:00
David Anderson
41d2cac782 Merge "Add a VTS test for Virtual A/B." am: 692c6d0f74
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1991381

Change-Id: Ibc67321cd3c0154c35f3abcb80dc29c30e525bf4
2022-02-19 01:53:06 +00:00
David Anderson
692c6d0f74 Merge "Add a VTS test for Virtual A/B." 2022-02-19 01:28:59 +00:00
David Anderson
d635f15dd1 Merge "fs_mgr: Fix __ANDROID_RECOVERY__ usage in libfiemap." am: 7a5379d0e1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1978057

Change-Id: Iae8e78f35747ecbf8d8fd6f20c773ce386e3f16c
2022-02-18 23:59:11 +00:00
David Anderson
7a5379d0e1 Merge "fs_mgr: Fix __ANDROID_RECOVERY__ usage in libfiemap." 2022-02-18 23:29:27 +00:00
David Anderson
36a4784681 Add a VTS test for Virtual A/B.
Bug: N/A
Test: vts_ota_config_test
Change-Id: Ibcee72dcbd9b8d157c3cc989d46fba6277115207
2022-02-18 14:16:44 -08:00
Treehugger Robot
7fb8b81994 Merge "Add systrace tag for thermal" am: 1889a41c88
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1984173

Change-Id: Ibdde887a3db9bc47b93dc9ab120cee4f4df4c1e7
2022-02-18 21:15:51 +00:00
Colin Cross
3a901a46af Merge "Use sanitizer paths exported by make" am: 86b6db0b0f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1990491

Change-Id: I624aacbd358d0f412a3a7bdbcb0a9a8b9e62673d
2022-02-18 21:15:22 +00:00
David Anderson
41e03dc1c6 Merge "remount: Create a bigger scratch partition on /data." am: c2b2bf3539
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1989238

Change-Id: Iddb064bfcfa9614be0ec3584eccab3e66b49ee9d
2022-02-18 21:14:26 +00:00
David Anderson
21f1ae2fad Merge "fs_mgr: Don't allow dt fstabs in new devices." am: 460886c175
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1989241

Change-Id: Ief2d58f81aa0d009dbb9530324e98bd50ce66af9
2022-02-18 21:14:17 +00:00