Commit graph

77564 commits

Author SHA1 Message Date
Josh Yang
86b08e5efd Update the encryption rule of /data/bootanim to DeleteIfNecessary
Directories should always be encrypted unless there is a specific reason
they can't be.  /data/bootanim is unencrypted without a specific reason,
so fix it to be encrypted.  It is too late to use encryption=Require.
However, the contents of this directory doesn't need to be preserved on
updates, so we can use encryption=DeleteIfNecessary instead of
encryption=Attempt.

Bug: 232299581
Test: build succeeds
Change-Id: Iae80043f3957a053d47ab4754c42b1fdc8e696b3
Merged-In: I17bcb901ad533cada4e0aa061196fc94d7b213ec
2022-05-13 17:03:22 +00:00
William Escande
e41474eae5 Set the aptx as provided by system
Aptx and aptx-Hd are both vendor libs in system_ext.
In order to load their dependencies from a compatible environement
Bluetooth need to setup the linker

Fix: 231967310
Test: atest net_test_stack_a2dp_native
Test: Log analyze after bluetooth boot
Tag: #refactor
Ignore-AOSP-First: Apex only on tm and below
Change-Id: I752e65889a42fe3378f51bd0821c2958ed9b5a7d
2022-05-11 21:14:41 -07:00
Suren Baghdasaryan
e31c7a17e5 Merge changes from topic "228160715_fix" into tm-dev
* changes:
  init: Purge empty process groups on zygote restart
  libprocessgroup: Add a function to remove only empty process groups
2022-05-04 15:58:58 +00:00
Daeho Jeong
bc752d279f Merge "init.rc: increase readahead window multiplier for POSIX_FADV_SEQUENTIAL files" into tm-dev 2022-05-04 15:37:48 +00:00
Suren Baghdasaryan
870725ac14 init: Purge empty process groups on zygote restart
When system_server crashes or gets killed, it causes zygote to kill
itself, which in turn leads to killing all processes in the same
process group (all apps). This leaves empty process groups because
system_server is not there to remove them.
Purge empty process groups when init detects zygote death.

Bug: 228160715
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I0ce27eea28f8713e52033bbec2d5363a7b8ff5db
Merged-In: I0ce27eea28f8713e52033bbec2d5363a7b8ff5db
2022-05-04 00:44:47 +00:00
Suren Baghdasaryan
6761b6dcdc libprocessgroup: Add a function to remove only empty process groups
When system_server and zygote crash or get killed, all apps also get
killed but their process groups are left empty. Provide a function to
remove all empty process groups so that init can purge them when this
even happens.

Bug: 228160715
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ife38ca021e80cd38106f218ae13183e8c2631bf0
Merged-In: Ife38ca021e80cd38106f218ae13183e8c2631bf0
2022-05-04 00:44:39 +00:00
Daeho Jeong
2a7bd96c19 init.rc: increase readahead window multiplier for POSIX_FADV_SEQUENTIAL files
Set readahead window multiplier for POSIX_FADV_SEQUENTIAL files as 16 to
enhance file read performance like a language package loading.

Bug: 192011293
Test: adb shell cat /dev/sys/fs/by-name/userdata/seq_file_ra_mul
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I7f7e4339651be2d6aa99b07bcb12ab62136a940e
Merged-In: I7f7e4339651be2d6aa99b07bcb12ab62136a940e
2022-05-02 10:52:11 -07:00
Jaegeuk Kim
7e0df03bc9 Shutdown f2fs to avoid fsck
Bug: 229406072
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Id3b27219ab2a4655f1740829b0f03f027e66349d
Merged-In: Id3b27219ab2a4655f1740829b0f03f027e66349d
2022-04-29 20:17:40 +00:00
TreeHugger Robot
a5867617af Merge "Delete stale Virtualization image files" into tm-dev 2022-04-29 08:09:24 +00:00
Elliott Hughes
c94d40e4a8 Merge "libutils: clearer abort on overflow." into tm-dev 2022-04-28 15:52:30 +00:00
Alan Stokes
34ee0c931c Delete stale Virtualization image files
Delete all files and directories under
/data/misc/virtualizationservice at boot. Originally they were owned
by the virtualizationservice user; we now run as system, and don't
have permission to remove them after boot.

