Commit graph

67788 commits

Author SHA1 Message Date
Christopher Ferris
c5b658077b Merge "Update for new kernel 5.11 headers." am: d57652f15b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1595351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25c6439f7b0965700289193c0f34ce308ab6b4a8
2021-02-19 19:51:45 +00:00
Christopher Ferris
d57652f15b Merge "Update for new kernel 5.11 headers." 2021-02-19 19:47:44 +00:00
Christopher Ferris
d5076451dd Merge "Don't hard-code number of tombstones." am: a4807cba22
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1592919

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id576656c9bc9c3434b9feca7320e04fc2d500b13
2021-02-19 18:19:19 +00:00
Christopher Ferris
a4807cba22 Merge "Don't hard-code number of tombstones." 2021-02-19 17:46:54 +00:00
Martijn Coenen
f14403b878 Merge "Add on-device signing binary." am: 73dea057c2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1513029

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7088dc524fcc2265540dbd66f48720f8e363c0e4
2021-02-19 12:04:16 +00:00
Martijn Coenen
73dea057c2 Merge "Add on-device signing binary." 2021-02-19 11:31:50 +00:00
Josh Gao
844ce55770 Merge "Generate text tombstones from proto tombstones by default." am: 8c164946d8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1595302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I572db2cc334e996c9730bc2563367f35205ea02c
2021-02-19 04:20:27 +00:00
Josh Gao
8c164946d8 Merge "Generate text tombstones from proto tombstones by default." 2021-02-19 03:34:27 +00:00
Josh Gao
3be68745ae Generate text tombstones from proto tombstones by default.
We're running into timeouts from death tests because we're ~doubling the
cost of crash dumping by doing it twice.

Bug: http://b/180605583
Test: treehugger
Change-Id: If5b40434171323a09960b70af0124ec08bd3fbe8
2021-02-18 16:57:53 -08:00
Christopher Ferris
35da288199 Don't hard-code number of tombstones.
On cuttlefish, the number of tombstones allowed is much larger
than 50, so change the algorithm to search for any tombstone
file.

Test: Ran unit tests on cuttlefish with > 50 tombstones.
Test: Ran unit tests on device.
Change-Id: Ia1d885fe19a7f7751fe3386d40b48750d1e21bd5
2021-02-18 15:29:13 -08:00
Christopher Ferris
95b026f976 Update for new kernel 5.11 headers.
Add new SYS_USER_DISPATCH to SIGSYS case.

Test: Builds, unit tests pass.
Change-Id: Id470053c167d7ffe51d622356c867815cd773fbc
2021-02-18 11:59:11 -08:00
Primiano Tucci
bbd67c3ede Merge "Do not check for debuggable / profilable for app tracing." am: c89dd8594e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1581672

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9f106b123f2091655f260e9b280d0826964a09d
2021-02-18 19:51:52 +00:00
Primiano Tucci
c89dd8594e Merge "Do not check for debuggable / profilable for app tracing." 2021-02-18 17:52:31 +00:00
Yo Chiang
83f5476b3d Merge "Explicitly cast to 64bit integer when calculating filesystem size" am: 10a8797ce0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1586546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ec41c5a46d589c0bbec7fc40ab839a171fbf8a4
2021-02-18 09:33:02 +00:00
Yo Chiang
10a8797ce0 Merge "Explicitly cast to 64bit integer when calculating filesystem size" 2021-02-18 08:24:59 +00:00
Yi-Yo Chiang
67e3bbc7f6 Explicitly cast to 64bit integer when calculating filesystem size
Else the result may overflow on platforms that have 32bit long.

Bug: 165925766
Test: Presubmit
Change-Id: I3018f0bd9846651848bd9b3645f2eeaa5b61c646
2021-02-18 08:24:51 +00:00
Yo Chiang
9a2bf07d51 Merge "fs_mgr: Add OverlayMountPoints() to get the list of overlayfs backing storage" am: ec1b09fca9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1585166

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1024f9aeaa46d954f07ed3660b36314f76eca908
2021-02-18 05:21:01 +00:00
Yo Chiang
ec1b09fca9 Merge "fs_mgr: Add OverlayMountPoints() to get the list of overlayfs backing storage" 2021-02-18 04:36:59 +00:00
Yi-Yo Chiang
d1ff1bcfbc fs_mgr: Add OverlayMountPoints() to get the list of overlayfs backing storage
Remove kOverlayMountPoints; add OverlayMountPoints().

