system-core

Fork

Snap for 5637155 from 1803972b6b081e522454de5ee72d58011f5c8e9f to qt-qpr1-release

Change-Id: I463f4ee5c04efbd72a330da45770eca428ab0c72

fs_mgr: overlayfs: pre-emptive filesystem setup
am: 0dff785221

Change-Id: I007e1703957ddc064f8055dd5e0c3f834bb5ba3f

fs_mgr: overlayfs: pre-emptive filesystem setup

If we just disabled verity, take the step to setup the backing
storage for overlayfs.

Test: adb-remount-test.sh
Bug: 130131892
Change-Id: Ic56569eaf363e4417a0ce5df11ee5480a07b8b03
Merged-In: Ic56569eaf363e4417a0ce5df11ee5480a07b8b03

Snap for 5626839 from 857a861c182c86c0f1d61e813ba63b8b95e9bc12 to qt-qpr1-release

Change-Id: I61ff14d2120cc9c3cce9a6c9fbbc284999b0e9b6

Merge "Close /dev/fuse FD before calling onClosed" into qt-dev
am: b6d9fbddc6

Change-Id: I9cf86c3206cfbbcc2bed84809e5cb7aa454156bd

Merge "Close /dev/fuse FD before calling onClosed" into qt-dev

Close /dev/fuse FD before calling onClosed

This works around a deadlock when a bridge that is about to be closed
is reused for a new call to openFile. The call to open() ends up holding
the vold lock, waiting for appfuse to respond. The appfuse event loop
calls onClosed(), which ends up calling vold.unmountAppFuse(), which
cannot get the lock.

Closing this file descriptor causes any current calls to open() on its
mount path to fail with either ECONNABORTED or ENOTCONN, allowing the
event loop to make progress, call onClosed() and unmount the path.

Note that the failed call to open() will result in a retry, which
will create a new appfuse bridge. This is not ideal but not a new
problem -- the common case here is that that each call to
openProxyFileDescriptor creates a new bridge. This should ideally
be improved.

Bug: 132344997
Test: flick through info of photos with location info attached
Exempt-From-Owner-Approval: verbal approval of approach
Change-Id: I878e5cf86f18c5233f8505f52eb9db076bd72d01

Merge "init: make fatal reboot target configurable" into qt-dev
am: 4d63d1b7bb

Change-Id: I0b2e40dc8bc23251b71e91abcbecee7c5fc643f0

Merge "init: dump stack when aborting" into qt-dev
am: d0ed53e5e7

Change-Id: Iae3268a0672337de5c3e2a7dbc016a59090fa9bc

Merge "init: make fatal reboot target configurable" into qt-dev

Merge "init: dump stack when aborting" into qt-dev

Fix BridgeEpollController to handles EAGAIN correctly
am: ca0d4ffbe3

Change-Id: I47ebbb9f83dfa55474a93ab4d28fba5b20758270

Fix BridgeEpollController to handles EAGAIN correctly

When reading/writing proxy FD, if it returns EAGAIN,
BridgeEpollController updates epoll entries to observe specific FD
events. Before updating epoll entries, BridgeEpollController checks if
it really needs to update by comparing |state_| and |last_state_|.
|last_state_| has not been updated correctly so it resulted in wrong
epoll settings and keeps blocking the event loop.

Bug: 134104939
Test: atest libappfuse_test
Change-Id: I1c4a0164c1c016baf24ecfd523476ced981d3b28

Merge "lmkd: use ALOGE for logging kills" into qt-dev
am: cc18faf4d6

Change-Id: I00913e3bd6607a08dd14ba41d4ecf3c056c1cb6d

Merge "lmkd: use ALOGE for logging kills" into qt-dev

lmkd: use ALOGE for logging kills

Test: boots, works
Bug: 133761317
Signed-off-by: Tim Murray <timmurray@google.com>
Exempt-From-Owner-Approval: trivial change

Change-Id: I1a4a3741694078eec124f1f560ea68e78754bca6

init: make fatal reboot target configurable

Currently, if init encounters a fatal issues it reboots to fastboot
but this may be not desirable in all cases, especially the case of
critical services crashing. Therefore this change adds the ability
for vendors to customize the reboot target via the
androidboot.init_fatal_reboot_target= kernel command line.