Bug: 230056726
Test: Create fake stale dir+file, see them deleted
Ignore-AOSP-First: Needed in T, will CP to aosp
Change-Id: I5ff7d055aeeb25ba7693e50876d6b8a830c4bf51
2022-04-28 10:57:36 +01:00
Elliott Hughes
b10bf63c93 libutils: clearer abort on overflow.
Let's turn a bug into a feature... Since this code is built with intsan,
anyone who caused overflow here will have had an abort, so we know
no-one actually needs the BAD_INDEX return that was presumably the
original author's intent. So let's just mandate that, since it's a lot
harder to ignore an abort than it is to ignore an error return.

Bug: http://b/179044558
Test: treehugger
Change-Id: I08f1018f9da1e09de885699138b7543d55bb2a36
(cherry picked from commit a5f2e4d421)
Merged-In: I08f1018f9da1e09de885699138b7543d55bb2a36
2022-04-28 00:25:25 +00:00
Jooyung Han
1f85546be5 Unshare mount namespace in bootchart's thread
When bootchart is enabled its thread shares the mount namespace context
with the main thread. This prevents the main thread to switch the mount
namespace later with setns().

So, unshare() the mount namespace of the bootchart thread.

Bug: 229983560
Test: rebooted with bootcharting on/off
    enter_default_mount_ns should succeeded.
Change-Id: Idac0d0efcb4f7f7d8a7cbcebf8fa2fa29f104c35
Merged-In: Idac0d0efcb4f7f7d8a7cbcebf8fa2fa29f104c35
(cherry picked from commit 7f8721b992)
2022-04-27 22:15:10 +00:00
Jiyong Park
1a2dbd917e Remove stale files in /data/misc/virtualizationservice
[1] changed the UID of the virtualizationservice daemon and
/data/misc/virtualizationservice directory to `system`. However, this
can cause a permission denial issue when the directory has stale files
when the device was running a build before [1] and an OTA to [1] (or
above) is attempted. The daemon tries to delete the stale files - which
must have been still labeled as old UID and thus the daemon has no
privileged to delete them.

Fixing this issue by ensuring that the directory is always empty by
init.

[1] https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2059527

Bug: 230056726
Test: watch TH
Merged-In: I61c0297503347932b14b83859bec9ff82628336f
Change-Id: I61c0297503347932b14b83859bec9ff82628336f
2022-04-25 09:47:12 +09:00
Mitch Phillips
a8dfb847c0 Merge "[GWP-ASan] Enable debuggerd to pull more allocation metadata." am: 5411905232 am: 378b71eb19 am: 18518112f4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2040808

Change-Id: If7e4e102582f4905095f2c4c04757f8139f890e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 19:18:20 +00:00
Mitch Phillips
18518112f4 Merge "[GWP-ASan] Enable debuggerd to pull more allocation metadata." am: 5411905232 am: 378b71eb19
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2040808

Change-Id: Ie83697f61f144db5518e4a2da7e6aee0fa39b6c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 18:58:06 +00:00
Mitch Phillips
378b71eb19 Merge "[GWP-ASan] Enable debuggerd to pull more allocation metadata." am: 5411905232
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2040808

Change-Id: I6b4bb5d72854ba41274df8c0d954f78677163237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 18:32:16 +00:00
Mitch Phillips
5411905232 Merge "[GWP-ASan] Enable debuggerd to pull more allocation metadata." 2022-04-21 18:12:43 +00:00
Treehugger Robot
b329d84b33 Merge "Fix lints from Rust 1.60.0" am: ff1750c5f6 am: 9c0851cc4e am: 09e0f40312
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2068630

Change-Id: I94fb4f1c35528e480585fa4b107ae6169462156e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 06:24:23 +00:00
Treehugger Robot
09e0f40312 Merge "Fix lints from Rust 1.60.0" am: ff1750c5f6 am: 9c0851cc4e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2068630

Change-Id: I036b7403b94f2bfad99b473278f5c9ddd36701cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 06:09:59 +00:00
Treehugger Robot
9c0851cc4e Merge "Fix lints from Rust 1.60.0" am: ff1750c5f6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2068630

