Commit graph

70489 commits

Author SHA1 Message Date
Bob Badour
994fe355d9 Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: d0bfde2f78 am: b2145c414a am: 4cf31dacb3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1591651

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ea2cdf9470b391f3a1067a9f6eb666fd461d92b
2021-02-21 17:31:20 +00:00
Bob Badour
4cf31dacb3 Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: d0bfde2f78 am: b2145c414a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1591651

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67de80308f4c4a44d71f597ae9203a47113d245d
2021-02-21 16:53:45 +00:00
Bob Badour
b2145c414a Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: d0bfde2f78
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1591651

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9e74137fa3fde5800c36d76b0adab1bd1b52547
2021-02-21 15:48:30 +00:00
Bob Badour
d0bfde2f78 Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" 2021-02-21 15:24:32 +00:00
Bob Badour
d69ad69a93 [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:
  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/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: Id740a7d2884556081fdb68876584b25eb95e1bef
2021-02-19 12:59:05 -08:00
Christopher Ferris
f1175b105d Merge "Update for new kernel 5.11 headers." am: d57652f15b am: c5b658077b am: 1b53137db5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1595351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6f2b42c637c7c7cc7f2149ae0835c0360d79a1d
2021-02-19 20:45:01 +00:00
Christopher Ferris
1b53137db5 Merge "Update for new kernel 5.11 headers." am: d57652f15b am: c5b658077b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1595351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d9393e92832524070723824d7dff50edd1a584d
2021-02-19 20:41:18 +00:00
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
d81b6cce86 Merge "Don't hard-code number of tombstones." am: a4807cba22 am: d5076451dd am: d71722b665
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1592919

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f876be82debff768908ccd791b8402fe79147e2
2021-02-19 19:19:22 +00:00
Christopher Ferris
d71722b665 Merge "Don't hard-code number of tombstones." am: a4807cba22 am: d5076451dd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1592919

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I011d4671f394eba111992731008575bed45e7252
2021-02-19 18:57:05 +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
4744dd7a7a Merge "Add on-device signing binary." am: 73dea057c2 am: f14403b878 am: 7475a24c04
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1513029

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia445af69af56c6707d9d7c7ddfa64b3a42f0a3d7
2021-02-19 12:54:04 +00:00
Martijn Coenen
7475a24c04 Merge "Add on-device signing binary." am: 73dea057c2 am: f14403b878
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1513029

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia01ec222b944c159f4f0c4c1cdac00fd38e4fb9f
2021-02-19 12:15:32 +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
d633c70d3e Merge "Generate text tombstones from proto tombstones by default." am: 8c164946d8 am: 844ce55770 am: 37251d2cdb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1595302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I750c42d890dc79c2010841690e2e03818d232301
2021-02-19 05:53:36 +00:00
Josh Gao
37251d2cdb Merge "Generate text tombstones from proto tombstones by default." am: 8c164946d8 am: 844ce55770
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1595302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c80dee00f881cfa529fad32e51edb5008df87c3
2021-02-19 04:58:03 +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
Tom Cherry
44dd055da8 init: do not create dev.mnt. properties for emulated mounts am: 7e4ce2b578 am: f139523a97
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/13612491

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b2a83e6fb0e17d5bf197d20660298f0f1594011
2021-02-19 00:36:40 +00:00
Tom Cherry
f139523a97 init: do not create dev.mnt. properties for emulated mounts am: 7e4ce2b578
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/13612491

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I274f4f6fd7f0898f6fee99a2cf463ce927c08653
2021-02-19 00:12:34 +00: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
Primiano Tucci
7d4c140ffa Merge "Do not check for debuggable / profilable for app tracing." am: c89dd8594e am: bbd67c3ede am: 2f9154ab5a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1581672

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48da47dd914e5f70453930b63b7f997c364edbcd
2021-02-18 20:54:39 +00:00
Primiano Tucci
2f9154ab5a Merge "Do not check for debuggable / profilable for app tracing." am: c89dd8594e am: bbd67c3ede
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1581672

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8cb44407cd96518d9041bf8e70fde206cf8c197
2021-02-18 20:12:19 +00: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
53b541ed4c Merge "Explicitly cast to 64bit integer when calculating filesystem size" am: 10a8797ce0 am: 83f5476b3d am: 4707ce169d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1586546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fbf9cf7d7624a1e7b8e3feaf828c4794b840621
2021-02-18 10:28:44 +00:00
Yo Chiang
4707ce169d Merge "Explicitly cast to 64bit integer when calculating filesystem size" am: 10a8797ce0 am: 83f5476b3d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1586546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe4b041bf28881c21a683ca6d9c42944e098c928
2021-02-18 10:09:48 +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
8330d891be Merge "fs_mgr: Add OverlayMountPoints() to get the list of overlayfs backing storage" am: ec1b09fca9 am: 9a2bf07d51 am: cd369c3cec
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1585166

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I913a27ccaef107c67bb1e8083e4715f384269043
2021-02-18 06:23:58 +00:00
Yo Chiang
cd369c3cec Merge "fs_mgr: Add OverlayMountPoints() to get the list of overlayfs backing storage" am: ec1b09fca9 am: 9a2bf07d51
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1585166

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b369a25d64eaf7005c2b3d7478530bc53fdb814
2021-02-18 06:02:55 +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
Tom Cherry
7e4ce2b578 init: do not create dev.mnt. properties for emulated mounts
dev.mnt. properties are primarily intended for tuning parameters for
mounts such as /system and /data but don't have much use for emulated
mounts.

There are additional emulated mounts created for each user on a
device, so if too many users are created, init would otherwise create
too many dev.mnt. properties, filling the property file that backs
these properties, and preventing more properties from being
generated.

Therefore, this change stops init from creating dev.mnt. properties
for emulated mounts.

Bug: 156721033
Bug: 179111945
Test: user creation stress test doesn't create large numbers of
properties

Change-Id: I6475956719b7c938b8289189abfef661140d526d
2021-02-17 20:47:07 -08: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
ab2290b7d2 Merge "Build first-stage init in Soong" am: 9e22a46db9 am: b8eed6199c am: 844eaae056
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1588294

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d1fa78344f72783d447479176cd2503e6c50792
2021-02-18 00:30:32 +00:00
Treehugger Robot
ea93f320e0 Merge "Gatekeeper: Add missing user_id." am: 5edcb8a3d6 am: 693ee75fde am: 7fda18011c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1586506

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b55d69ba73d60374a3a619b3186733881bf0792
2021-02-18 00:29:57 +00:00
Treehugger Robot
844eaae056 Merge "Build first-stage init in Soong" am: 9e22a46db9 am: b8eed6199c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1588294

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa81eb2609fdf1b16783c06c5762e6bf97593a92
2021-02-18 00:08:40 +00:00
Treehugger Robot
7fda18011c Merge "Gatekeeper: Add missing user_id." am: 5edcb8a3d6 am: 693ee75fde
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1586506

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6462d9dcf0cfdbe7af7b91d18c5293e4c87f57c1
2021-02-18 00:08:32 +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
Tri Vo
b279febaf3 Merge "trusty: ConfirmationUI HAL<->TA IPC using shared memory" am: 09cbde252c am: 2302e2122f am: c6c2304270
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1590278

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62ee3fbe3ae948ca1182a6a7b42ce37027b8e08f
2021-02-17 23:18:32 +00:00
Treehugger Robot
5edcb8a3d6 Merge "Gatekeeper: Add missing user_id." 2021-02-17 22:59:58 +00:00