Wei Wang
587d37636b
Merge "libcutils: remove sched_set/getscheduler" am: e0bec6b11e
...
am: 446cfa74ef
2017-03-28 22:43:24 +00:00
Wei Wang
446cfa74ef
Merge "libcutils: remove sched_set/getscheduler"
...
am: e0bec6b11e
2017-03-28 22:39:56 +00:00
Treehugger Robot
e0bec6b11e
Merge "libcutils: remove sched_set/getscheduler"
2017-03-28 22:32:29 +00:00
Christopher Ferris
6d42bf740b
Merge "Only allow short functions in class definitions." am: e3b27d22bf
...
am: 8726529e3e
2017-03-28 21:39:46 +00:00
Christopher Ferris
8726529e3e
Merge "Only allow short functions in class definitions."
...
am: e3b27d22bf
2017-03-28 21:34:47 +00:00
Christopher Ferris
e3b27d22bf
Merge "Only allow short functions in class definitions."
2017-03-28 21:20:17 +00:00
Tom Cherry
68a91fb95b
Merge "Fix timeouts for android::base::WaitForProperty*" am: 57d78354d6
...
am: f30abecf3c
2017-03-28 20:48:52 +00:00
Tom Cherry
f30abecf3c
Merge "Fix timeouts for android::base::WaitForProperty*"
...
am: 57d78354d6
2017-03-28 20:43:50 +00:00
Tom Cherry
57d78354d6
Merge "Fix timeouts for android::base::WaitForProperty*"
2017-03-28 20:38:24 +00:00
Wei Wang
a8d59faa75
libcutils: remove sched_set/getscheduler
...
Bug: 36667354
Test: angler taking video
Change-Id: Ie7fbcccbd02314468c03317319574ee7e433561d
2017-03-28 13:01:20 -07:00
Christopher Ferris
a11c814d3d
Only allow short functions in class definitions.
...
The previous rules would force short functions to be on a single line.
This change only allows single function lines in class definitions.
Test: Ran on a CL and verified single line functions only allowed in
Test: class defintions.
Change-Id: I5422543fdbb39da842bbd799c19fe2c443ff483c
2017-03-28 12:31:37 -07:00
Mark Salyzyn
a31d895910
Merge "libcutils: handle root directory empty path" am: 6105dbd01b
...
am: 621ae033a4
2017-03-28 17:23:24 +00:00
Mark Salyzyn
621ae033a4
Merge "libcutils: handle root directory empty path"
...
am: 6105dbd01b
2017-03-28 17:19:16 +00:00
Mark Salyzyn
6105dbd01b
Merge "libcutils: handle root directory empty path"
2017-03-28 17:09:15 +00:00
Bowgo Tsai
73d9e8e938
Merge "fs_mgr: change the log level in fs_mgr_get_boot_config()" am: c8c3e61eeb
...
am: c30261f266
2017-03-28 15:53:47 +00:00
Bowgo Tsai
c30261f266
Merge "fs_mgr: change the log level in fs_mgr_get_boot_config()"
...
am: c8c3e61eeb
2017-03-28 15:49:18 +00:00
Treehugger Robot
c8c3e61eeb
Merge "fs_mgr: change the log level in fs_mgr_get_boot_config()"
2017-03-28 15:43:56 +00:00
Mark Salyzyn
657ae57bf3
Merge "logd: strip out empty trailing iovec" am: 6b11faeb42
...
am: d749a054ff
2017-03-28 15:12:44 +00:00
Mark Salyzyn
d749a054ff
Merge "logd: strip out empty trailing iovec"
...
am: 6b11faeb42
2017-03-28 15:08:15 +00:00
Mark Salyzyn
6b11faeb42
Merge "logd: strip out empty trailing iovec"
2017-03-28 15:00:38 +00:00
Jeremy Compostella
3d642d48e2
libcutils: handle root directory empty path
...
Usually, the canned paths lack the leading '/' which means that the
root directory is an empty path. This patch makes
load_canned_fs_config() handle this empty path as the root directory.
It also make it flexible enough to handle an optional leading '/'.
Original-Author: Jeremy Compostella <jeremy.compostella@intel.com>
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
Change-Id: Ice759ef37d1df23a54df1158ec0d3ad7f577a069
2017-03-28 14:57:22 +00:00
Bowgo Tsai
0f34094a17
fs_mgr: change the log level in fs_mgr_get_boot_config()
...
fs_mgr might try to get a non-existing config through fs_mgr_get_boot_config()
on a device (e.g., for backward compatibility). Lower the log level to INFO
so it won't appear on the recovery screen.
Bug: 35811655
Test: recovery boot sailfish
Change-Id: I81497259aff3691740170abeef932d363b52be35
2017-03-28 18:52:04 +08:00
Steven Moreland
0bd29405c0
Merge "init: add class_restart" am: 8678872a00
...
am: ee7137208e
2017-03-28 04:32:10 +00:00
Steven Moreland
ee7137208e
Merge "init: add class_restart"
...
am: 8678872a00
2017-03-28 04:27:40 +00:00
Treehugger Robot
8678872a00
Merge "init: add class_restart"
2017-03-28 04:22:47 +00:00
Josh Gao
47df3d4c66
Merge "debuggerd_client: properly wait for completion." am: 372d8a2931
...
am: 6340d91308
2017-03-28 03:29:36 +00:00
Josh Gao
6340d91308
Merge "debuggerd_client: properly wait for completion."
...
am: 372d8a2931
2017-03-28 03:24:35 +00:00
Treehugger Robot
372d8a2931
Merge "debuggerd_client: properly wait for completion."
2017-03-28 03:21:39 +00:00
Tom Cherry
856441d07f
Merge "init: remove superfluous forward definitions" am: deb23ba2c1
...
am: 256c8f5076
2017-03-28 02:35:59 +00:00
Tom Cherry
256c8f5076
Merge "init: remove superfluous forward definitions"
...
am: deb23ba2c1
2017-03-28 02:32:10 +00:00
Treehugger Robot
deb23ba2c1
Merge "init: remove superfluous forward definitions"
2017-03-28 02:22:51 +00:00
Tom Cherry
b64b91ccaa
Merge "init: Fix README.md for writepid" am: 88d6b4af16
...
am: dc597affcc
2017-03-28 01:17:57 +00:00
Tom Cherry
dc597affcc
Merge "init: Fix README.md for writepid"
...
am: 88d6b4af16
2017-03-28 01:13:57 +00:00
Treehugger Robot
88d6b4af16
Merge "init: Fix README.md for writepid"
2017-03-28 01:07:50 +00:00
Tom Cherry
3d5729402e
Fix timeouts for android::base::WaitForProperty*
...
std::chrono doesn't handle integer overflow, so using
std::chrono::milliseconds::max() to indicate an infinite timeout is
not handled well in the current code. It causes an 'absolute_timeout'
earlier in time than 'now' and causes the associated WaitForProperty*
functions to return immediately.
Also, any duration_cast from relative_timeout to nanoseconds would
cause the same issue, as it would overflow in the conversion and
result in an invalid results.
This change prevents any duration_casts of relative_timeout to
nanoseconds and replaces the logic to wait on an absolute timeout with
logic that compares the time elapsed to the provided relative timeout.
This change also includes a test that std::chrono::milliseconds::max()
does not return immediately and that negative values do return immediately.
Test: Boot bullhead + libbase_test
Change-Id: I335bfa7ba71e86c20119a0ed46014cad44361162
2017-03-27 18:05:58 -07:00
Tom Cherry
46b6c43b7c
init: remove superfluous forward definitions
...
Test: Boot bullhead
Change-Id: I4a005616a825529bc2ad1b413e51b501f6407cbd
2017-03-27 17:55:37 -07:00
Wei Wang
4640918495
Merge "init: add support of multiple class names" am: 3c1568aa13
...
am: fd450bb95a
2017-03-28 00:51:25 +00:00
Wei Wang
fd450bb95a
Merge "init: add support of multiple class names"
...
am: 3c1568aa13
2017-03-28 00:47:55 +00:00
Bowgo Tsai
f6b7adb464
Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition" am: ea057b46e0
...
am: 75ada5fce3
2017-03-28 00:39:24 +00:00
Treehugger Robot
3c1568aa13
Merge "init: add support of multiple class names"
2017-03-28 00:39:09 +00:00
Bowgo Tsai
75ada5fce3
Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition"
...
am: ea057b46e0
2017-03-28 00:35:57 +00:00
Treehugger Robot
ea057b46e0
Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition"
2017-03-28 00:28:33 +00:00
Wei Wang
eb6d588cd6
Merge "libcutils: remove schedgroup" am: 3d8911fbbe
...
am: c0fc8e7b7b
2017-03-28 00:24:53 +00:00
Wei Wang
c0fc8e7b7b
Merge "libcutils: remove schedgroup"
...
am: 3d8911fbbe
2017-03-28 00:21:53 +00:00
Treehugger Robot
3d8911fbbe
Merge "libcutils: remove schedgroup"
2017-03-28 00:15:46 +00:00
Josh Gao
ae9d7676a5
debuggerd_client: properly wait for completion.
...
Use an intermediate pipe to detect and report when a requested dump has
completed.
Bug: http://b/35241370
Bug: http://b/35813071
Test: debuggerd_test
Test: manually triggered a background ANR
Change-Id: If14aedf6071288360f1a7853d5a2ee79db121759
2017-03-27 16:11:38 -07:00
Mark Salyzyn
c974c79c8c
Merge "logcat: test: run 256 simultaneous logcats" am: b15429c0ea
...
am: 232b57c60b
2017-03-27 22:54:33 +00:00
Mark Salyzyn
232b57c60b
Merge "logcat: test: run 256 simultaneous logcats"
...
am: b15429c0ea
2017-03-27 22:51:36 +00:00
Mark Salyzyn
479c8c2e42
logd: strip out empty trailing iovec
...
If the last buffer has zero length, strip it out of the iovec
issued to SocketClient::sendDatav().
Test: gTest liblog-unit-tests, logd-unit-tests, logcat-unit-tests
Bug: 36497967
Change-Id: I8fc585bbec63402d0e818ff4c620fdd7edcc38dc
2017-03-27 15:49:24 -07:00
Mark Salyzyn
b15429c0ea
Merge "logcat: test: run 256 simultaneous logcats"
2017-03-27 22:46:03 +00:00