Change-Id: Ia8dc4506def7d905cf31bd5ad01683946d459277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 05:53:47 +00:00
Treehugger Robot
ff1750c5f6 Merge "Fix lints from Rust 1.60.0" 2022-04-21 05:35:46 +00:00
Automerger Merge Worker
fb5b83e812 Merge "Merge "Merge "vts_libsnapshot_test: Fix free space calculation." into android12-tests-dev am: abed76bf3e" into android12L-tests-dev am: 3a4b134e84" am: 51d2d073f2 am: c87738013e am: 426f6ea274
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2066968

Change-Id: I02be4d2eb25a6a7de0d97719987be330dd5837ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:27:05 +00:00
Automerger Merge Worker
51137c823a Merge changes from topic "am-fc8f8533e81744278a6d9b7db27b7f19" am: 61c7de1ea8 am: 87c32dd26c am: 255db29a64
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915268

Change-Id: Ie289e2121630b06af2ca89ec0a11e84f2420b535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:26:43 +00:00
Treehugger Robot
866940372f [automerger skipped] Merge "Adding Car GSI public key" into android11-tests-dev am: efcca34203 -s ours am: 6033c0d965 -s ours am: d404d92ae5 -s ours am: 3fdf47aeec -s ours am: 7cb0c7a081 -s ours am: a96b20d0cc -s ours
am skip reason: skipped by user karthikmr

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

Change-Id: I8cc268076ce4888386c6089d3c6f24e23b9a24ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:26:42 +00:00
Automerger Merge Worker
65ef7ee905 Merge changes from topic "am-c7c1003483a74988b1bd48a340cd06ff" am: b09371140f am: 6e97bd823a am: a38fbb28f2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1844795

Change-Id: I2bae4386603c1492e1e7c12121f9dfc031ba3f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:26:21 +00:00
Treehugger Robot
27b282c33b [automerger skipped] Merge "liblog: use unique log tags for is_loggable tests" into android11-tests-dev am: 47bcb9a647 -s ours am: 3ff0b1b643 -s ours am: 797bd92ef4 -s ours am: 1f061d7540 -s ours am: 3aa1f1a14a -s ours am: 4abe7a1ca5 -s ours
am skip reason: skipped by user agowdra

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

Change-Id: I67c79b5abba73645174274dea9b3bca5be3e21ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:26:20 +00:00
Automerger Merge Worker
ac8a0291ac Merge "Merge "Merge "Merge "resolve merge conflicts of 21ef3ae3fd to android11-tests-dev" into android11-tests-dev am: bdf02cc54d" into android12-tests-dev am: fdca6ffb38" into android12L-tests-dev am: c1a6b27d21" am: c3c2643a8b am: 5639819569 am: bab2b5417f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1726290

Change-Id: If709246da0db705ed8e89f3939efe55af4270a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:25:50 +00:00
Automerger Merge Worker
183fcac6a0 Merge changes from topic "am-e3d7420e56534d7081c701f1fd958308" am: 0bafc6ab71 am: a34f5602c8 am: 2e9b830d1a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1535382

Change-Id: I5016cb28938d4ba29a87bd8e1ea984d9a289dc2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:25:17 +00:00
Treehugger Robot
4d3d94f934 [automerger skipped] Merge "Adding Car GSI public key" into android10-tests-dev am: 3d7e667b0a -s ours am: 191b82f0e9 -s ours am: 1c78a382bd -s ours am: 6b79f7df2e -s ours am: 3bf8fbebbb -s ours am: 4386a46c58 -s ours am: 43268d5c7e -s ours
am skip reason: skipped by user karthikmr

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

Change-Id: I55838d5674708b3162770a2a60f4fe039be8cc8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:25:14 +00:00
Automerger Merge Worker
bcf36c5c95 [automerger skipped] Merge changes from topic "am-c198557146ab441c9702d29824bc857b" am: db915e470b -s ours am: 055afa8a84 -s ours am: ac67a15e51 -s ours
am skip reason: Merged-In I971fd9e25741e18bf7f5907d562556b09db1d624 with SHA-1 0e743a25c9 is already in history

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

Change-Id: I39cff584dc58d840438e906e16b4a6cfd7131d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:55 +00:00
Automerger Merge Worker
0cc57bdd86 [automerger skipped] Merge changes from topic "am-688679ebddb9459590f4ede853e36462" into android12L-tests-dev am: fb3c951f11 -s ours am: 59cea7f298 -s ours am: de55d7873a -s ours am: cff3203d47 -s ours
am skip reason: Merged-In I971fd9e25741e18bf7f5907d562556b09db1d624 with SHA-1 0e743a25c9 is already in history

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

