Commit graph

77890 commits

Author SHA1 Message Date
Kean Mariotti
7772fc84f5 Merge "Revert "Set the log callback earlier for showing system property set denials"" am: 526fbe2a37 am: c0e0892a5a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2118487

Change-Id: I351a3a385c5d1be27258343db342910c5ec0291f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 09:50:51 +00:00
Kean Mariotti
c0e0892a5a Merge "Revert "Set the log callback earlier for showing system property set denials"" am: 526fbe2a37
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2118487

Change-Id: I016b315fb5b79b330125a0d1ca746a7430144f16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 09:32:41 +00:00
Kean Mariotti
526fbe2a37 Merge "Revert "Set the log callback earlier for showing system property set denials"" 2022-06-08 09:07:42 +00:00
Kean Mariotti
3a6040eb71 Revert "Set the log callback earlier for showing system property set denials"
This reverts commit 8c224faa24.

Reason for revert: 235312897

Change-Id: I80684c80bb6f97853449d429bbf948c07d4cb651
2022-06-08 07:57:53 +00:00
Alex Hong
c0b9b5f2d3 Merge "Set the log callback earlier for showing system property set denials" am: af74368a36 am: 219306f683
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1684665

Change-Id: Ic880afd4b9393b6d5e0516c914d00c5ec27de55c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 06:11:38 +00:00
Alex Hong
219306f683 Merge "Set the log callback earlier for showing system property set denials" am: af74368a36
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1684665

Change-Id: I1698ef9d4f862497325ef1f96f8b78f732889ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 05:53:21 +00:00
Alex Hong
af74368a36 Merge "Set the log callback earlier for showing system property set denials" 2022-06-08 05:37:22 +00:00
Treehugger Robot
7c3e3e0bc7 Merge "Implement GetRootOfTrust" am: 7e25d3e8fa am: 5bfe8317b3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2115452

Change-Id: I07986fb1e781dcf46a03eaca3ac7c685c605c533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 23:25:56 +00:00
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
7ab7923a90 Merge "Increase num_retries to reduce likelihood of test flake" am: f3e2a9d5c4 am: 17cfc1aee4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2116279

Change-Id: Iae2a6cb0d909e73990b44a84ac4a0a1beff58a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 00:05:48 +00: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
fe9c3276bd Merge "Make crate vendor_available" am: ad226c11a9 am: fe5cf1222e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2105625

Change-Id: I79488d0b7ecdef24405c2345d0345861cad48960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 07:46:07 +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
f9e956f4f6 Merge "libprocessgroup: Handle temporarily non-empty group removal failure" am: 6cd136fc61 am: 7fa8f7a530
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2108506

Change-Id: I40d259dcbb3409a010dc04a3d82e5ce2d065c480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:46:15 +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
c6e1bb2b8c Merge "Added libinit_headers to Android.bp" am: ac9b59ed5a am: e8ee78b0db
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1985237

Change-Id: I3d4364cb1f4ac8a3186ea862cb8a0f317f569059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 09:42:33 +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
86f07627ba Merge "fastbootd: Add better logging for flashing failures." am: a090418340 am: 2904defef3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2114494

Change-Id: I2249e54b1cc037f87c1e4053fed9c74e3674bae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 06:17:54 +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
962be795b2 Merge "init: Set oom_score_adj to snapuserd process" into tm-dev am: ae2837d80c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/18720435

Change-Id: I807cb1a59b3c440b0518aa3716767aa490f68ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 23:39:02 +00:00
Akilesh Kailash
ae2837d80c Merge "init: Set oom_score_adj to snapuserd process" into tm-dev 2022-06-02 23:18:52 +00:00
Akilesh Kailash
6e01fe9537 Merge "init: Set oom_score_adj to snapuserd process" am: cb3ef68f22 am: 1aae2b57f6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2114498

Change-Id: I4b2186888dff2daef99b9fa356802b60906c13fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:59:38 +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
1a2f870cb3 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
Ignore-AOSP-First: cherry-pick from AOSP
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Ic2c85aa470522b4bc847a16b4f5cebfc528ed3cf
2022-06-02 21:19:46 +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
bc10150e77 Merge "libsparse: Don't spam errors in sparse_file_import_auto." am: bed6eea329 am: 5b8a2a6e55
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2113794

Change-Id: I53b24c09c97781ce49137a8af3512e9acdbbf3c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 18:34:51 +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
Stephen Crane
5d72129463 [automerger skipped] [trusty] Bump number of ACVP arguments to match boringssl am: 71100bbc44 -s ours
am skip reason: Merged-In Ia79705d9fe32a07afc09cf8e0231db300073b504 with SHA-1 08d8557718 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/18674342

Change-Id: Ic40935e27f6f222a961986f5a9a24bbf80f34b47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 12:07:36 +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
ce0680993f Merge "Fix scudo fault address processing." am: d17cefe7e4 am: c6ec681fac
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2108505

Change-Id: I4be0beee8dd592e68117d4b3cfd8e883b4bbc888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 20:59:54 +00: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
ddbc4fdad1 Merge "Add documentation on mkdir about seclabel" am: 715ecbfb23 am: 46e8d29a4f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2110586

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

Change-Id: I1aac1a96a8ae16f711f043182e9c68bd1dc7dacd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 00:02:07 +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