Commit graph

75779 commits

Author SHA1 Message Date
Treehugger Robot
5bfe8317b3 Merge "Implement GetRootOfTrust" am: 7e25d3e8fa
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2115452

Change-Id: Ie005e4728e08610dd4ae1449b589219a8af25b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:59:45 +00:00
Treehugger Robot
7e25d3e8fa Merge "Implement GetRootOfTrust" 2022-06-07 22:43:20 +00:00
Shawn Willden
396bc3f964 Implement GetRootOfTrust
Bug: 219076736
Test: VtsAidlKeyMintTargetTest
Change-Id: I8485360f253ca20f008c5df5090e79c1781fbb4f
2022-06-07 13:19:23 -06:00
Daniel Angell
17cfc1aee4 Merge "Increase num_retries to reduce likelihood of test flake" am: f3e2a9d5c4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2116279

Change-Id: I241db49f5ab836465c35e00256119594e7859f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:48:20 +00:00
Daniel Angell
f3e2a9d5c4 Merge "Increase num_retries to reduce likelihood of test flake" 2022-06-06 23:31:35 +00:00
Daniel Angell
6c2d812508 Increase num_retries to reduce likelihood of test flake
Flakiness was observed in this build:
https://android-build.googleplex.com/builds/pending/P35853772/qemu_generic_arm32_gicv3_test_debug/latest/view/logs/build_error.log

But most other builds do not have this issue.

Bug: 234788755
Change-Id: I4cf7d05a56eb678164bf0006bfb190442d6d4e03
2022-06-06 21:25:17 +00:00
David Drysdale
fe5cf1222e Merge "Make crate vendor_available" am: ad226c11a9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2105625

Change-Id: Ib5bf4008fd52ae0d1baabae86549e68de8afa045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 07:08:46 +00:00
David Drysdale
ad226c11a9 Merge "Make crate vendor_available" 2022-06-06 06:49:13 +00:00
Treehugger Robot
7fa8f7a530 Merge "libprocessgroup: Handle temporarily non-empty group removal failure" am: 6cd136fc61
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2108506

Change-Id: I5fd23f113a484f4eb0d2b2b33038934b880a4dd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:19:38 +00:00
Treehugger Robot
6cd136fc61 Merge "libprocessgroup: Handle temporarily non-empty group removal failure" 2022-06-03 23:11:06 +00:00
Suren Baghdasaryan
fd933786d8 libprocessgroup: Handle temporarily non-empty group removal failure
Cgroup removal fails with EBUSY if there are active processes or threads
still alive in the cgroup. Occasionally a thread or a process might be
stuck in an interruptible sleep and take some time during exit. In such
cases attempts to remove the cgroup it belongs to will fail. This
results in occasional leftover cgroups. These empty unused cgroups
consume memory.
Ensure RemoveProcessGroup always retries and increase the retries to
keep trying for 2 secs before giving up. In majority of cases only a few
retries are needed but in rare cases a thread can be blocked for longer
time, therefore the number of retries is set large enough to cover them.

Bug: 233319780
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I2e4bb1f7b7e19c904c85faea7bbabbfdef9c8125
2022-06-03 21:15:14 +00:00
Treehugger Robot
e8ee78b0db Merge "Added libinit_headers to Android.bp" am: ac9b59ed5a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1985237

Change-Id: I525571a16ff5956f50db66d7d0068eab29524b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 09:16:59 +00:00
Treehugger Robot
ac9b59ed5a Merge "Added libinit_headers to Android.bp" 2022-06-03 08:57:08 +00:00
David Anderson
2904defef3 Merge "fastbootd: Add better logging for flashing failures." am: a090418340
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2114494

Change-Id: I5df6e04eeb6b937e634714160e1ae17678e03faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 05:52:50 +00:00
David Anderson
a090418340 Merge "fastbootd: Add better logging for flashing failures." 2022-06-03 05:20:12 +00:00
Akilesh Kailash
1aae2b57f6 Merge "init: Set oom_score_adj to snapuserd process" am: cb3ef68f22
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2114498

Change-Id: I194a210259959840130a7d4bbfa13c2f5f027e49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:32:49 +00:00
Akilesh Kailash
cb3ef68f22 Merge "init: Set oom_score_adj to snapuserd process" 2022-06-02 21:16:20 +00:00
Akilesh Kailash
4ffe8a3109 init: Set oom_score_adj to snapuserd process
When a process is started as a native service,
oom_score_adj is set to -1000 so that processes
are unkillable by lmkd.

