Commit graph

29017 commits

Author SHA1 Message Date
Steven Moreland
e326cb121e Merge "Revert "Revert "Start hwservicemanager earlier."""
am: ca622b4e78

Change-Id: I6d08f24f108f84130c059f2515219ebcdbc82b18
2017-03-27 17:31:05 +00:00
Treehugger Robot
ca622b4e78 Merge "Revert "Revert "Start hwservicemanager earlier.""" 2017-03-27 17:28:38 +00:00
Bowgo Tsai
eb0a5e7e26 Merge "fs_mgr_avb: fix return value check of fs_mgr_get_boot_config()"
am: 51da2aaa36

Change-Id: Icf84ec85fe8e6c32238433a1e9ffec202ccb5a75
2017-03-27 17:14:25 +00:00
Treehugger Robot
51da2aaa36 Merge "fs_mgr_avb: fix return value check of fs_mgr_get_boot_config()" 2017-03-27 17:08:33 +00:00
Bowgo Tsai
97db0809f4 fs_mgr_avb: fix return value check of fs_mgr_get_boot_config()
fs_mgr_get_boot_config() returns true/false but the return value check
in current fs_mgr_avb is for 0/1. This was introduced during a refactoring.

Check true/false for the return value.

Bug: 33254008
Test: manual test AVB on bullhead
Change-Id: I72c366627214df4a99c4d9cf1eb577e94f7afb31
2017-03-27 22:33:21 +08:00
Dimitry Ivanov
e6f9497cca Merge "Add ld.config.txt to /system/etc"
am: d444f8663d

Change-Id: I47a9dc4f028582575fb9da0c5a87103ed22c7945
2017-03-25 05:21:23 +00:00
Treehugger Robot
d444f8663d Merge "Add ld.config.txt to /system/etc" 2017-03-25 05:17:33 +00:00
Steven Moreland
d627502bb0 Revert "Revert "Start hwservicemanager earlier.""
This reverts commit 5011270225.

Now starting even earlier.

Reason for revert: Needed change, reverted b/c broken device.

Bug: 36278706
Test: original DOA device boots
Test: angler, bullhead, fugu, marlin, ryu
Test: all these devices boot with wipe
Test: all these devices boot with w/o wipe
Test: lshal shows all included services

Change-Id: Ic639aedf7834b1bd3a26d23d109727f5559317e9
2017-03-24 20:52:44 -07:00
Elliott Hughes
f62f611e01 Merge ""Requested dump for tid XXX" message shouldn't be fatal."
am: f5d727f221

Change-Id: Icd3b5afb31360b16cd688ccf0a45d9d6e2e7e693
2017-03-24 23:33:31 +00:00
Fernando Lugo
64bf462eb9 Merge "fs_mgr: update to new androidboot.slot param"
am: 0fc8a4b363

Change-Id: Idf923e6f6766eee6448cc57c3165930ad7fcb510
2017-03-24 23:33:18 +00:00
Elliott Hughes
f5d727f221 Merge ""Requested dump for tid XXX" message shouldn't be fatal." 2017-03-24 23:29:23 +00:00
Fernando Lugo
0fc8a4b363 Merge "fs_mgr: update to new androidboot.slot param" 2017-03-24 23:29:19 +00:00
Fernando Lugo
9c7ae587c2 fs_mgr: update to new androidboot.slot param
androidboot.slot_suffix is being deprecated for a androidboot.slot.
Bootloader must pass slot used to boot into the androidboot.slot which
does not include the '_' character

Test: boot android
Bug: 36533366
Change-Id: I6137bd08418f67a88120c8609eda10b2ada4607d
Signed-off-by: Fernando Lugo <flugo@google.com>
2017-03-24 23:28:55 +00:00
Josh Gao
36699d3fb2 Merge "adb: allow symlinks to directories in directory_exists."
am: c10c31e8ba

Change-Id: I9480b98081f9db54955da19a4565c9a458781cdb
2017-03-24 18:43:23 +00:00
Josh Gao
c10c31e8ba Merge "adb: allow symlinks to directories in directory_exists." 2017-03-24 18:37:36 +00:00
Christopher Ferris
37cc8984d0 Merge "Test unwinding through a signal handler."
am: d13099e66c