Fix a regression where if host system didn't install a scratch_gsi
partition and physical /cache partition is mounted, then DSU guest
system could use /cache as its overlayfs backing storage. This is
generally unwanted as the /cache partition could be shared between host
and guest.
Dynamically return the list of overlayfs backing storage candidates, so
we don't accidentally fall back to use /cache storage within a DSU
system.

Bug: 165925766
Bug: 179980369
Test: 1. Prepare a DUT that have a physical cache partition, such as
  cuttlefish.
  2. Install a DSU system, and unsure that scratch_gsi is not installed.
  3. Reboot into DSU, verify that adb remount fails and overlayfs
     scratch is not created under /cache.
Change-Id: I1815ac5367c0aac8614aeaabebe0e2cb91cbe161
2021-02-18 04:36:52 +00:00
Treehugger Robot
b8eed6199c Merge "Build first-stage init in Soong" am: 9e22a46db9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1588294

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff3245fc1d359586b099107e4f69492d6b74f7db
2021-02-17 23:35:41 +00:00
Treehugger Robot
693ee75fde Merge "Gatekeeper: Add missing user_id." am: 5edcb8a3d6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1586506

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5341695360aead592e61daed3f6733983eb08da
2021-02-17 23:35:26 +00:00
Treehugger Robot
9e22a46db9 Merge "Build first-stage init in Soong" 2021-02-17 23:23:25 +00:00
Treehugger Robot
5edcb8a3d6 Merge "Gatekeeper: Add missing user_id." 2021-02-17 22:59:58 +00:00
Tri Vo
2302e2122f Merge "trusty: ConfirmationUI HAL<->TA IPC using shared memory" am: 09cbde252c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1590278

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie69953fddcf5bd923a8fd0fd42dec667d1875e6e
2021-02-17 22:05:35 +00:00
Tri Vo
09cbde252c Merge "trusty: ConfirmationUI HAL<->TA IPC using shared memory" 2021-02-17 21:28:24 +00:00
Tri Vo
19b62a5182 trusty: ConfirmationUI HAL<->TA IPC using shared memory
Bug: 148421469
Test: VtsHalConfirmationUIV1_0TargetTest
Change-Id: I686150b64da3d3e95618f29e396990660f2054ba
2021-02-17 11:10:14 -08:00
Jaegeuk Kim
33a4442b54 Merge "fiemap: support FIEMAP_EXTENT_MERGED" am: 286e5aba63
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1590474

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46a34fe7939ec85f66be4b7d458dd117d0e2f40d
2021-02-17 02:05:26 +00:00
Jaegeuk Kim
286e5aba63 Merge "fiemap: support FIEMAP_EXTENT_MERGED" 2021-02-17 01:42:23 +00:00
Treehugger Robot
aea25045ba Merge "Revert "[LSC] Add LOCAL_LICENSE_KINDS to system/core"" am: ca474f994d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1590280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9be5f7c0d3fb2d3efa421be681326adf4abb7d0
2021-02-16 23:55:42 +00:00
Treehugger Robot
ca474f994d Merge "Revert "[LSC] Add LOCAL_LICENSE_KINDS to system/core"" 2021-02-16 23:25:31 +00:00
Akilesh Kailash
38a82623ef Merge "libsnapshot: Print merge completion ops" am: 51858a0494
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1584487

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbe6d4726f20d38c4b7defe9efcf93c6c6b787d5
2021-02-16 22:21:56 +00:00
Akilesh Kailash
51858a0494 Merge "libsnapshot: Print merge completion ops" 2021-02-16 22:03:30 +00:00
Jaegeuk Kim
0724e48f9f fiemap: support FIEMAP_EXTENT_MERGED
F2FS starts to give a hint, FIEMAP_EXTENT_MERGED, in fiemap, so please allow it.

Bug: 180137825
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ic4e3f573e385d248627da1a2ad64fbbd4a74e679
2021-02-16 13:22:13 -08:00
Elliott Hughes
c3a206ccda Revert "[LSC] Add LOCAL_LICENSE_KINDS to system/core"
This reverts commit 187b7d1950.

Reason for revert: system/core is multiple projects, not one.