During boot, snapuserd process is not started as a service;
hence, we need to set the oom_score_adj explicitly else in
the event of low memory situation, lmkd can kill the
process thereby device can never boot.

Bug: 234691483
Test: th and OTA on Pixel
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Ic2c85aa470522b4bc847a16b4f5cebfc528ed3cf
2022-06-02 20:49:03 +00:00
David Anderson
5b8a2a6e55 Merge "libsparse: Don't spam errors in sparse_file_import_auto." am: bed6eea329
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2113794

Change-Id: I80ad198d682f7884aaf8b1546e250707a734f4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 18:18:29 +00:00
David Anderson
bed6eea329 Merge "libsparse: Don't spam errors in sparse_file_import_auto." 2022-06-02 17:57:54 +00:00
David Anderson
954ff922ea fastbootd: Add better logging for flashing failures.
Bug: 233980876
Test: builds, fastboot flashall
Change-Id: Icc81ac4d9a4ca76f7eb757df5524d95f488fcd8c
2022-06-01 22:46:35 -07:00
David Anderson
a7fd7b1689 libsparse: Don't spam errors in sparse_file_import_auto.
This function is intended for use on sparse or non-sparse files. But
when used on non-sparse files, it unintentionally reports errors when
trying to detect if the file is sparse or not.

Since the behavior is the same whether or not the detection fails, this
patch disables verbose errors during the import. Verbose errors are
turned on if a resparse is needed.

Bug: 210846593
Test: fastboot flashall
Change-Id: I8404ca7a67adc7fba8a3ac7b4ffa18abfbcafa9d
2022-06-01 18:36:04 -07:00
Christopher Ferris
c6ec681fac Merge "Fix scudo fault address processing." am: d17cefe7e4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2108505

Change-Id: I0bd7fe5b7095b8df3cac88128c8449ba08cc023e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 20:42:56 +00:00
Christopher Ferris
d17cefe7e4 Merge "Fix scudo fault address processing." 2022-06-01 20:20:09 +00:00
Thiébaud Weksteen
46e8d29a4f Merge "Add documentation on mkdir about seclabel" am: 715ecbfb23
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2110586

Change-Id: I4eca56a15db5ef54eaa7ed92cdc83622fb4d7d54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 23:38:19 +00:00
Christopher Ferris
316ae4ccbb Merge "Fix fallback paths for dumping threads." am: 9d11a1d5bd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2107292

Change-Id: If46f26d5c13473918283307d99e2179e0796c2e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 23:38:09 +00:00
Thiébaud Weksteen
715ecbfb23 Merge "Add documentation on mkdir about seclabel" 2022-05-31 23:27:22 +00:00
Christopher Ferris
9d11a1d5bd Merge "Fix fallback paths for dumping threads." 2022-05-31 23:16:58 +00:00
Treehugger Robot
aa8e5fffa8 Merge "[trusty] Bump number of ACVP arguments to match boringssl" am: 762543a34f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2107185

Change-Id: I4146ac22f8c8f1ebb1a5ef822c5fa749cbee44b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 17:04:45 +00:00
Shaju Mathew
d056df414c Merge "Configuration for preprocessor symbol ALLOW_DISABLE_VERITY (followup for: f61f41494e)." am: 8b6dcf4432
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2106730

Change-Id: I381bc291030f05dac550c10c915055369ed5ceaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 17:04:22 +00:00
Treehugger Robot
762543a34f Merge "[trusty] Bump number of ACVP arguments to match boringssl" 2022-05-31 16:53:06 +00:00
Shaju Mathew
8b6dcf4432 Merge "Configuration for preprocessor symbol ALLOW_DISABLE_VERITY (followup for: f61f41494e)." 2022-05-31 16:44:55 +00:00
Yi Kong
ef016a5d00 Merge "Fix incorrect use of TEMP_FAILURE_RETRY" am: 127616da9c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2110285

Change-Id: I12cc25b5f71a974912f82b3dbc2bc069fb2d0ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 05:28:08 +00:00
Yi Kong
127616da9c Merge "Fix incorrect use of TEMP_FAILURE_RETRY" 2022-05-31 05:06:27 +00:00
Thiébaud Weksteen
cc2fb50f52 Add documentation on mkdir about seclabel
Test: n/a
Change-Id: Iab672b4755a259caacf495a6692afcb268b4205f
2022-05-31 14:47:13 +10:00
Yi Kong
ecd6ad0df7 Fix incorrect use of TEMP_FAILURE_RETRY
The return code check should be after TEMP_FAILURE_RETRY.

Discovered by the tautological-constant-compare warning.

