Tom Cherry
e0d1699487
Merge "init: add info logs in first stage mount if we have to poll" am: 6a9d56775f am: 11d5611ba5 am: 7b600f8012
...
am: 71ed340d1e
Change-Id: I722d6d71a9505d2b579a4bb9484221b73d71d50b
2017-07-06 04:55:40 +00:00
Tom Cherry
71ed340d1e
Merge "init: add info logs in first stage mount if we have to poll" am: 6a9d56775f am: 11d5611ba5
...
am: 7b600f8012
Change-Id: I4abc2b23c0b86059d44965b0139256f7617f48dd
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
Change-Id: Ib08ea62f6fb13cfaed6bc894bcbc548ccd8c3d55
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
Change-Id: I7948db4cf1d6af6f4e6d0ddb2a2788f62317126f
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
d974500314
Merge "fs_mgr: Adding logs when failing to wait for a device file" am: 4ca2a30368 am: 694985721f am: 0ac18b28cd
...
am: febf2ad9d7
Change-Id: I8070df926d9949583e84dca03e5dd8acc78c8968
2017-07-06 04:24:38 +00:00
Jinguang Dong
febf2ad9d7
Merge "fs_mgr: Adding logs when failing to wait for a device file" am: 4ca2a30368 am: 694985721f
...
am: 0ac18b28cd
Change-Id: I055425b0dfdbccbfa9c72e9bb1390ea483afdb9c
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
Change-Id: I86f7cf743e1e9f2466eb7675ebc1de61ae9ab3ec
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
Change-Id: I19ba38a596527a4544437d126c80123381b065b4
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
e985505dff
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master am: 3752ae8474 am: 177fec0899
...
am: a4050b871b
Change-Id: Id75d6cce73d407301035c1320aa32cac4ceb5708
2017-07-06 02:53:51 +00:00
Tom Cherry
0f40b8d7b0
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a am: e944b7e0a4" into oc-dev-plus-aosp am: 1a4bc908f2
...
am: f944ba812d
Change-Id: I3b30f9d838707ae9374a369e0517c2fff380f0e0
2017-07-06 02:53:31 +00:00
Tom Cherry
1b5db82fd9
Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a am: e944b7e0a4 am: 1eee2122ca
...
am: 7c4b63be8c
Change-Id: I39c17229dd4043da3ed5824b7a13b2d2e8cede4a
2017-07-06 02:53:11 +00:00
Tom Cherry
a4050b871b
Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master am: 3752ae8474
...
am: 177fec0899
Change-Id: I0d2e748e61dc7948861fa4c332e3d3647e14dee4
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
Change-Id: I7fa4cf045667d634434ddd06f558a4d98e43be18
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
Change-Id: I726a412b0b01c4f829847b8ebdef97be4df5abef
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
Change-Id: Id88c3f665131cafd5d7d3d8fc0159997d92130f0
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
Change-Id: I530a79b39eefddcf398932a90dfd0059bf8a096e
2017-07-06 02:21:34 +00:00
Tom Cherry
1eee2122ca
Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a
...
am: e944b7e0a4
Change-Id: Ifc8c586aa3b06ecb42bf20284c461b4b7c159bc7
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
Change-Id: I4a5957d18e3a934213170279f59b3ec8c0f85090
2017-07-06 02:11:03 +00:00
Tom Cherry
e944b7e0a4
Merge "ueventd: don't double fork firmware handlers"
...
am: 0f4fb5497a
Change-Id: I2a40b76e937853fd2f1eed61cc0fe4f6fa465ba2
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)
4684caca3b
Merge "Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328 am: 19ec8e7bcf" into oc-dr1-dev-plus-aosp am: 007000c37a"
2017-07-06 01:40:02 +00:00
Android Build Merger (Role)
9e6610865e
Merge "Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328 am: 19ec8e7bcf" into oc-dr1-dev-plus-aosp am: 007000c37a"
2017-07-06 01:39:56 +00:00
Keun-young Park
7413f15504
Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328 am: 19ec8e7bcf" into oc-dr1-dev-plus-aosp
...
am: 007000c37a
Change-Id: Ida69b0749446c37b55274d9c8f3d5baef423a09a
2017-07-06 01:39:26 +00:00
Keun-young Park
27132be614
Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328 am: 19ec8e7bcf" into oc-dr1-dev-plus-aosp
...
am: 007000c37a
Change-Id: I7385a4695301c8d8f7aaf583cd4efb2051470d36
2017-07-06 01:39:20 +00:00
Android Build Merger (Role)
dc67c055bd
Merge "Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328" into oc-dev-plus-aosp am: 61ce9b3bad am: 23e3933a73"
2017-07-06 01:39:17 +00:00
Android Build Merger (Role)
c97364527f
Merge "Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328" into oc-dev-plus-aosp am: 61ce9b3bad am: 23e3933a73"
2017-07-06 01:39:11 +00:00
Keun-young Park
8095c3213a
Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328" into oc-dev-plus-aosp am: 61ce9b3bad
...
am: 23e3933a73
Change-Id: I4aa14cc32230b5d9e087592b7e8502c693801dbf
2017-07-06 01:39:02 +00:00
Keun-young Park
611141f8eb
Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328" into oc-dev-plus-aosp am: 61ce9b3bad
...
am: 23e3933a73
Change-Id: I21d5820eb4b7380176ed94f02fb5a10a936007e6
2017-07-06 01:38:57 +00:00
Android Build Merger (Role)
fb73c050a7
Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328 am: 19ec8e7bcf am: bedc5faea7"
2017-07-06 01:38:55 +00:00
Android Build Merger (Role)
230486fb7a
Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328 am: 19ec8e7bcf am: bedc5faea7"
2017-07-06 01:38:50 +00:00
Keun-young Park
e96010852e
Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328 am: 19ec8e7bcf
...
am: bedc5faea7
Change-Id: I61d74d9d029d154234535b33494cf6e75a34c378
2017-07-06 01:38:20 +00:00
Keun-young Park
f5b616dabf
Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328 am: 19ec8e7bcf
...
am: bedc5faea7
Change-Id: I62cd1bc82531b88f5d8c8ac2dd637d5ec9d52572
2017-07-06 01:38:15 +00:00
Android Build Merger (Role)
fcf121796a
Merge "Merge "fs_mgr: allow no verity metadata when the device is unlocked." am: cd0c2d8962 am: 328b56585e am: 06c6bf67e9 am: 3f10ecabf8"
2017-07-06 01:38:13 +00:00
Bowgo Tsai
91e67a9b80
Merge "fs_mgr: allow no verity metadata when the device is unlocked." am: cd0c2d8962 am: 328b56585e am: 06c6bf67e9
...
am: 3f10ecabf8
Change-Id: Ia9ffaa9d2d33e135bbde5a395f2855b13897322e
2017-07-06 01:37:59 +00:00
Bowgo Tsai
e892b7cdef
Merge "fs_mgr: allow no verity metadata when the device is unlocked." am: cd0c2d8962 am: 328b56585e am: 06c6bf67e9
...
am: 3f10ecabf8
Change-Id: Id5317f717bf6d7a1e1be695b773b9abcad41ee56
2017-07-06 01:37:53 +00: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
Change-Id: Ib70ec4ba0b92814e4295b3875b6e88d994e3c788
2017-07-06 01:13:49 +00:00
Keun-young Park
2f01fd0c42
Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328
...
am: 19ec8e7bcf
Change-Id: I82d9a2dcacfac178d91fb57f00a51e2658bd6281
2017-07-06 01:13:38 +00:00
Keun-young Park
bedc5faea7
Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328
...
am: 19ec8e7bcf
Change-Id: Ide84d7f87a9884068ebc1cc9680c997507727af3
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
Change-Id: Id1f3d275fdeadca1b23a086725b3f63aedc5a141
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
Change-Id: Ib31dd492ab1dba53c6cdaf70e24c7c3a93f21c21
2017-07-06 00:56:58 +00:00
Keun-young Park
19ec8e7bcf
Merge "add "shutdown critical" to service" am: b3915d113d
...
am: a4ad5d0328
Change-Id: I6467657616371e84468975e56ac086855a298efb
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
Change-Id: Ib8602958bffa7061a11ca4450b3dfdaf462b63f6
2017-07-06 00:56:00 +00:00
Keun-young Park
a4ad5d0328
Merge "add "shutdown critical" to service"
...
am: b3915d113d
Change-Id: I25b6f42478efda7077e00141042a427245393d28
2017-07-06 00:46:31 +00:00