Change-Id: I790ea41741f8cd9b8b6db2f59a49e71fb0958fd6
2021-02-16 20:01:20 +00:00
Akilesh Kailash
1ce6a7e40c libsnapshot: Print merge completion ops
Once the daemon is terminated, print merge completion
ops and the total ops present in the COW file. This
will help to know if the merge operation was interrupted
and how many pending operations were done during
each reboot until merge is completed

Bug: 167409187
Test: Incremental and full OTA
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Ie33c840e80aaeca86f51adc8085cb4e306dca110
2021-02-16 19:19:40 +00:00
Treehugger Robot
504895aacb Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: d0aa350c02
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1589006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6be238379e6c72cb066477a93dcda90d44e6952d
2021-02-16 18:18:37 +00:00
Treehugger Robot
d0aa350c02 Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" 2021-02-16 17:44:06 +00:00
Bob Badour
187b7d1950 [LSC] Add LOCAL_LICENSE_KINDS to system/core
Added SPDX-license-identifier-Apache-2.0 to:
  bootstat/Android.bp
  cli-test/Android.bp
  code_coverage/Android.bp
  cpio/Android.bp
  debuggerd/crasher/Android.bp
  debuggerd/proto/Android.bp
  diagnose_usb/Android.bp
  fs_mgr/libdm/Android.bp
  fs_mgr/libfiemap/Android.bp
  fs_mgr/liblp/Android.bp
  fs_mgr/libsnapshot/Android.bp
  fs_mgr/libstorage_literals/Android.bp
  fs_mgr/libvbmeta/Android.bp
  fs_mgr/tests/Android.bp
  fs_mgr/tools/Android.bp
  gatekeeperd/Android.bp
  healthd/Android.bp
  healthd/testdata/Android.bp
  init/Android.bp
  init/Android.mk
  init/sysprop/Android.bp
  init/test_kill_services/Android.bp
  init/test_service/Android.bp
  libappfuse/Android.bp
  libasyncio/Android.bp
  libbinderwrapper/Android.bp
  libcrypto_utils/Android.bp
  libcrypto_utils/tests/Android.bp
  libdiskconfig/Android.bp
  libgrallocusage/Android.bp
  libkeyutils/mini_keyctl/Android.bp
  libmodprobe/Android.bp
  libnetutils/Android.bp
  libpackagelistparser/Android.bp
  libprocessgroup/Android.bp
  libprocessgroup/cgrouprc/Android.bp
  libprocessgroup/cgrouprc_format/Android.bp
  libprocessgroup/profiles/Android.bp
  libprocessgroup/setup/Android.bp
  libqtaguid/Android.bp
  libsparse/Android.bp
  libstats/push_compat/Android.bp
  libsuspend/Android.bp
  libsync/Android.bp
  libsystem/Android.bp
  libsysutils/Android.bp
  libusbhost/Android.bp
  libutils/Android.bp
  libvndksupport/Android.bp
  libvndksupport/tests/Android.bp
  llkd/Android.bp
  llkd/tests/Android.bp
  property_service/libpropertyinfoparser/Android.bp
  property_service/libpropertyinfoserializer/Android.bp
  property_service/property_info_checker/Android.bp
  qemu_pipe/Android.bp
  reboot/Android.bp
  rootdir/Android.bp
  rootdir/Android.mk
  rootdir/avb/Android.bp
  rootdir/avb/Android.mk
  run-as/Android.bp
  sdcard/Android.bp
  set-verity-state/Android.bp
  shell_and_utilities/Android.bp
  storaged/Android.bp
  toolbox/Android.bp
  trusty/apploader/Android.bp
  trusty/confirmationui/Android.bp
  trusty/confirmationui/fuzz/Android.bp
  trusty/coverage/Android.bp
  trusty/fuzz/Android.bp
  trusty/fuzz/test/Android.bp
  trusty/gatekeeper/Android.bp
  trusty/gatekeeper/fuzz/Android.bp
  trusty/keymaster/Android.bp
  trusty/keymaster/fuzz/Android.bp
  trusty/libtrusty/Android.bp
  trusty/libtrusty/tipc-test/Android.bp
  trusty/secure_dpu/Android.bp
  trusty/storage/interface/Android.bp
  trusty/storage/lib/Android.bp
  trusty/storage/proxy/Android.bp
  trusty/storage/tests/Android.bp
  trusty/utils/spiproxyd/Android.bp
  trusty/utils/trusty-ut-ctrl/Android.bp
  usbd/Android.bp
  watchdogd/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
  debuggerd/Android.bp
  fastboot/Android.bp
  libkeyutils/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-MIT
