Commit graph

75203 commits

Author SHA1 Message Date
Lucas Wei
a85c719661 Merge "fastboot: Add vendor_kernel_boot" 2022-04-25 18:31:36 +00:00
Jaegeuk Kim
4669f919a6 Merge "Shutdown f2fs to avoid fsck" 2022-04-25 16:42:48 +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
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
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
5411905232 Merge "[GWP-ASan] Enable debuggerd to pull more allocation metadata." 2022-04-21 18:12:43 +00:00
Treehugger Robot
ff1750c5f6 Merge "Fix lints from Rust 1.60.0" 2022-04-21 05:35:46 +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
Automerger Merge Worker
61c7de1ea8 Merge changes from topic "am-fc8f8533e81744278a6d9b7db27b7f19"
* changes:
  Merge changes from topic "am-af5f7a0d8d934d269789491a74277af7" into android12L-tests-dev am: 7f3503a52a
  [automerger skipped] Merge "Adding Car GSI public key" into android11-tests-dev am: efcca34203 -s ours am: 6033c0d965 -s ours am: d404d92ae5 -s ours
2022-04-21 01:13:41 +00:00
Automerger Merge Worker
1594611cff Merge changes from topic "am-af5f7a0d8d934d269789491a74277af7" into android12L-tests-dev am: 7f3503a52a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915268

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

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

