Commit graph

75797 commits

Author SHA1 Message Date
Lucas Wei
436e9a7906 Merge "fastboot: Add vendor_kernel_boot" am: a85c719661
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2046445

Change-Id: I52ef98b3dae191529fb1293bc7ebe80febc9ec48
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 18:57:50 +00:00
Lucas Wei
a85c719661 Merge "fastboot: Add vendor_kernel_boot" 2022-04-25 18:31:36 +00:00
Jaegeuk Kim
988c764993 Merge "Shutdown f2fs to avoid fsck" am: 4669f919a6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2072812

Change-Id: I47d8944b3bc538d83cfae7f26add1c5c3e3f828d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 17:13:49 +00:00
Jaegeuk Kim
4669f919a6 Merge "Shutdown f2fs to avoid fsck" 2022-04-25 16:42:48 +00:00
Jooyung Han
222a765961 Merge changes I72a3720c,Idac0d0ef am: 0f3f4f402e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2074258

Change-Id: Iaa2f326f68ef8fbc80af4fd29cde6142ec7a7d16
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 06:52:46 +00:00
Jooyung Han
0f3f4f402e Merge changes I72a3720c,Idac0d0ef
* changes:
  Migrate compare-bootcharts.py to python3
  Unshare mount namespace in bootchart's thread
2022-04-25 06:31:38 +00:00
Treehugger Robot
eff862b557 Merge "Remove stale files in /data/misc/virtualizationservice" am: ebfdbc7a6c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2072833

Change-Id: Ifaf75d6ebfe8990c59a9fd1c8548a80b6c1b1c19
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 03:52:55 +00:00
Treehugger Robot
ebfdbc7a6c Merge "Remove stale files in /data/misc/virtualizationservice" 2022-04-25 03:27:07 +00:00
Jooyung Han
cee25aa926 Migrate compare-bootcharts.py to python3
Bug: 229983560
Test: system/core/init/compare-bootcharts.py \
          base-bootchart-dir exp-bootchart-dir
Change-Id: I72a3720cb3a80ef8d4fcb06fba8c8893ac08c930
2022-04-25 10:26:08 +09:00
Jooyung Han
7f8721b992 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
2022-04-25 10:26:07 +09:00
Jiyong Park
97cc69ee5d 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
Change-Id: I61c0297503347932b14b83859bec9ff82628336f
2022-04-25 09:47:03 +09:00
Steven Moreland
49ec1df66c Merge "ueventd: suggest move location for ueventd config" am: d438ea723b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2070481

Change-Id: I7cf5d29b22bd55c88fd53b93189e70d2fad50283
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 21:59:19 +00:00
Steven Moreland
d438ea723b Merge "ueventd: suggest move location for ueventd config" 2022-04-22 21:38:48 +00:00
Jaegeuk Kim
3e595d5e67 Shutdown f2fs to avoid fsck
Bug: 229406072
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Id3b27219ab2a4655f1740829b0f03f027e66349d
2022-04-22 12:48:09 -07:00
Steven Moreland
2098314842 ueventd: suggest move location for ueventd config
Bug: 229650435
Test: N/A
Change-Id: I4645fd5a95b46ff40a0e8ee25130788ebfd01d72
2022-04-21 20:13:40 +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
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
Alix
9640339389 Moved contents of clang_cflags into cflags
Test: Treehugger
Bug: 226636335
Change-Id: I30294801423e6d39ab1d8ed3804c15a6ff0e90e5
2022-04-21 03:41:26 +00:00
Automerger Merge Worker
c87738013e Merge "Merge "Merge "vts_libsnapshot_test: Fix free space calculation." into android12-tests-dev am: abed76bf3e" into android12L-tests-dev am: 3a4b134e84" am: 51d2d073f2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2066968

Change-Id: I383a4f17f87994fbebbac7dd0f23d9cf905c8901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:33:20 +00:00
Automerger Merge Worker
87c32dd26c Merge changes from topic "am-fc8f8533e81744278a6d9b7db27b7f19" am: 61c7de1ea8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915268