Change-Id: I2ff5b1dd1b15c02f50a2cb83eaf509b5f9fc4448
2017-03-24 17:26:54 +00:00
Christopher Ferris
d13099e66c Merge "Test unwinding through a signal handler." 2017-03-24 17:22:25 +00:00
Thierry Strudel
263cf5c8d9 Merge "Revert "Start hwservicemanager earlier.""
am: 3ba313597d

Change-Id: I6dcce7348c299514573a532f44eaa86b72763613
2017-03-24 14:37:37 +00:00
Thierry Strudel
3ba313597d Merge "Revert "Start hwservicemanager earlier."" 2017-03-24 14:33:18 +00:00
Lorenzo Colitti
82cf4caaaa Merge "Make the xtables lock readable only by AID_RADIO and root."
am: 438720ac2c

Change-Id: I81d8a81465715a63e4442568deaa5bac5d4f7c56
2017-03-24 06:30:56 +00:00
Lorenzo Colitti
438720ac2c Merge "Make the xtables lock readable only by AID_RADIO and root." 2017-03-24 06:25:38 +00:00
Steven Moreland
5011270225 Revert "Start hwservicemanager earlier."
This reverts commit 9e36331174.

Reason for revert: a DOA device

Bug: 36546734

Change-Id: I0456247d362fe43b8c37623d04432eb494f68f68
2017-03-24 06:05:41 +00:00
Elliott Hughes
561da6aa82 "Requested dump for tid XXX" message shouldn't be fatal.
This just means we were asked to dump, not that something necessarily went
wrong.

Bug: http://b/36191903
Test: builds
Change-Id: I5638b38f3a13081b1e971512f43238010febb59c
2017-03-23 23:04:27 -07:00
Keun-young Park
b0416c3dfc Merge "add kill all for shutdown_timeout of 0"
am: dd26e1a28c

Change-Id: Icea19092ec3743f045cb650d2810cc635bb58908
2017-03-24 05:21:05 +00:00
Treehugger Robot
dd26e1a28c Merge "add kill all for shutdown_timeout of 0" 2017-03-24 05:15:20 +00:00
Brian Carlstrom
e3c1d61a89 Merge "Fix spelling error in warning"
am: 79e0fb87eb

Change-Id: I0f4dabb3c2523bc0780cc2b5810272e19d115cbe
2017-03-24 04:54:04 +00:00
Treehugger Robot
79e0fb87eb Merge "Fix spelling error in warning" 2017-03-24 04:51:09 +00:00
Yongqin Liu
d0e63f4718 Merge "init: use read_file and write_file to implement do_copy builtin"
am: 7f0d15a6f2

Change-Id: Iab65e493213fb8e132afcaa990ea7304fded9d6a
2017-03-24 02:31:44 +00:00
Treehugger Robot
7f0d15a6f2 Merge "init: use read_file and write_file to implement do_copy builtin" 2017-03-24 02:26:14 +00:00
Tom Cherry
0da0d9e79b Merge "init: Prevent spin loop while waiting for exec or property"
am: c1ca1a8328

Change-Id: I591ac447da8d1a6f5db9e2aa48e30c80e0c5e631
2017-03-24 01:56:23 +00:00
Tom Cherry
4f117206a8 Merge "init: Remove superfluous error check"
am: 186edb1aef

Change-Id: Ia073b90dbe7ffd2443cf4d4fd183adb2223115c3
2017-03-24 01:54:38 +00:00
Keun-young Park
c13d89246d Merge "add clear log for reboot start / end"
am: 6e6eb48e71

Change-Id: I8c698e4ed808f8b5de5cd2e090af3b7b72623732
2017-03-24 01:54:25 +00:00
Treehugger Robot
c1ca1a8328 Merge "init: Prevent spin loop while waiting for exec or property" 2017-03-24 01:52:37 +00:00
Treehugger Robot
186edb1aef Merge "init: Remove superfluous error check" 2017-03-24 01:51:31 +00:00
Treehugger Robot
6e6eb48e71 Merge "add clear log for reboot start / end" 2017-03-24 01:50:57 +00:00
Keun-young Park
aa08ea458a add kill all for shutdown_timeout of 0
- If it is explicitly set to 0, active processes can block
  umount completely. Safe to kill all processes and umount.
- also add additional sync after emulated partition umount
  as that can change /data partition files

bug: 36004738
Test: many reboots

