Commit graph

77579 commits

Author SHA1 Message Date
Elliott Hughes
5affe3efe2 Merge "libutils: clearer abort on overflow." am: 4ba0e62970 am: 2c623bc650
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2078005

Change-Id: I150014b6afda9aff751383c5b5b6ff2934ec7400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 01:15:58 +00:00
Jooyung Han
6421bf87ee [automerger skipped] Unshare mount namespace in bootchart's thread am: 1f85546be5 -s ours
am skip reason: Merged-In Idac0d0efcb4f7f7d8a7cbcebf8fa2fa29f104c35 with SHA-1 7f8721b992 is already in history

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

Change-Id: Icf2d06909b2f182f70016a35eb12c5b154667f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 00:51:49 +00:00
Elliott Hughes
2c623bc650 Merge "libutils: clearer abort on overflow." am: 4ba0e62970
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2078005

Change-Id: If44c9098395c40dfa7d6b6b4c84ac41aee1c429a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 00:49:48 +00:00
Elliott Hughes
4ba0e62970 Merge "libutils: clearer abort on overflow." 2022-04-28 00:16:32 +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
Elliott Hughes
a5f2e4d421 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
2022-04-27 14:29:44 -07:00
Jiyong Park
f13d114378 [automerger skipped] Remove stale files in /data/misc/virtualizationservice am: 1a2dbd917e -s ours
am skip reason: Merged-In I61c0297503347932b14b83859bec9ff82628336f with SHA-1 97cc69ee5d is already in history

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

Change-Id: I703fbc1ef7ecd0658785771e392ae741cf8e3bbe
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 22:48:02 +00:00
Lucas Wei
d11ca1ef09 Merge "fastboot: Add vendor_kernel_boot" am: a85c719661 am: 436e9a7906
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2046445

Change-Id: Ieaae835a6b3a88c37a2c54d1c4003569f150dccf
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 19:16:56 +00:00
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
288ce44aa4 Merge "Shutdown f2fs to avoid fsck" am: 4669f919a6 am: 988c764993
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2072812

Change-Id: I780b31d9ca1de1887a53c8f8ca66a4953863f3bd
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:50:13 +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
689efa8380 Merge changes I72a3720c,Idac0d0ef am: 0f3f4f402e am: 222a765961
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2074258

Change-Id: Ic27ce9c20d86894ba37a6f9053281b4758e12f25
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:08:54 +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
b815cd3dac Merge "Remove stale files in /data/misc/virtualizationservice" am: ebfdbc7a6c am: eff862b557
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2072833

Change-Id: I64b1c3f1f327451cae8ec77b54a45f06cf360d47
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:10:47 +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
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
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
7d4f1a6ebc Merge "ueventd: suggest move location for ueventd config" am: d438ea723b am: 49ec1df66c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2070481

Change-Id: I6d7e9994f3678ceb862d34422a7383107835186a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 22:31:37 +00: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
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