Bowgo Tsai
3f10ecabf8
Merge "fs_mgr: allow no verity metadata when the device is unlocked." am: cd0c2d8962 am: 328b56585e
...
am: 06c6bf67e9
2017-07-06 01:12:59 +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
d266d37e4c
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
(cherry picked from commit cccb34fce8
2017-07-06 00:54:02 +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
Android Build Merger (Role)
c2404bc273
Merge "Merge "Backtrace: Add libziparchive dependency" am: 69542edfbe am: 1030828a36 am: 0e6bac40c4 am: e26f294187"
2017-07-06 00:23:40 +00:00
Android Build Merger (Role)
6a54f8dc3f
Merge "Merge "Backtrace: Add libziparchive dependency" am: 69542edfbe am: 1030828a36 am: 0e6bac40c4 am: e26f294187"
2017-07-06 00:23:22 +00:00
Andreas Gampe
03896e2988
Merge "Backtrace: Add libziparchive dependency" am: 69542edfbe am: 1030828a36 am: 0e6bac40c4
...
am: e26f294187
2017-07-06 00:23:21 +00:00
Android Build Merger (Role)
6a09fe4bf2
Merge "Merge "init: Support custom shutdown actions" am: c1bc4241f8 am: 5b89535442 am: b39890048c am: 2a38e6d119"
2017-07-06 00:23:15 +00:00
Andreas Gampe
f1e04e3382
Merge "Backtrace: Add libziparchive dependency" am: 69542edfbe am: 1030828a36 am: 0e6bac40c4
...
am: e26f294187
2017-07-06 00:23:07 +00:00
Wei Wang
9baebb9432
Merge "init: Support custom shutdown actions" am: c1bc4241f8 am: 5b89535442 am: b39890048c
...
am: 2a38e6d119
2017-07-06 00:23:01 +00:00
Android Build Merger (Role)
a0105c32cc
Merge "Merge "init: Support custom shutdown actions" am: c1bc4241f8 am: 5b89535442 am: b39890048c am: 2a38e6d119"
2017-07-06 00:22:59 +00:00
Android Build Merger (Role)
1bc2a56fc8
Merge "Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 am: 04b7493074" into oc-dr1-dev-plus-aosp am: 158803cd39"
2017-07-06 00:22:55 +00:00
Wei Wang
a89b61ad99
Merge "init: Support custom shutdown actions" am: c1bc4241f8 am: 5b89535442 am: b39890048c
...
am: 2a38e6d119
2017-07-06 00:22:45 +00:00
Tom Cherry
2c4e7a92b2
Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 am: 04b7493074" into oc-dr1-dev-plus-aosp
...
am: 158803cd39
2017-07-06 00:22:41 +00:00
Android Build Merger (Role)
f0c0241ac2
Merge "Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 am: 04b7493074" into oc-dr1-dev-plus-aosp am: 158803cd39"
2017-07-06 00:22:39 +00:00
Tom Cherry
12ef7fd8b6
Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 am: 04b7493074" into oc-dr1-dev-plus-aosp
...
am: 158803cd39
2017-07-06 00:22:25 +00:00
Android Build Merger (Role)
9d41f7d233
Merge "Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 am: 04b7493074" into oc-dr1-dev-plus-aosp am: 501d7a1360"
2017-07-06 00:22:14 +00:00
Android Build Merger (Role)
4b03e6edd2
Merge "Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 am: 04b7493074" into oc-dr1-dev-plus-aosp am: 501d7a1360"
2017-07-06 00:22:12 +00:00
Tom Cherry
c595263a28
Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 am: 04b7493074" into oc-dr1-dev-plus-aosp
...
am: 501d7a1360
2017-07-06 00:21:56 +00:00
Tom Cherry
e6a037af17
Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 am: 04b7493074" into oc-dr1-dev-plus-aosp
...
am: 501d7a1360
2017-07-06 00:21:51 +00:00
Android Build Merger (Role)
a523882d65
Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b am: bef2bbdf62" into oc-dr1-dev-plus-aosp am: cdc83336bb"
2017-07-06 00:21:48 +00:00
Android Build Merger (Role)
9caf67b2e8
Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b am: bef2bbdf62" into oc-dr1-dev-plus-aosp am: cdc83336bb"
2017-07-06 00:21:42 +00:00
Tom Cherry
ae2e01d2b0
Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b am: bef2bbdf62" into oc-dr1-dev-plus-aosp
...
am: cdc83336bb
2017-07-06 00:21:33 +00:00
Tom Cherry
c25d032e00
Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b am: bef2bbdf62" into oc-dr1-dev-plus-aosp
...
am: cdc83336bb
2017-07-06 00:21:25 +00:00
Android Build Merger (Role)
faf208e105
Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b am: bef2bbdf62" into oc-dr1-dev-plus-aosp am: 93e81d4775"
2017-07-06 00:21:25 +00:00
Tom Cherry
c7e8bab034
Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b am: bef2bbdf62" into oc-dr1-dev-plus-aosp
...
am: 93e81d4775
2017-07-06 00:21:04 +00:00
Tom Cherry
38728d6ca8
Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b am: bef2bbdf62" into oc-dr1-dev-plus-aosp
...
am: 93e81d4775
2017-07-06 00:21:01 +00:00
Tom Cherry
a9454a9b7d
Merge "Merge "init: reap zombies only after kill(-pid, ...)" am: a51c40ce35 am: 0924b32c1f am: 419a9ef8f1" into oc-dr1-dev-plus-aosp
...
am: 3dcfd2e6ad
2017-07-06 00:20:32 +00:00
Tom Cherry
2afdb6d526
Merge "init: reap zombies only after kill(-pid, ...)" am: a51c40ce35 am: 0924b32c1f am: 419a9ef8f1
...
am: fc479afbb6
2017-07-06 00:20:08 +00:00
Andreas Gampe
e26f294187
Merge "Backtrace: Add libziparchive dependency" am: 69542edfbe am: 1030828a36
...
am: 0e6bac40c4
2017-07-06 00:02:21 +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
2a38e6d119
Merge "init: Support custom shutdown actions" am: c1bc4241f8 am: 5b89535442
...
am: b39890048c
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
Android Build Merger (Role)
158803cd39
Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 am: 04b7493074" into oc-dr1-dev-plus-aosp
2017-07-05 23:38:46 +00:00
Tom Cherry
cb82e501d4
Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82
...
am: 04b7493074
2017-07-05 23:38:34 +00:00
Android Build Merger (Role)
501d7a1360
Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 am: 04b7493074" into oc-dr1-dev-plus-aosp
2017-07-05 23:38:24 +00:00
Android Build Merger (Role)
cdc83336bb
Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b am: bef2bbdf62" into oc-dr1-dev-plus-aosp
2017-07-05 23:38:18 +00:00
Tom Cherry
ff1735b966
Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82
...
am: 04b7493074
2017-07-05 23:38:07 +00:00
Android Build Merger (Role)
93e81d4775
Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b am: bef2bbdf62" into oc-dr1-dev-plus-aosp
2017-07-05 23:38:01 +00:00
