Tom Cherry
290b501bc0
Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a
...
am: e944b7e0a4
2017-07-06 02:21:34 +00:00
Tom Cherry
e944b7e0a4
Merge "ueventd: don't double fork firmware handlers"
...
am: 0f4fb5497a
2017-07-06 02:10:57 +00:00
Tom Cherry
0f4fb5497a
Merge "ueventd: don't double fork firmware handlers"
2017-07-06 02:02:33 +00:00
Android Build Merger (Role)
61ce9b3bad
Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328" into oc-dev-plus-aosp
2017-07-06 00:57:11 +00:00
Keun-young Park
2fb50a7394
Merge "add "shutdown critical" to service" am: b3915d113d
...
am: a4ad5d0328
2017-07-06 00:56:58 +00:00
Keun-young Park
19ec8e7bcf
Merge "add "shutdown critical" to service" am: b3915d113d
...
am: a4ad5d0328
2017-07-06 00:56:18 +00:00
Bowgo Tsai
06c6bf67e9
Merge "fs_mgr: allow no verity metadata when the device is unlocked." am: cd0c2d8962
...
am: 328b56585e
2017-07-06 00:56:00 +00:00
Keun-young Park
a4ad5d0328
Merge "add "shutdown critical" to service"
...
am: b3915d113d
2017-07-06 00:46:31 +00:00
Bowgo Tsai
328b56585e
Merge "fs_mgr: allow no verity metadata when the device is unlocked."
...
am: cd0c2d8962
2017-07-06 00:46:09 +00:00
Treehugger Robot
b3915d113d
Merge "add "shutdown critical" to service"
2017-07-06 00:40:55 +00:00
Treehugger Robot
cd0c2d8962
Merge "fs_mgr: allow no verity metadata when the device is unlocked."
2017-07-06 00:29:47 +00:00
Andreas Gampe
0e6bac40c4
Merge "Backtrace: Add libziparchive dependency" am: 69542edfbe
...
am: 1030828a36
2017-07-06 00:00:50 +00:00
Andreas Gampe
1030828a36
Merge "Backtrace: Add libziparchive dependency"
...
am: 69542edfbe
2017-07-05 23:58:51 +00:00
Wei Wang
b39890048c
Merge "init: Support custom shutdown actions" am: c1bc4241f8
...
am: 5b89535442
2017-07-05 23:56:50 +00:00
Treehugger Robot
69542edfbe
Merge "Backtrace: Add libziparchive dependency"
2017-07-05 23:55:43 +00:00
Wei Wang
5b89535442
Merge "init: Support custom shutdown actions"
...
am: c1bc4241f8
2017-07-05 23:54:56 +00:00
Treehugger Robot
c1bc4241f8
Merge "init: Support custom shutdown actions"
2017-07-05 23:49:41 +00:00
Tom Cherry
0f296e06d6
ueventd: don't double fork firmware handlers
...
ueventd may be asked to handle firmware during the time critical
coldboot process. If we double fork to avoid needing to reap the
firmware handler, then we may add significant delay to this process,
as the first child may not get scheduled quickly enough for waitpid()
to complete without delay.
Bug: 63081260
Test: boot bullhead and sailfish, check that firmwares are loaded,
no zombie ueventd processes remain, and no new errors are shown
Change-Id: I2bac3b1fbc3a58557a00326e491c104656db27ae
2017-07-05 16:41:11 -07:00
Tom Cherry
04b7493074
Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master
...
am: f038ee0d82
2017-07-05 23:02:47 +00:00
Tom Cherry
bef2bbdf62
Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f
...
am: 6e0b51825b
2017-07-05 23:01:53 +00:00
Tom Cherry
419a9ef8f1
Merge "init: reap zombies only after kill(-pid, ...)" am: a51c40ce35
...
am: 0924b32c1f
2017-07-05 23:01:35 +00:00
Android Build Merger (Role)
f038ee0d82
Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master
2017-07-05 22:50:56 +00:00
Tom Cherry
d74886ce10
Merge "ueventd: remove character device symlinks (/dev/usb/*)"
...
am: f3ae82f57f
2017-07-05 22:50:46 +00:00
Tom Cherry
6e0b51825b
Merge "ueventd: remove character device symlinks (/dev/usb/*)"
...
am: f3ae82f57f
2017-07-05 22:50:35 +00:00
Tom Cherry
0924b32c1f
Merge "init: reap zombies only after kill(-pid, ...)"
...
am: a51c40ce35
2017-07-05 22:50:17 +00:00
Tom Cherry
f3ae82f57f
Merge "ueventd: remove character device symlinks (/dev/usb/*)"
2017-07-05 22:41:55 +00:00
Tom Cherry
a51c40ce35
Merge "init: reap zombies only after kill(-pid, ...)"
2017-07-05 22:39:51 +00:00
Mark Salyzyn
ab6f80c350
Merge "fs_mgr: report errno string for __mount errors" am: 6333cd0938
...
am: eef732555d
2017-07-05 21:56:15 +00:00
Keun-young Park
cccb34fce8
add "shutdown critical" to service
...
- "shutdown critical" prevents killing the service during
shutdown. And the service will be started if not running.
- Without it, services will be killed by SIGTERM / SIGKILL during shutdown.
- Even services with "shutdown critical" will be killed if shutdown
times out.
- Removes ueventd and vold from hard coded list. Each service's rc will
be updated to add "shutdown critical". watchdogd is still kept in the list.
bug: 37626581
Test: reboot and check last kmsg
Change-Id: Ie8cc699d1efbc59b9a2561bdd40fec64aed5a4bb
2017-07-05 14:55:22 -07:00
Mark Salyzyn
eef732555d
Merge "fs_mgr: report errno string for __mount errors"
...
am: 6333cd0938
2017-07-05 21:54:17 +00:00
Wei Wang
eeab491efd
init: Support custom shutdown actions
...
We have been seeing panics and errors during shutdown sequence in
some vendor's platform, and it is required to disable error handling
during shutdown.
This CL separates the shutdown request to execute another "shutdown"
trigger at the beginning of shutdown stage. And vendor can use this
trigger to add custom commands needed for shutting down gracefully.
Bug: 38203024
Bug: 62084631
Test: device reboot/shutdown
Change-Id: I3fac4ed59f06667d86e477ee55ed391cf113717f
2017-07-05 14:49:57 -07:00
Treehugger Robot
6333cd0938
Merge "fs_mgr: report errno string for __mount errors"
2017-07-05 21:41:51 +00:00
Bowgo Tsai
d1fe3bdbd6
fs_mgr: allow no verity metadata when the device is unlocked.
...
To boot with generic system.img for project Treble, we should allow no verity
metadata when the device is unlocked. The previous fix checks system property
"ro.boot.flash.locked" but it's unavailable during first stage mount.
This CL checks "androidboot.verifiedbootstate" in kernel command line instead.
Bug: 63268209
Test: boot sailfish without metadata on /vendor
Change-Id: Ifd1dbeb2a2f09cd06903ecdd59bc94b3905a3fbd
2017-07-05 17:22:35 +08:00
Andreas Gampe
8f0947c11f
Backtrace: Add libziparchive dependency
...
Bug: 37342627
Test: m
Change-Id: I2b4155bd11b315ff49eb9a69549e1ab3678d0b28
2017-07-04 12:03:52 -07:00
Jiyong Park
022b164c77
Merge "zlib is not exposed to libziparchive headers" am: eb42bb8c8b
...
am: d74d572f9d
2017-07-03 19:38:25 +00:00
Jiyong Park
d74d572f9d
Merge "zlib is not exposed to libziparchive headers"
...
am: eb42bb8c8b
2017-07-03 19:34:56 +00:00
Treehugger Robot
eb42bb8c8b
Merge "zlib is not exposed to libziparchive headers"
2017-07-03 19:30:45 +00:00
Jiyong Park
e7cf680ccc
zlib is not exposed to libziparchive headers
...
By forward-declaring zstream, we don't need to re-export zlib headers.
Bug: 37342627
Test: build
Test: BOARD_VNDK_VERSION=current m -j dumpstate (or any other module
using libziparchive)
Change-Id: Ia69e5d459c79878d491cfe4ca21a7cc8fed4a5d8
2017-07-03 17:44:07 +00:00
Jiyong Park
da3af937a1
Merge "libziparchive headers are moved to local directory" am: 7b44858b91
...
am: 4724e91dad
2017-07-03 08:15:20 +00:00
Jiyong Park
4724e91dad
Merge "libziparchive headers are moved to local directory"
...
am: 7b44858b91
2017-07-03 08:12:51 +00:00
Treehugger Robot
7b44858b91
Merge "libziparchive headers are moved to local directory"
2017-07-03 08:06:40 +00:00
Jiyong Park
b84d631915
Merge "Ran clang-format on libziparchive sources and headers" am: aa82721894
...
am: 1fd5216370
2017-07-03 00:52:26 +00:00
Jiyong Park
1fd5216370
Merge "Ran clang-format on libziparchive sources and headers"
...
am: aa82721894
2017-07-03 00:49:56 +00:00
Treehugger Robot
aa82721894
Merge "Ran clang-format on libziparchive sources and headers"
2017-07-03 00:45:16 +00:00
Jiyong Park
cdf7ff8e20
libziparchive headers are moved to local directory
...
libziparchive headers are moved from the global include directory
(/system/core/include) to the local directory inside libziparchive.
Note: /system/core/include/ziparchive still exists as a symlink to
libarchive/include/ziparchive. This will be removed when there is no
header-only dependency to libziparchive.
Bug: 37342627
Test: build
Change-Id: I3631ffc2df7be8a064d64a625d10436090c3bb0f
2017-07-02 04:33:34 +00:00
Jiyong Park
cd997e6094
Ran clang-format on libziparchive sources and headers
...
Test: build aosp_arm
Change-Id: I469b82b68f2c457f480fb9cd9da2026672985ce3
2017-07-02 11:46:53 +09:00
Nick Kralevich
0056e6bccc
Merge "Remove unnecessary SELinux dependencies" am: 22de50d351
...
am: e9b9b10c58
2017-07-01 16:44:36 +00:00
Nick Kralevich
e9b9b10c58
Merge "Remove unnecessary SELinux dependencies"
...
am: 22de50d351
2017-07-01 16:39:37 +00:00
Treehugger Robot
22de50d351
Merge "Remove unnecessary SELinux dependencies"
2017-07-01 16:35:17 +00:00
Nick Kralevich
33391dad15
Remove unnecessary SELinux dependencies
...
These are unused.
Test: code compiles.
Change-Id: Idd707dfcc8f6daac3a489c791ecc364841cf31f9
2017-07-01 07:41:48 -07:00