Change-Id: I53a1bf8bb3e611dbc8014e38f4e0acfdcd11ba04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:53 +00:00
Automerger Merge Worker
f4861eccee [automerger skipped] Merge changes from topic "am-214c591285f74e579baad9171ec87ef7" am: 98ff58fb85 -s ours am: efeb05a778 -s ours am: 6520fe6893 -s ours
am skip reason: Merged-In I00366b281eafa5677b0941419a86f2702fb3484b with SHA-1 65e8e3803e is already in history

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

Change-Id: I07c4c815bbbad0dfc5f9821e3535516fe562f308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:37 +00:00
Automerger Merge Worker
d51805173c [automerger skipped] Merge changes from topic "am-8485851bde534ba18259034d03754b06" into android12L-tests-dev am: 096a880fc7 -s ours am: 1c29513b17 -s ours am: fea3492ef1 -s ours am: 606bc7766d -s ours
am skip reason: Merged-In I00366b281eafa5677b0941419a86f2702fb3484b with SHA-1 019f731097 is already in history

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

Change-Id: I74b6fa4d4a73c6cb0fc12aa6891bc82c9a8b7770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:35 +00:00
Automerger Merge Worker
4a9dd74be1 Merge changes from topic "am-08a155ca62144e49bad1deffa5127df4" am: dd79408db1 am: 8eac375466 am: 2971e168d5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1239888

Change-Id: I56195ee8c748dd443aa8e258436d0d6d0c6b3904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:21 +00:00
Treehugger Robot
b6077475ba [automerger skipped] Merge "Don't require bootloader fastboot for VTS compliance." into android10-tests-dev am: cd7a018917 -s ours am: 606088f724 -s ours am: c422e0a592 -s ours am: 5a3f06cb8b -s ours am: 12b91b0d69 -s ours am: b12ecc65de -s ours am: 736f30d1b4 -s ours
am skip reason: skipped by user dmulabagal

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

Change-Id: Ib16eaee45f47db4b10f4e41156004ddddd6b29d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:19 +00:00
Automerger Merge Worker
e32193be53 Merge changes from topic "am-21021e63687c4f87a5f7335ff8fb0483" am: 844c30f06d am: 8a453b99aa am: 06746988bc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1168004

Change-Id: I5064aadcdfdcfd3742ed0ed4459e501d6153e05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:02 +00:00
Treehugger Robot
708ca48247 [automerger skipped] Merge "Allow fuzzy_fastboot test devices over internet" into android10-tests-dev am: ea5c4aa4e6 -s ours am: 350698a44c -s ours am: 759ae1ffcc -s ours am: afbf9f72b5 -s ours am: e02ac475ef -s ours am: 10797fecda -s ours am: 864fe5f483 -s ours
am skip reason: skipped by user agowdra

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

Change-Id: I98ad0433b51e4204e689ee7128f615f7958262e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:23:00 +00:00
Automerger Merge Worker
cc779ba111 Merge changes from topic "am-cc11d65e1ffe4630b407596190df86a1" am: d33cbfdce5 am: 562daf465d am: b4fe62bdf5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1201445

Change-Id: I49cc43ad1e7645596fa6abc43fb4592124a2d9e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:22:43 +00:00
Treehugger Robot
ba6b8e3d74 [automerger skipped] Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into android10-tests-dev am: db5c1bc4ab -s ours am: cc1a7a2abb -s ours am: a5cdf4bdae -s ours am: 8dabf09a22 -s ours am: b858dc37dc -s ours am: b274623e33 -s ours am: 8721b494ed -s ours
am skip reason: skipped by user trong

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

Change-Id: If3e8c41d55ffe7fd3e3786fa52fa1a1cff9d2174
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:22:42 +00:00
Automerger Merge Worker
b581b18a19 Merge changes from topic "am-e06fd6bc4686461e856b869e6648426a" am: 144bb9fd77 am: 4187e800db am: fa359aeacb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1150077

Change-Id: I2ea39267ea3fe1c30d58c0600ccf5dd150e481dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:22:26 +00:00
Treehugger Robot
d120d24eb4 [automerger skipped] Merge "Fiemap tests should only run on API level >= 29." into android10-tests-dev am: dd948046ab -s ours am: a26b9ad1bd -s ours am: 2406c3cde1 -s ours am: 56b51d35a2 -s ours am: c802c41a96 -s ours am: 137e743681 -s ours am: 61f905530e -s ours
am skip reason: skipped by user dvander

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