to:
  Android.bp
  libcutils/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
to:
  fs_mgr/Android.bp
  fs_mgr/libfs_avb/Android.bp
  trusty/utils/rpmb_dev/Android.bp

Added SPDX-license-identifier-BSD
to:
  fastboot/fuzzy_fastboot/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I5bd81adb5cdcf2b4dd4141b204eb430ff526af8f
2021-02-16 04:10:03 -08:00
Jiyong Park
13eb053a25 Build first-stage init in Soong
The first-stage init has been built in Make due to some requirements
(like placing it directly under the root directory rather than bin/, and
creating mountpoints like /proc, etc.) that are not supported in Soong.

However, Ie06dc5a93635ea8b1e18be517ed8615b6c82fee6 will make it possible
to satisfy the requirements in Soong. The build of the boot image is
done in Soong and we can create mount points using the `dirs` property
and create a symlink /init that points to /bin/init_vendor using the
`symlinks` property.

To complete the picture of build everying in Soong, this change adds a
Soong-version of the first-stage init.

Note that the Soong-based boot image creation is currently only for the
microdroid usecase. Therefore, the Android.mk-based first-stage init
still remains and will be removed later.

Bug: 178562516
Test: m init_first_stage_soong

Change-Id: I278cb60a11d94fb48341fd3592be0652a25bdbfb
2021-02-16 12:21:49 +09:00
Florian Mayer
29109ea457 Merge "Allow to target atrace apps by glob." am: 83eae36647
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1584933

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85b1610dd1c64e9881a6adca0eb05b2874f108b6
2021-02-15 12:25:18 +00:00
Florian Mayer
83eae36647 Merge "Allow to target atrace apps by glob." 2021-02-15 12:04:06 +00:00
Treehugger Robot
83ff1049ed Merge changes from topic "uid_pid with recovery mode" am: 0130a782ec
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1585103

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idac79861c7f119f7afabbb71545a97807dc51f96
2021-02-13 21:52:04 +00:00
Marco Ballesio
3067ef3ec0 libprocessgroup: adopt cgroup v2 freezer search path am: a7148f82a1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1585102

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b9b318b710c5ab3f53e08489c3df8dcfc2cd663
2021-02-13 21:52:00 +00:00
Marco Ballesio
b33b95f6ef Revert^4 "libprocessgroup: uid/pid hierarchy for cgroup v2" am: 4dac81680f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1585101

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id88c7f5f6b9193af5adc8ebfb19b316c0b2dd938
2021-02-13 21:51:47 +00:00
Treehugger Robot
0130a782ec Merge changes from topic "uid_pid with recovery mode"
* changes:
  libprocessgroup: fix uid/pid hierarchy for recovery mode
  libprocessgroup: adopt cgroup v2 freezer search path
  Revert^4 "libprocessgroup: uid/pid hierarchy for cgroup v2"
2021-02-13 21:32:31 +00:00
Florian Mayer
cae942d7ac Do not check for debuggable / profilable for app tracing.
This is undocumented and surprising behaviour.

Bug: 179883548
Change-Id: I373b176d4ed9f6b0e970d055d7e4e2686c6d3991
2021-02-12 16:54:51 +00:00
Mohammad Islam
60662d06e3 Merge "Create an encrypted directory for decompressing compressed APEX" am: 223902d81c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1551154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18c71a9640338cc3996719c48f03778ed8e5602a
2021-02-12 10:50:06 +00:00
Mohammad Islam
223902d81c Merge "Create an encrypted directory for decompressing compressed APEX" 2021-02-12 10:16:55 +00:00
Janis Danisevskis
8e0035c0cc Gatekeeper: Add missing user_id.
Auth tokens sent to keystore2 where missing the user id.

Test: Timeout bound keys can be authorized.
Change-Id: Ifd27d2d8c4e153d2e21460574a073516e276aae0
2021-02-11 23:16:58 -08:00
Josh Gao
24fd318fcd Merge "tombstone.proto: reserve numbers for future growth." am: 517d64f0c6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1584265

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If995627afe3656b734d310774b9dcda392996950
2021-02-12 05:20:56 +00:00