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
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
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
Tom Cherry
536766da6b
Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b
...
am: bef2bbdf62
2017-07-05 23:38:01 +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
Android Build Merger (Role)
3dcfd2e6ad
Merge "Merge "init: reap zombies only after kill(-pid, ...)" am: a51c40ce35 am: 0924b32c1f am: 419a9ef8f1" into oc-dr1-dev-plus-aosp
2017-07-05 23:37:54 +00:00