Change-Id: If337452137f25da0bdb0abacb46b0a40d31c8837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:22:24 +00:00
Automerger Merge Worker
def27ce201 Merge changes from topic "am-160c9f8b5caf40a2a0b6fae94210de90" am: 437a607b27 am: ba89dafc3f am: f7b1614bd5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1146576

Change-Id: I591f768be01bd66c08ca3ba17ac247ab877ec8fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:22:08 +00:00
Treehugger Robot
70ad10b154 [automerger skipped] Merge "Extend test timeout for VtsFiemapWriterTest" into android10-tests-dev am: 50037a6212 -s ours am: 2b889498a2 -s ours am: c18b24e749 -s ours am: 75792a6ec3 -s ours am: 036425ff0e -s ours am: 46e1d974b2 -s ours am: 8edd9eeabd -s ours
am skip reason: skipped by user robinjacob

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

Change-Id: I8bd1918cdb7f2445aa342b85fff9381fa6553320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:22:06 +00:00
Automerger Merge Worker
a09950c32f Merge "[automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e75 -s ours" am: ddaa1b3881 -s ours am: 2644361bd6 -s ours am: 53b88b26ca -s ours
am skip reason: Merged-In I86c2de977de052bfe9dcdc002dcbd9026601d0f3 with SHA-1 fd5562b0a5 is already in history

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

Change-Id: I5aea98bffe3303d7e10690412477def80d7a61c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:21:51 +00:00
Akilesh Kailash
00415bfe6b [automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e75 -s ours am: 6a313e174e -s ours am: ab54ca853f -s ours am: d3f5309ee8 -s ours
am skip reason: Merged-In I86c2de977de052bfe9dcdc002dcbd9026601d0f3 with SHA-1 fd5562b0a5 is already in history

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

Change-Id: I4dc7ccc42b9c9637c43c8f4e1361fdf63ddf9e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:21:50 +00:00
Automerger Merge Worker
3e99cddef9 Merge "[automerger skipped] libprocessgroup: Use WriteStringToFd for WriteFileAction am: 1458350370 -s ours" am: b486c4f063 -s ours am: 7e1386c74f -s ours am: 2f464cacc3 -s ours
am skip reason: Merged-In Id79f9e1095f52079393c58edb9a4d526f4cc6b5e with SHA-1 d4c53518fe is already in history

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

Change-Id: I918d1339a6d1636899a13ba7eb33b88c3dbd5ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:21:25 +00:00
Rick Yiu
b83b16e6d2 [automerger skipped] libprocessgroup: Use WriteStringToFd for WriteFileAction am: 1458350370 -s ours am: cff7952df2 -s ours am: 0cad4c44bc -s ours am: 573aff33a7 -s ours
am skip reason: Merged-In Id79f9e1095f52079393c58edb9a4d526f4cc6b5e with SHA-1 d4c53518fe is already in history

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

Change-Id: I39455f7a0740eae14c0cbcee7df78357fa395f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:21:24 +00:00
Automerger Merge Worker
be254c15b1 Merge "[automerger skipped] libprocessgroup: Prevent error spam when tests disable all cpus in a cpuset am: ea98b60b86 -s ours" am: ed24f00c74 -s ours am: 29d679a7d1 -s ours am: acd4515835 -s ours
am skip reason: Merged-In Ia91d8839d86787569c255481bde077be51c43d93 with SHA-1 ec88556460 is already in history

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

Change-Id: Ie2337c17810dfcfc031fe5252eefc2d33258a7aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:20:56 +00:00
Suren Baghdasaryan
bf23b81a75 [automerger skipped] libprocessgroup: Prevent error spam when tests disable all cpus in a cpuset am: ea98b60b86 -s ours am: f458446476 -s ours am: 3adb39a964 -s ours am: 09fac8172b -s ours
am skip reason: Merged-In Ia91d8839d86787569c255481bde077be51c43d93 with SHA-1 ec88556460 is already in history

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

Change-Id: I734146195ad69d5436fa8f1b27cf3c264438a258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:20:55 +00:00