Wei Wang
a9ef1aa581
Merge "init: don't wait if we have more work to do" am: 32ee9fc24a am: c746ecbcbe am: df47019a30
...
am: a88839684a
2016-12-01 04:08:51 +00:00
Wei Wang
c746ecbcbe
Merge "init: don't wait if we have more work to do"
...
am: 32ee9fc24a
2016-12-01 03:51:19 +00:00
Wei Wang
16db4346a2
init: don't wait if we have more work to do
...
Bug: 33212253
Test: On marlin
Change-Id: I8502eaa73fac6953d358af01482760b3249cfd67
2016-11-30 18:09:29 -08:00
Elliott Hughes
2291d14baf
Merge "init: Fix sync issue on property trigger." am: 80d2f01fbf am: 65016074c2 am: b94063edbf
...
am: 15c25fbed4
2016-11-30 18:10:12 +00:00
Elliott Hughes
65016074c2
Merge "init: Fix sync issue on property trigger."
...
am: 80d2f01fbf
2016-11-30 17:54:31 +00:00
caozhiyuan
b104c502e1
init: Fix sync issue on property trigger.
...
This issue reproduces in the following senario.
1. ("", "") is added to queue;
2. property_triggers_enabled is set to 1;
3. user defined property is triggered, like sys.usb.config=adb;
4. ("sys.usb.config", "adb") is added to queue;
5. main loop interpret ("", "") and queue all current triggers to execution,
so ("sys.usb.config", "adb") is queued for execution for the first time.
6. main loop interpret ("sys.usb.config", "adb"), it is queued for
execution for a second time.
The second time makes ASIT fail.
Bug: http://b/28218187
Change-Id: I230e175e0dca8989f1e5bd812398da90082d0ec1
Signed-off-by: caozhiyuan <cao.zhiyuan@zte.com.cn>
2016-11-29 20:19:17 +00:00
Elliott Hughes
061c1204da
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE"" am: a10bd47d60 am: c509c36892 am: 83b8df0e8c
...
am: e12635cc34
2016-11-29 18:28:44 +00:00
Elliott Hughes
c509c36892
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE""
...
am: a10bd47d60
2016-11-29 18:14:19 +00:00
Billy Lau
f9ade03693
Merge "init: Reworked how we wait for COLDBOOT_DONE" am: 57c31d0f17 am: 6be1d976f6 am: 93d6a6fada
...
am: d885cfbef1
2016-11-29 16:51:38 +00:00
Billy Lau
6be1d976f6
Merge "init: Reworked how we wait for COLDBOOT_DONE"
...
am: 57c31d0f17
2016-11-29 16:36:37 +00:00
Elliott Hughes
a452660d92
Revert "init: Reworked how we wait for COLDBOOT_DONE"
...
This reverts commit d36115ef2f
2016-11-29 16:34:56 +00:00
Billy Lau
d36115ef2f
init: Reworked how we wait for COLDBOOT_DONE
...
Bug: 31800756
Instead of strictly timing out after 1s waiting for COLDBOOT_DONE,
we wait for a considerably longer period of time, which would also
allow slower non-production heavily instrumented debug builds to
boot up.
Upon successful wait, we measure the time taken and record the
value into a system property: ro.cold_boot.duration.
If timeout is still reached, we log an error message and abandon
boot process, rebooting into recovery mode instead.
Change-Id: Ic1df80546d8721b0e8c998ff294d5c5102de4e98
2016-11-22 21:25:02 +00:00
Evgenii Stepanov
2c29ee3278
Merge "Revert "Revert "init: create /dev/urandom, /dev/random in first stage.""" am: b6552f376c am: 4b1a329309 am: 6b74f73df3
...
am: b047f46cdc
2016-11-19 01:03:15 +00:00
Evgenii Stepanov
4b1a329309
Merge "Revert "Revert "init: create /dev/urandom, /dev/random in first stage."""
...
am: b6552f376c
2016-11-19 00:51:33 +00:00
Evgenii Stepanov
102daa30a3
Revert "Revert "init: create /dev/urandom, /dev/random in first stage.""
...
This reverts commit 4c8a76e250
2016-11-18 15:09:18 -08:00
Wei Wang
22992ea708
Merge "init: move empty string check to InitTriggers" am: 9bf10ff61e am: 5514c50292 am: 934f465edb
...
am: 4c3de75a28
2016-11-17 19:54:55 +00:00
Wei Wang
5514c50292
Merge "init: move empty string check to InitTriggers"
...
am: 9bf10ff61e
2016-11-17 19:32:19 +00:00
Wei Wang
9bf10ff61e
Merge "init: move empty string check to InitTriggers"
2016-11-17 19:21:47 +00:00
Paul Lawrence
0705fcb2f4
Merge "Add flags to restorecon_recursive to traverse filesystems" am: 5fbd1cfd34 am: ffa3689107 am: a99490c813
...
am: e799e3317a
2016-11-17 18:30:22 +00:00
Paul Lawrence
ffa3689107
Merge "Add flags to restorecon_recursive to traverse filesystems"
...
am: 5fbd1cfd34
2016-11-17 17:55:06 +00:00
Treehugger Robot
5fbd1cfd34
Merge "Add flags to restorecon_recursive to traverse filesystems"
2016-11-17 17:39:53 +00:00
Mark Salyzyn
95dbf68245
Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" am: 8c41e791ed am: 809dee506e am: 26545e3c60
...
am: 124b7cb732
2016-11-17 16:02:50 +00:00
Mark Salyzyn
809dee506e
Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h"
...
am: 8c41e791ed
2016-11-17 15:33:02 +00:00
Mark Salyzyn
8c41e791ed
Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h"
2016-11-17 15:22:14 +00:00
Wei Wang
93df4e18a2
init: move empty string check to InitTriggers
...
Test: mma
Bug: 32838381
Change-Id: I69203734ef7d3640da75f3e3cbe9254bf468d916
2016-11-16 22:24:43 -08:00
Wei Wang
171a7d6d20
init: fix undefined behavior in ExecuteCommand am: d67a4abc64 am: 279f3d593f am: 737d0f5265
...
am: 86e7b8c3c8
2016-11-17 04:26:46 +00:00
Wei Wang
e389b08ff1
Revert "Revert "init: warn slow action"" am: 8b1d526a72 am: 3567c7c9d9 am: 67396253f2
...
am: 68a66a3e31
2016-11-17 04:26:36 +00:00
Wei Wang
279f3d593f
init: fix undefined behavior in ExecuteCommand
...
am: d67a4abc64
2016-11-17 03:54:57 +00:00
Wei Wang
3567c7c9d9
Revert "Revert "init: warn slow action""
...
am: 8b1d526a72
2016-11-17 03:54:51 +00:00
Wei Wang
2369b1eb80
Merge changes from topic 'slow_log'
...
* changes:
init: fix undefined behavior in ExecuteCommand
Revert "Revert "init: warn slow action""
2016-11-17 03:46:44 +00:00
Mark Salyzyn
52bd37e633
libcutils: move cutils/files.h to cutils/android_get_control_file.h
...
files.[h|cpp] is bound to be abused with junk, replace with
android_get_control_file.[h|cpp]. Plus some sundry cleanup.
Test: gTest libcutils-tests, logd-unit-tests, liblog-unit-tests,
logcat-unit-tests and init_tests
Bug: 32450474
Change-Id: Ibd4a7aa4624ea19a43d1f98a3c71ac37805d36b5
2016-11-16 15:56:56 -08:00
Wei Wang
d67a4abc64
init: fix undefined behavior in ExecuteCommand
...
ExecuteCommand may change command_ vector which leads undefined behavior
This bug is found when adding logs in ExecuteCommand printing our Command class fields
Bug: 32838381
Test: on emulator
Change-Id: I96468bd2192ca80013871a3a6ac4132149363fff
2016-11-16 15:46:19 -08:00
Paul Lawrence
a8d8434c42
Add flags to restorecon_recursive to traverse filesystems
...
Use to solve the problem of tracefs conditionally being mounted
under debugfs and needing restorecon'd without boot performance
penalty.
Also move skip-ce to a flag for consistency.
Test: Check that trace_mount has correct attributes after boot
Bug: 32849675
Change-Id: Ib6731f502b6afc393ea5ada96fa95b339f14da49
2016-11-16 22:27:45 +00:00
Jeff Sharkey
d1d3bdd16f
Only restorecon CE storage after unlocked.
...
On FBE devices, the filenames inside credential-encrypted directories
are mangled until the key is installed. This means the initial
restorecon at boot needs to skip these directories until the keys
are installed.
This CL changes the implementation of the "restorecon_recursive"
built-in command to use the new SKIPCE flag to avoid labeling files
in CE directories. vold will request a restorecon when the keys
are actually installed.
(cherrypicked from commit 1635afe83d
2016-11-16 21:19:17 +00:00
Wei Wang
8b1d526a72
Revert "Revert "init: warn slow action""
...
This reverts commit 1802d11cc7
2016-11-15 23:58:55 -08:00
Ting-Yuan Huang
2f777bf732
Merge "init: fix memory leaks" am: a73ba879b1 am: 1700a162d5 am: fde3b5b95a
...
am: ec111ad6c1
2016-11-16 03:54:43 +00:00
Ting-Yuan Huang
1700a162d5
Merge "init: fix memory leaks"
...
am: a73ba879b1
2016-11-16 03:32:40 +00:00
Treehugger Robot
a73ba879b1
Merge "init: fix memory leaks"
2016-11-16 03:25:34 +00:00
Ting-Yuan Huang
09bd41d097
init: fix memory leaks
...
It's possible that node is not freed before return.
Test: make WITH_TIDY=1 mmma system/core/init
Change-Id: I648eea9dda006d2b2239e169785190817ad31352
2016-11-15 16:55:50 -08:00
Elliott Hughes
e6f9b7c821
Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for." am: f3e731b3c5 am: 3ee9807554 am: 74c997ffda
...
am: 06d14cd839
2016-11-15 18:32:48 +00:00
Elliott Hughes
3ee9807554
Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for."
...
am: f3e731b3c5
2016-11-15 18:09:46 +00:00
Elliott Hughes
f3e731b3c5
Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for."
2016-11-15 18:02:30 +00:00
Wei Wang
78331a6b2e
Merge "init: fix BuildTriggersString for empty string" am: 9b1d5e15ef am: 4286801ccb am: 8256062afc
...
am: db738953f4
2016-11-15 17:54:58 +00:00
Wei Wang
4286801ccb
Merge "init: fix BuildTriggersString for empty string"
...
am: 9b1d5e15ef
2016-11-15 17:32:13 +00:00
Treehugger Robot
9b1d5e15ef
Merge "init: fix BuildTriggersString for empty string"
2016-11-15 17:23:56 +00:00
Nick Desaulniers
146b1b2115
Merge "Revert "init: warn slow action"" am: 431c489568 am: ea516950fb am: 6133e64575
...
am: d7a92fd874
2016-11-15 07:28:12 +00:00
Nick Desaulniers
ea516950fb
Merge "Revert "init: warn slow action""
...
am: 431c489568
2016-11-15 07:05:12 +00:00
Treehugger Robot
431c489568
Merge "Revert "init: warn slow action""
2016-11-15 06:58:53 +00:00
Wei Wang
69b9b36c11
init: fix BuildTriggersString for empty string
...
behavior is undefined if pop_back() on empty std::string
Test: grep init log
Bug: 32712851
Bug: 32838381
Change-Id: I5bfac2fb275036abd0158b78df14019d2e82716d
2016-11-14 20:20:48 -08:00
Elliott Hughes
290a228fdc
Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for.
...
Bug: http://b/32878766
Test: boots
Change-Id: Ie0ddfb7e60f2da5f6eefbb10c83a92e88c137ae3
2016-11-14 17:08:47 -08:00