Change-Id: I6c9b07b6fdece44b9caec4e45ecf26a20d0eb96e
2017-03-23 18:01:24 -07:00
Yongqin Liu
82bac0de6d init: use read_file and write_file to implement do_copy builtin
this will make the implementation more cleaner,
and has error message output when failed on some operations

also add the O_TRUNC flag explicitly for the open function
called in write_file.

And add more test on read_file and write_file functions

Test: manual with hikey

Change-Id: Ifc1086a20e85db6980b497b1150a8a7952e672d6
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2017-03-24 08:34:25 +08:00
Tom Cherry
77ddcd5a3f init: Prevent spin loop while waiting for exec or property
Currently, when we are waiting for an exec service or a property, if
there are either any services to be restarted or any more commands to
be run, we set the epoll_timeout to handle these events.  However, we
don't actually restart and processes or execute any commands while
waiting, so this essentially turns this waiting into a spin loop,
particularly in the common case of having more commands to execute,
where epoll_timeout is set to 0.

The change only sets epoll_timeout if we're not waiting.

Note that the only way to stop waiting for an exec service or a
property is for a signal or property to be delivered to init, which
happens through the epoll fds, so it's safe to indefinitely wait for
epoll to return.

Test: Boot bullhead
Change-Id: Iae3b217eb28182038b464fd39df8e7d27b5e23ff
2017-03-23 17:17:54 -07:00
Keun-young Park
3cd8c6f912 add clear log for reboot start / end
- hard to tell if reboot itself is problem or not.

bug: 36004738
Test: reboot and check last kmsg
Change-Id: I0de0e10eac9ac336cc352ddee22a4a1d9e46cb79
2017-03-23 16:55:24 -07:00
Tom Cherry
9bdddd713a init: Remove superfluous error check
new doesn't return nullptr in C++, so there is no need to check for
it.

Test: Boot bullhead
Change-Id: I666afb1ba7082dd8d5b9911605b7e20a5561b49e
2017-03-23 16:44:42 -07:00
Mikhail Lappo
13d779d6b0 Merge "Possible null pointer miss on realloc"
am: 9bbbaf1480

Change-Id: I8dba5053954efd4374aecce98771b3348ffd073b
2017-03-23 23:31:42 +00:00
Treehugger Robot
9bbbaf1480 Merge "Possible null pointer miss on realloc" 2017-03-23 23:26:40 +00:00
Josh Gao
ff468dce4c adb: allow symlinks to directories in directory_exists.
Bug: http://b/36516955
Test: python test_device.py
Change-Id: Ie81e87aac3b157182bde0955bdba23d48bfea873
2017-03-23 16:19:55 -07:00
Christopher Ferris
5ea2c1f20a Test unwinding through a signal handler.
Also make backtrace_testlib.c C++.

Bug: 34468756
Test: Ran new unit test on host x86, host x86_64, angler (32 bit, 64 bit),
Test: fugu.
Change-Id: Ia810f596c2df56cd56e8ab17e6c19be0c48d737f
2017-03-23 16:16:02 -07:00
Mikhail Lappo
26464914fe Possible null pointer miss on realloc
Realloc can return null pointer which
will cause a crash then. Patch introduces
check for controlled 'die' in case memory is
not available

Change-Id: I279028339b1fe756d8a511834e164e59d4cab110
2017-03-23 22:41:14 +01:00
Elliott Hughes
0cb8c69bf2 Merge "Switch "adb sideload" over to lseek/read."
am: c0ca39c41a

Change-Id: Ia50ff02ed1e11f6bac3d5ef2e5d09c03fa6f216c
2017-03-23 21:21:34 +00:00
Elliott Hughes
c0ca39c41a Merge "Switch "adb sideload" over to lseek/read." 2017-03-23 21:06:51 +00:00
Adam Lesinski
7cfe1d69b0 Merge "libziparchive: fix mac os breakage"
am: 390f3b364c

Change-Id: Ib7e882634636f74092487766f4abc8d969b0468a
2017-03-23 21:05:03 +00:00
Treehugger Robot
390f3b364c Merge "libziparchive: fix mac os breakage" 2017-03-23 20:58:58 +00:00
Mark Salyzyn
e1d2e3436e Merge "libcutils: fs_config() add check /odm/etc/fs_config_*"
am: 1e62880f70

Change-Id: Iad391f827bcb33cc03cb6fb8f602c48f1102d431
2017-03-23 19:59:45 +00:00