Test: presubmit
Bug: 72331526
Change-Id: I531a9e0498ce9448facc692ddedc14434e7ab507
2022-05-30 09:18:31 +00:00
Christopher Ferris
7c2e7e31f6 Fix fallback paths for dumping threads.
In the fallback path, if the non-main thread is the target
to be dumped, then no other threads are dumped when creating
a tombstone. Fix this and add unit tests to verify that
this all threads, including the main thread are dumped.

Bug: 234058038

Test: All unit tests pass.
Test: debuggerd -b media.swcodec process
Test: debuggerd media.swcodec process
Change-Id: Ibb75264f7b3847acdbab939a66902d986c0d0e5c
2022-05-27 13:05:56 -07:00
Shaju Mathew
db48ce2ba9 Configuration for preprocessor symbol ALLOW_DISABLE_VERITY (followup for:
f61f41494e).

disable-verity fails with incorrect error message in userdebug.

Bug: b/232742280

Test: Manual.

Signed-off-by: Shaju Mathew <shaju@google.com>
Change-Id: Icc00433710452e5dca8f5e8e997df2c72e23e4b4
2022-05-27 02:41:50 -07:00
Treehugger Robot
2edd290b4b Merge "vts_fs_test: Require EROFS sysfs nodes." am: ab2d6cdc8f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2106636

Change-Id: I8defe26d9e971456fb0fbad69a1f7c02c51be27a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 07:09:59 +00:00
Treehugger Robot
ab2d6cdc8f Merge "vts_fs_test: Require EROFS sysfs nodes." 2022-05-27 06:56:33 +00:00
David Anderson
1652f0f39a vts_fs_test: Require EROFS sysfs nodes.
These were backported to android13-5.10 and should be present in
T-launch kernels.

Bug: 233926292
Test: vts_fs_test
Change-Id: Ifb5ff6a200b081fe8696d5803d4a128740eb8e21
2022-05-26 21:48:59 -07:00
Treehugger Robot
19d07d1ce5 Merge "charger: Fix charger pixel format useless" am: 69cde888c1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2096696

Change-Id: Iea1e57adae7a23c5670b006a8eebd4f24b0c4dee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 03:10:37 +00:00
Treehugger Robot
69cde888c1 Merge "charger: Fix charger pixel format useless" 2022-05-27 02:54:32 +00:00
liyong
381b89c8db Fix scudo fault address processing.
The code doesn't properly check if data is not read properly, so
make it fail if reads fail. Also, change the algorithm so that
first try and read the faulting page then 16 pages before and 16
pages after. Rather than trying to read every one of these pages,
stop as soon as one is unreadable. This means that the total memory
passed to the scudo error function is all valid data, rather than
potentially being some uninitialized memory.

Added new unit tests to cover scudo address processing.

Bug: 233720136

Test: All unit tests pass.
Test: atest CtsIncidentHostTestCases
Change-Id: I18a97bdee9a0c44075c1c31ccd1b546d10895be9
2022-05-26 18:50:52 -07:00
David Anderson
e3e35dad97 Merge "libsnapshot: Add more feature flags to SnapshotMergeReport." am: 1acfc08e30
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2017637

Change-Id: I6a82916ce6f00fb9c37efa3dd4dab40bfae0a80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 02:11:08 +00:00
David Anderson
69422ea115 Merge "fastboot: Print OemCmdHandler return message on success" am: 3c8a95e3be
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2096451

Change-Id: I35e19b74bcd190508badd2477f69daf138443ca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 02:10:46 +00:00
zengshuchuan
f694cf35ff charger: Fix charger pixel format useless
Create HealthdDraw in charger init beforce CreateDisplaySurface,
make sure minui gr_init pixel_format beforce gr_pixel_format.

Bug: 232441376
Test: 1. set ro.minui.pixel_format=ARGB_8888
2. Set a colorful battery_scale.png
3. Power off and enter charger mode.

Change-Id: If16f15d0a8bc3b7cb9dab7392f3753ec0a1525b8
2022-05-26 09:43:51 +08:00
David Anderson
1acfc08e30 Merge "libsnapshot: Add more feature flags to SnapshotMergeReport." 2022-05-26 00:23:13 +00:00
David Anderson
3c8a95e3be Merge "fastboot: Print OemCmdHandler return message on success" 2022-05-26 00:20:46 +00:00
Treehugger Robot
21d25acbee Merge "Relax filesystem requirements in vts_fs_test." am: b2e68186e5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2107346

Change-Id: I9dc43bae0289a0ae7b8bd11a39db2093c23bacf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 23:10:15 +00:00