Change-Id: Id8c7c1b3172c080e9a0444b71df5d7070f86318a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:13:37 +00:00
Automerger Merge Worker
b09371140f Merge changes from topic "am-c7c1003483a74988b1bd48a340cd06ff"
* changes:
  Merge changes from topic "am-468cea9b039c4e73b38044a2424a425a" into android12L-tests-dev am: aac335af08
  [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
2022-04-21 01:13:18 +00:00
Automerger Merge Worker
e97feadbba Merge changes from topic "am-468cea9b039c4e73b38044a2424a425a" into android12L-tests-dev am: aac335af08
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1844795

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

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

Change-Id: I1fa9f4a24e033a1dfcbff7874f14914362dc3627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:13:14 +00:00
Automerger Merge Worker
c3c2643a8b 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" 2022-04-21 01:12:55 +00:00
Automerger Merge Worker
92c83b3d47 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
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1726290

Change-Id: I5988f66d41af54127829baa6edb3a3217a99e583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:12:53 +00:00
Automerger Merge Worker
0bafc6ab71 Merge changes from topic "am-e3d7420e56534d7081c701f1fd958308"
* changes:
  Merge changes from topic "am-7206c583f34949c299ce90858cf1afd5" into android12L-tests-dev am: 865187fd2c
  [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
2022-04-21 01:12:43 +00:00
Automerger Merge Worker
db210f56ff Merge changes from topic "am-7206c583f34949c299ce90858cf1afd5" into android12L-tests-dev am: 865187fd2c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1535382

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

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

Change-Id: Id2f5bcebee06911e98501a3678e764fcb8c86b4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:12:37 +00:00
Automerger Merge Worker
db915e470b Merge changes from topic "am-c198557146ab441c9702d29824bc857b"
* changes:
  Merge changes from topic "am-688679ebddb9459590f4ede853e36462" into android12L-tests-dev am: fb3c951f11 -s ours
  Merge "[automerger skipped] Merge "Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev am: da84e29fdf" into android11-tests-dev am: 48ca333cb6 -s ours" into android12-tests-dev am: 3f04f905ce -s ours am: aa6d2eacf4 -s ours
2022-04-21 01:11:10 +00:00
Automerger Merge Worker
59cea7f298 Merge changes from topic "am-688679ebddb9459590f4ede853e36462" into android12L-tests-dev am: fb3c951f11 -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: I412c33ac742c4a0bf3a6d78f7286860d5765eccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:11:05 +00:00
Automerger Merge Worker
8b9ca3110d Merge "[automerger skipped] Merge "Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev am: da84e29fdf" into android11-tests-dev am: 48ca333cb6 -s ours" into android12-tests-dev am: 3f04f905ce -s ours am: aa6d2eacf4 -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: If69569f83b728bb3c12a3b32867a70cf9dfba885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:11:04 +00:00
Automerger Merge Worker
98ff58fb85 Merge changes from topic "am-214c591285f74e579baad9171ec87ef7"
* changes:
  Merge changes from topic "am-8485851bde534ba18259034d03754b06" into android12L-tests-dev am: 096a880fc7 -s ours
  Merge "Merge "[automerger skipped] Merge "Restore fastboot delete-logical-partition command for VTS" into android10-tests-dev am: 2c8ca771e7 -s ours" into android11-tests-dev am: 6d0ec70e01 -s ours" into android12-tests-dev am: 4ffcef6ce7 -s ours am: 8b69af92f9 -s ours
2022-04-21 01:10:31 +00:00
Automerger Merge Worker
1c29513b17 Merge changes from topic "am-8485851bde534ba18259034d03754b06" into android12L-tests-dev am: 096a880fc7 -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: I9033fd1c71d9b8c1ba2d22aa749b67c0e3847229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:10:28 +00:00
Automerger Merge Worker
792e3925ba Merge "Merge "[automerger skipped] Merge "Restore fastboot delete-logical-partition command for VTS" into android10-tests-dev am: 2c8ca771e7 -s ours" into android11-tests-dev am: 6d0ec70e01 -s ours" into android12-tests-dev am: 4ffcef6ce7 -s ours am: 8b69af92f9 -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: I46f275e004122f98561cac73a929b35aa4c2419c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:10:27 +00:00
Automerger Merge Worker
dd79408db1 Merge changes from topic "am-08a155ca62144e49bad1deffa5127df4"
* changes:
  Merge changes from topic "am-3e79d381eef4408781e0e24c77daba88" into android12L-tests-dev am: e5fdc5a93b
  [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
2022-04-21 01:10:13 +00:00
Automerger Merge Worker
de4038e818 Merge changes from topic "am-3e79d381eef4408781e0e24c77daba88" into android12L-tests-dev am: e5fdc5a93b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1239888

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

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

Change-Id: Iff496292bb431a8e639aa5b589027f6f0fce9ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:10:08 +00:00
Automerger Merge Worker
844c30f06d Merge changes from topic "am-21021e63687c4f87a5f7335ff8fb0483"
* changes:
  Merge changes from topic "am-3afb14f2ca7649c780c6884f53a799b4" into android12L-tests-dev am: b4287bf117
  [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
2022-04-21 01:09:51 +00:00
Automerger Merge Worker
88b0c1e3f2 Merge changes from topic "am-3afb14f2ca7649c780c6884f53a799b4" into android12L-tests-dev am: b4287bf117
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1168004

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

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

Change-Id: I2b5ad73b542db4bb27c73240fd6463fa0e235082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:09:46 +00:00
Automerger Merge Worker
d33cbfdce5 Merge changes from topic "am-cc11d65e1ffe4630b407596190df86a1"
* changes:
  Merge changes from topic "am-32562e4e7a11481995df723a3616eb3d" into android12L-tests-dev am: fd515cbdfd
  [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
2022-04-21 01:09:30 +00:00
Automerger Merge Worker
3b790e38dd Merge changes from topic "am-32562e4e7a11481995df723a3616eb3d" into android12L-tests-dev am: fd515cbdfd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1201445

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

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

Change-Id: I06ec5ada86795a38819fc394b44ab23a3aaadf0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:09:25 +00:00
Automerger Merge Worker
144bb9fd77 Merge changes from topic "am-e06fd6bc4686461e856b869e6648426a"
* changes:
  Merge changes from topic "am-d53d0500e829445dade5c7974fab4e25" into android12L-tests-dev am: 142b07c4c0
  [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
2022-04-21 01:09:08 +00:00
Automerger Merge Worker
e6cf8a2ad7 Merge changes from topic "am-d53d0500e829445dade5c7974fab4e25" into android12L-tests-dev am: 142b07c4c0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1150077

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

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

Change-Id: I540915c9b355eb729c5ce47aa7dbe93e8ef547e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:09:03 +00:00
Automerger Merge Worker
437a607b27 Merge changes from topic "am-160c9f8b5caf40a2a0b6fae94210de90"
* changes:
  Merge changes from topic "am-eacec02142be4022b9d5a32720baa092" into android12L-tests-dev am: def183bea7
  [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
2022-04-21 01:08:45 +00:00
Automerger Merge Worker
31f94385cd Merge changes from topic "am-eacec02142be4022b9d5a32720baa092" into android12L-tests-dev am: def183bea7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1146576

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

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

Change-Id: Ibdef2d9dd3c52b2fa61a5557d7e91c665f8d29ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:08:40 +00:00
Automerger Merge Worker
ddaa1b3881 Merge "[automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e75 -s ours" 2022-04-21 01:08:24 +00:00
Akilesh Kailash
6a313e174e [automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e75 -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: I7853e98dad861f179d390e8e2552cf0276f9bb17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:08:21 +00:00
Automerger Merge Worker
b486c4f063 Merge "[automerger skipped] libprocessgroup: Use WriteStringToFd for WriteFileAction am: 1458350370 -s ours" 2022-04-21 01:07:52 +00:00
Rick Yiu
cff7952df2 [automerger skipped] libprocessgroup: Use WriteStringToFd for WriteFileAction am: 1458350370 -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: Ide30a97ae4fa54ce827c98b99987e92e2dbc498f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 01:07:49 +00:00