This applies to all LOG(FATAL) messages as well as fatal signals in
userdebug/eng builds, except for signals before logging is enabled in
first stage init.

Bug: 121006328
Test: device reboots to configurable target with LOG(FATAL)
Test: device reboots to configurable target after a segfault in the
various stages of init
Test: device reboots to fastboot without a configured target
Change-Id: I16ea9e32e2fee08dece3d33b697d7a08191d607b
Merged-In: I16ea9e32e2fee08dece3d33b697d7a08191d607b
(cherry picked from commit 75e13baf32ae1a54a9e43b7d7d6bdcc6f8d545d7)

init: dump stack when aborting

Dump init stacks when aborting either due to LOG(FATAL) or in
userdebug/eng builds due to signals, including signals from
sanitizers.

Doesn't work for static first stage init yet, b/133450393 tracks
that.

Also, ensure that LOG(FATAL) in child processes calls abort() in all
stages of init, not just 2nd stage init.

Bug: 131747478
Test: abort init in various ways and see stacks
Test: hang or crash in backtrace handler and see child reboot
Change-Id: Ib53b5d3e7e814244203f875de016ada9900dfce8
Merged-In: Ib53b5d3e7e814244203f875de016ada9900dfce8
(cherry picked from commit 59656fb37769b3c0de927c20f8e9f5855a0f7ac3)

Snap for 5616725 from 6c78e3ba1b7f8b5d54c36d240efb89418a964957 to qt-qpr1-release

Change-Id: I635c84225ab77b94a11188b427ad62d47809b603

Merge "Fix non-aio USB read issue for fastbootd" into qt-dev
am: 9122289a97

Change-Id: Id416f267f477d04ed5d71f2158ebc35183befa22

Merge "Fix non-aio USB read issue for fastbootd" into qt-dev

Fix non-aio USB read issue for fastbootd

non-aio USB read function was stuck in a loop waiting for more data
because data length parameter is always set 64 for fastbootd commands.
It should be a normal case to get less data than expected
since lengths of these commands are usually less than 64.
Add logic to check this and one more parameter to distinguish
fastbootd from general adbd case.

Bug: 133189029
Test: try various fastbootd commands
Change-Id: I6690324840d78f3f1e04235040301520329976db

Fix leak of mapped zip central directories
am: d1531ac4e8

Change-Id: Iacc5d17b17cd05742e78650bde969ccbfa3b09c2

Fix leak of mapped zip central directories

Memory mapping the central directory of specific APKs caused memory
mappings to build up over time because they were never unmapped
correctly. This is because MappedFile is not calling munmap with the
size of the data after aligning the mmap offset to a page boundary.

Bug: 133463863
Test: install APKs and verify that the entire mapped CD is unmaped
Test: ran aapt2 as daemon and confirmed that mapped CD is unmapped
Change-Id: Icb6cfebe0e8d67160fee34c5e6423d0f05de526b

Snap for 5606001 from 9e28c5448b0e8adca9b2061496e313d8d9ce4634 to qt-qpr1-release

Change-Id: Icebe98006154dd2ad7dc04743a8efe80a82230e9

rootdir / sdcard : Stop creating /data/media/obb.
am: c6ca823710

Change-Id: I429eacda7dc48b7472814dcecf58e1c7262b37fa

rootdir / sdcard : Stop creating /data/media/obb.

This directory is no longer used. OBB content is
placed in /data/media/$user/Android.

Test: make
Test: manually verify the path doesn't exist.
Bug: 129167772

Change-Id: I8549826586b9a68c8cfa3fe2e51295363f9b4e11

Merge "Moving /odm/build.prop to /odm/etc/buid.prop" into qt-dev
am: b36b54cf79

Change-Id: I2b24f88411f9ebd20216371280b2f97fb150e640

Snap for 5595555 from 4a572d984f1524d41fa7bab1028c5527ca126946 to qt-qpr1-release

Change-Id: I8a956b6dc419285f439b51951581a866148af442

Merge "Moving /odm/build.prop to /odm/etc/buid.prop" into qt-dev