Change-Id: I77d7370d9586bfb7b01f972ade5b0fdce5ad02df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:33:02 +00:00
Treehugger Robot
7cb0c7a081 [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 skip reason: skipped by user karthikmr

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

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

Change-Id: Id413d6c647e14cf10790191e174370f430e9298c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:32:39 +00:00
Treehugger Robot
3aa1f1a14a [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 skip reason: skipped by user agowdra

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

Change-Id: Ibb700c3d384b3c24a433759d9e6b92b56ea14e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:32:39 +00:00
Automerger Merge Worker
5639819569 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
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1726290

Change-Id: I08d383024fca33c11171dab57ba8d265b65af768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:32:11 +00:00
Automerger Merge Worker
a34f5602c8 Merge changes from topic "am-e3d7420e56534d7081c701f1fd958308" am: 0bafc6ab71
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1535382

Change-Id: Ic21860195eeeaf98168657aad22655526747eeb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:31:30 +00:00
Treehugger Robot
4386a46c58 [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 skip reason: skipped by user karthikmr

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

Change-Id: I6275607f6505a35ad04ea3fbe73ad97c5a94596d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:31:28 +00:00
Automerger Merge Worker
055afa8a84 Merge changes from topic "am-c198557146ab441c9702d29824bc857b" am: db915e470b -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: I368d1c7bf93ec7b5fc3a3afb587020dcec856d0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:24:44 +00:00
Automerger Merge Worker
de55d7873a [automerger skipped] Merge changes from topic "am-688679ebddb9459590f4ede853e36462" into android12L-tests-dev am: fb3c951f11 -s ours am: 59cea7f298 -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: Ic005c4c7fab1633bfb7fa46868f8f2f7540be22d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:24:43 +00:00
Automerger Merge Worker
efeb05a778 Merge changes from topic "am-214c591285f74e579baad9171ec87ef7" am: 98ff58fb85 -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: I9f5adf8777356c2fc16eb75553c786cf9cd0e303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:24:19 +00:00
Automerger Merge Worker
fea3492ef1 [automerger skipped] Merge changes from topic "am-8485851bde534ba18259034d03754b06" into android12L-tests-dev am: 096a880fc7 -s ours am: 1c29513b17 -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: Ife5e102f80f752da24794cf63806dc5b1446b208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:24:18 +00:00
Automerger Merge Worker
8eac375466 Merge changes from topic "am-08a155ca62144e49bad1deffa5127df4" am: dd79408db1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1239888

Change-Id: Id0eaad95f9c2112a4c9bdceddd1f9e1bba5b7d4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:23:55 +00:00
Treehugger Robot
b12ecc65de [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 skip reason: skipped by user dmulabagal

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

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

Change-Id: Ia2e103933d3e7625f8597da345f59cdc6fb50068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:23:34 +00:00
Treehugger Robot
10797fecda [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 skip reason: skipped by user agowdra

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

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

Change-Id: I5d40ea1bb4a4dba4ccbe212273d579df1559c9e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:23:13 +00:00
Treehugger Robot
b274623e33 [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 skip reason: skipped by user trong

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

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

Change-Id: I349bcdd405653f5c2eeee3be11f826fb8a1dcc74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:22:52 +00:00
Treehugger Robot
137e743681 [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 skip reason: skipped by user dvander

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

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

Change-Id: I9e86ff60f7861f58fed1a86361a117abf0eb6c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:22:29 +00:00
Treehugger Robot
46e1d974b2 [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 skip reason: skipped by user robinjacob

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

Change-Id: I3359bcf8f36e9f05325674cb47b1876d4260de73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:22:27 +00:00
Automerger Merge Worker
2644361bd6 Merge "[automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e75 -s ours" am: ddaa1b3881 -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: I2d1132f1ee18df9ad67b7eb85ff40963334d8887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:22:02 +00:00
Akilesh Kailash
ab54ca853f [automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e75 -s ours am: 6a313e174e -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: I1e01f4cb82afc2ae36dc5a43e34e1cd07b8de4f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:22:01 +00:00
Automerger Merge Worker
7e1386c74f Merge "[automerger skipped] libprocessgroup: Use WriteStringToFd for WriteFileAction am: 1458350370 -s ours" am: b486c4f063 -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: Icb042a24bff42ac652e79b86f7aa28ce661667fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:21:48 +00:00
Rick Yiu
0cad4c44bc [automerger skipped] libprocessgroup: Use WriteStringToFd for WriteFileAction am: 1458350370 -s ours am: cff7952df2 -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: I127d7805d4b8d41487bbfe16b783720333910331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:21:47 +00:00
Automerger Merge Worker
29d679a7d1 Merge "[automerger skipped] libprocessgroup: Prevent error spam when tests disable all cpus in a cpuset am: ea98b60b86 -s ours" am: ed24f00c74 -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: Ib6e433041cd6be2d59f9e50e72247087ad8b2c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:21:33 +00:00
Suren Baghdasaryan
3adb39a964 [automerger skipped] libprocessgroup: Prevent error spam when tests disable all cpus in a cpuset am: ea98b60b86 -s ours am: f458446476 -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: I237b94e21cbbb19cd47c820878ea8887bb9c2ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:21:31 +00:00
Automerger Merge Worker
51d2d073f2 Merge "Merge "Merge "vts_libsnapshot_test: Fix free space calculation." into android12-tests-dev am: abed76bf3e" into android12L-tests-dev am: 3a4b134e84" 2022-04-21 01:13:56 +00:00
Automerger Merge Worker
f21fd279b9 Merge "Merge "vts_libsnapshot_test: Fix free space calculation." into android12-tests-dev am: abed76bf3e" into android12L-tests-dev am: 3a4b134e84
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2066968

Change-Id: Ie35c2b7eb4f6470d220b2a91d5039f034fa20769
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:13:54 +00:00