Keun-young Park
53d129cdf5
Merge "add "shutdown critical" to service" into oc-dr1-dev
...
am: 3b15f44041
2017-07-06 17:22:29 +00:00
Keun-young Park
3b15f44041
Merge "add "shutdown critical" to service" into oc-dr1-dev
2017-07-06 17:14:23 +00:00
Tom Cherry
98562ebdf7
Merge "init: add info logs in first stage mount if we have to poll" into oc-dr1-dev
...
am: 7be26793eb
2017-07-06 16:28:11 +00:00
TreeHugger Robot
7be26793eb
Merge "init: add info logs in first stage mount if we have to poll" into oc-dr1-dev
2017-07-06 16:15:11 +00:00
Android Build Merger (Role)
80043c7891
Merge "Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev am: 3d7422dbfe -s ours" into oc-dr1-dev-plus-aosp
2017-07-06 16:07:55 +00:00
Jin Qian
64ba9e3e49
Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev
...
am: 3d7422dbfe
2017-07-06 16:06:38 +00:00
Jin Qian
f5135ce112
Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev
...
am: 3d7422dbfe
2017-07-06 16:06:19 +00:00
TreeHugger Robot
3d7422dbfe
Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev
2017-07-06 14:24:04 +00:00
Andreas Gampe
65dc50f7db
Merge "Libziparchive: Export headers in defaults" am: c31963b5c2 am: bf4029cdfb
...
am: 417556a5f8
2017-07-06 07:03:18 +00:00
Andreas Gampe
417556a5f8
Merge "Libziparchive: Export headers in defaults" am: c31963b5c2
...
am: bf4029cdfb
2017-07-06 07:00:13 +00:00
Andreas Gampe
bf4029cdfb
Merge "Libziparchive: Export headers in defaults"
...
am: c31963b5c2
2017-07-06 06:57:06 +00:00
Treehugger Robot
c31963b5c2
Merge "Libziparchive: Export headers in defaults"
2017-07-06 06:51:29 +00:00
Tom Cherry
c680bfeaf2
init: add info logs in first stage mount if we have to poll
...
It's not a error case if we do not find a device that we're attempting
to regenerate uevents for during first stage mount, but it is likely
to increase boot time, so we log a message to attribute this delay.
Bug: 63327193
Test: Boot bullhead, sailfish
Merged-In: I97c2e5aefd218bbdd87717ff3c375381f725de08
Change-Id: I97c2e5aefd218bbdd87717ff3c375381f725de08
(cherry picked from commit 322e176f6a
2017-07-06 13:04:23 +08:00
Andreas Gampe
a10a7e7114
Libziparchive: Export headers in defaults
...
libziparchive-host needs to include the headers correctly, too.
Bug: 37342627
Test: mmma system/core/libziparchive
Change-Id: I88a6d38ff9e494273040f9b913c71bccdda117ad
2017-07-05 22:03:44 -07:00
Tom Cherry
71ed340d1e
Merge "init: add info logs in first stage mount if we have to poll" am: 6a9d56775f am: 11d5611ba5
...
am: 7b600f8012
2017-07-06 04:53:38 +00:00
Tom Cherry
7b600f8012
Merge "init: add info logs in first stage mount if we have to poll" am: 6a9d56775f
...
am: 11d5611ba5
2017-07-06 04:51:08 +00:00
Tom Cherry
11d5611ba5
Merge "init: add info logs in first stage mount if we have to poll"
...
am: 6a9d56775f
2017-07-06 04:48:38 +00:00
Treehugger Robot
6a9d56775f
Merge "init: add info logs in first stage mount if we have to poll"
2017-07-06 04:46:05 +00:00
Jinguang Dong
febf2ad9d7
Merge "fs_mgr: Adding logs when failing to wait for a device file" am: 4ca2a30368 am: 694985721f
...
am: 0ac18b28cd
2017-07-06 04:23:26 +00:00
Jinguang Dong
0ac18b28cd
Merge "fs_mgr: Adding logs when failing to wait for a device file" am: 4ca2a30368
...
am: 694985721f
2017-07-06 04:22:08 +00:00
Jinguang Dong
694985721f
Merge "fs_mgr: Adding logs when failing to wait for a device file"
...
am: 4ca2a30368
2017-07-06 04:20:55 +00:00
Treehugger Robot
4ca2a30368
Merge "fs_mgr: Adding logs when failing to wait for a device file"
2017-07-06 04:19:00 +00:00
Tom Cherry
a4050b871b
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master am: 3752ae8474
...
am: 177fec0899
2017-07-06 02:34:30 +00:00
Tom Cherry
f944ba812d
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a am: e944b7e0a4" into oc-dev-plus-aosp
...
am: 1a4bc908f2
2017-07-06 02:34:11 +00:00
Tom Cherry
7c4b63be8c
Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a am: e944b7e0a4
...
am: 1eee2122ca
2017-07-06 02:33:52 +00:00
Tom Cherry
177fec0899
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master
...
am: 3752ae8474
2017-07-06 02:23:20 +00:00
Android Build Merger (Role)
1a4bc908f2
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a am: e944b7e0a4" into oc-dev-plus-aosp
2017-07-06 02:21:45 +00:00
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
1eee2122ca
Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a
...
am: e944b7e0a4
2017-07-06 02:21:26 +00:00
Android Build Merger (Role)
3752ae8474
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master
2017-07-06 02:11:15 +00:00
Tom Cherry
1f30993247
Merge "ueventd: don't double fork firmware handlers"
...
am: 0f4fb5497a
2017-07-06 02:11:03 +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
Jinguang Dong
9d344969b0
fs_mgr: Adding logs when failing to wait for a device file
...
During mount operations, fs_mgr_wait_for_file() is invoked to
ensure the device file exists before starting to mount it. Adding
logs when the wait fails and also skip mounting as it won't be
successful. Also merge fs_mgr_test_access() and wait_for_file()
as fs_mgr_wait_for_file().
Test: Boot device and manually trigger the timeout issue
Test: Check and confirm whether timeout log info is inside ksmg.
Change-Id: Ide6d7fdca41e03e169e4400f91b7dea327985aaf
2017-07-06 09:51:02 +08:00
Android Build Merger (Role)
007000c37a
Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328 am: 19ec8e7bcf" into oc-dr1-dev-plus-aosp
2017-07-06 01:14:00 +00:00
Keun-young Park
23e3933a73
Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328" into oc-dev-plus-aosp
...
am: 61ce9b3bad
2017-07-06 01:13:49 +00:00
Keun-young Park
2f01fd0c42
Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328
...
am: 19ec8e7bcf
2017-07-06 01:13:38 +00:00
Keun-young Park
bedc5faea7
Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328
...
am: 19ec8e7bcf
2017-07-06 01:13:19 +00:00
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
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
