Commit graph

29192 commits

Author SHA1 Message Date
Treehugger Robot
b15882faab Merge "logd: cap out-of-order entry search" 2017-04-04 19:41:52 +00:00
Treehugger Robot
4b8087aeb2 Merge "adb: don't reset usb when connecting it." 2017-04-04 19:29:09 +00:00
Mark Salyzyn
832f6c704a Merge "libcutils: create private/fs_config.h" 2017-04-04 19:15:09 +00:00
Mark Salyzyn
a9403f0db8 libcutils: create private/fs_config.h
private/fs_config.h is required in order to build an independent
test that requires internal binary knowledge of the
etc/fs_config_(files|dirs) files.

Test: compile
Bug: 36071012
Change-Id: I268bcfdbb6d45b7bf6040cbf307a4e34812f5fef
2017-04-04 19:14:32 +00:00
Mark Salyzyn
0f92fdc5d6 logd: cap out-of-order entry search
Reduce the period we are willing to look back at for out-of-order
entries.  Cap the number of iterations we are willing to look back
for out-of-order entries to 300.

Test: gTest liblog-unit-tests, logd-unit-tests and logcat-unit-tests
Bug: 36875387
Bug: 36874561
Bug: 36861142
Change-Id: Icee289dfc0a37ccab9912dc8ab40a10ef3967b7a
2017-04-04 11:03:26 -07:00
Christopher Ferris
69b4dfe13e Merge "Add overflow checks in Memory objects."
am: 856bccbdc3

Change-Id: Id9e9c65c724d1ce75cc3cefed06d14f5785d2259
2017-04-04 17:37:15 +00:00
Christopher Ferris
856bccbdc3 Merge "Add overflow checks in Memory objects." 2017-04-04 17:29:49 +00:00
Yabin Cui
5d002b8d6a adb: don't reset usb when connecting it.
Calling libusb_reset_device() resets the usb connection with device
on linux platform. It can interfere with other usb interfaces and only
works on linux.
Removing it only affects when adb server is killed while doing IO with
device, which will be solved in later patches.

Bug: http://b/32952319
Test: none
Change-Id: I19522435eadd938ff95d49cbae3bcaa5c8f6d184
2017-04-04 10:29:21 -07:00
Mark Salyzyn
d3d3dddd31 Merge "logcat: Add -h and --help flags"
am: 23e308398f

Change-Id: Icffb5b13a46f9fe3e1903cf1255b7218948c2db8
2017-04-04 16:54:22 +00:00
Tom Cherry
ed73c21658 Merge "init: use read_file and write_file to implement do_copy builtin"
am: 554c1fa234

Change-Id: I4a2a2d86780a34cc3d5b4c17396ebba6681aae8d
2017-04-04 16:50:53 +00:00
Treehugger Robot
23e308398f Merge "logcat: Add -h and --help flags" 2017-04-04 16:50:19 +00:00
Tom Cherry
554c1fa234 Merge "init: use read_file and write_file to implement do_copy builtin" 2017-04-04 16:42:50 +00:00
Mark Salyzyn
e74e51ded7 logcat: Add -h and --help flags
If -h or --help argument was supplied, logcat would report the help
message but also return an error.  Officially add -h and --help as
recognized flags, report all help with a (zero) success error code.
Adding this, and the associated test, was split off as a stepping
stone to resolving an issue with logcat -L or --last flag operations.

Test: gTest logcat-unit-tests --gtest_filter=*.help
Bug: 28788401
Bug: 30041146
Bug: 30612424
Bug: 35326290
Change-Id: I948e7fa4e92bd23f52717758ffd96bbd068c53d4
2017-04-04 08:01:11 -07:00
Yongqin Liu
dbe88e7953 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

Bug: 36726045
Test: manual with hikey
Test: boot and init tests on bullhead
Test: cast with fugu, per b/36726045
Merged-In: If3c30a2fff58cfece2fcd27e69c30382146e6808

Change-Id: If3c30a2fff58cfece2fcd27e69c30382146e6808
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2017-04-04 06:21:29 +00:00
Tom Cherry
5ff631620e Merge "init: Use std::string for write_file()"
am: 815578cef2

Change-Id: I58b3804b67967514d04a771da5a39efd9de9d218
2017-04-04 02:34:00 +00:00
Treehugger Robot
815578cef2 Merge "init: Use std::string for write_file()" 2017-04-04 02:21:55 +00:00
Christopher Ferris
f447c8eb20 Add overflow checks in Memory objects.
Also change one of the reads to be explicitly ReadField instead of an
overloaded Read function.

Bug: 23762183

Test: Passes new unit tests.
Change-Id: Id848f7b632f67df0c5b7318d9e588942cfd2099a
2017-04-03 18:36:33 -07:00
Elliott Hughes
8aac990de2 Merge "Show install path in "adb --version" and "fastboot --version"."
am: d2d8b68f70

Change-Id: I3fac85f01f08c277bdc4ccc8ebbb22ddb9f3397f
2017-04-04 01:23:40 +00:00
Josh Gao
330b6fd878 Merge "debuggerd_test: add test for process/thread names."
am: ca8954f7b8

Change-Id: I13fe3d3715458c41630adc2a221881dd0a8a9ccb
2017-04-04 01:23:26 +00:00
Elliott Hughes
d2d8b68f70 Merge "Show install path in "adb --version" and "fastboot --version"." 2017-04-04 01:16:11 +00:00
Josh Gao
ca8954f7b8 Merge "debuggerd_test: add test for process/thread names." 2017-04-04 01:14:35 +00:00
Christopher Desjardins
ec2fb683ff Merge "Make ueventd error messages indicate where the error is in ueventd script"
am: fd72bbe91f

Change-Id: I5a6637721475e5cc6cef6e1240b8ce753fc983f5
2017-04-03 23:56:49 +00:00
Treehugger Robot
fd72bbe91f Merge "Make ueventd error messages indicate where the error is in ueventd script" 2017-04-03 23:50:31 +00:00
Tom Cherry
53089aa25c init: Use std::string for write_file()
The content parameter of write_file() previously took a char* that was
then converted to a std::string in WriteStringToFd().  One unfortunate
effect of this, is that it is impossible to write data that contains
'\0' within it, as the new string will only contain characters up
until the '\0'.

This changes write_file() to take an std::string, such that
std::string::size() is used to determine the length of the string,
allowing it to contain null characters.

Also change the path parameter of read_file() and write_file() for
consistency.

Lastly, add a test for handling strings with '\0' in them.

Bug: 36726045
Test: Boot bullhead, run unit tests
Change-Id: Idad60e4228ee2de741ab3ab6a4917065b5e63cd8
2017-04-03 16:41:22 -07:00
Christopher Desjardins
7d3e2c4d4e Make ueventd error messages indicate where the error is in ueventd script
Test: Boot bullhead
Test: Observe errors with file and line number with faulty ueventd.rc

Change-Id: Ieae6151e253f1e6437dfdebd14da4e1e04a45fae
2017-04-03 22:20:55 +00:00
Vineeta Srivastava
5e3590e81e Merge "Add vbmeta image support for verified boot"
am: 8bc5c8521a

Change-Id: I7de333ee2b7502c0040c2f27f36c8059e188ec03
2017-04-03 20:23:15 +00:00
Josh Gao
a5199a9e43 debuggerd_test: add test for process/thread names.
Make sure that we can get the process/thread names for nondumpable
processes with capabilities.

Bug: http://b/36237221
Test: /data/nativetest/debuggerd_test/debuggerd_test32
Change-Id: Iedd4eae18065c2e64abeebff15e3b9b09a630550
2017-04-03 13:18:34 -07:00
Vineeta Srivastava
8bc5c8521a Merge "Add vbmeta image support for verified boot" 2017-04-03 20:13:19 +00:00
Keun-young Park
e15756a604 Merge "add shutdown animation"
am: 8aae1b158a

Change-Id: I1ccd7473d8ed305597fbb98b724dc7748b577d14
2017-04-03 19:34:04 +00:00
Keun-young Park
8aae1b158a Merge "add shutdown animation" 2017-04-03 19:27:34 +00:00
Elliott Hughes
40fa93dbf0 Merge "Switch to a shell_and_utilities phony module."
am: 2aeed10a28

Change-Id: Id1a3cd08ad08793c49d1f8618b87ae9712619196
2017-04-03 17:19:28 +00:00
Elliott Hughes
2aeed10a28 Merge "Switch to a shell_and_utilities phony module." 2017-04-03 17:15:17 +00:00
Elliott Hughes
521d303582 Switch to a shell_and_utilities phony module.
(cherrypick of 8ad0e66e77c795d11e9cd5c7b576eed0da60537e.)

Bug: N/A
Test: builds
Change-Id: I700700abb4de76017a2ff811ceff19ea2ee86eb2
2017-04-03 17:14:26 +00:00
Jeff Sharkey
fc2ead70cd Merge "Revert "Allocate GID to use reserved disk space.""
am: 7c06d2c79a

Change-Id: Ic9a6a9048ab796833b9a765d4270184efe5ba35b
2017-04-03 15:20:19 +00:00
Treehugger Robot
7c06d2c79a Merge "Revert "Allocate GID to use reserved disk space."" 2017-04-03 15:14:33 +00:00
Mark Salyzyn
5ca80df1ec Merge "liblog: Speed up and extend the radio log redirect code"
am: 54f20c5553

Change-Id: Ida2e522c81305b3145d167f7ec11d2953aabd9a0
2017-04-03 14:25:42 +00:00
Mark Salyzyn
0b743b925e Merge changes Ic590c230,Ibd4be82b
am: 3c013de8d8

Change-Id: I1d9e7535106ae09cfb0f2adc547be31ee7a89f4d
2017-04-03 14:25:28 +00:00
Mark Salyzyn
41e44283d2 Merge "logd: correctly label identical lines"
am: a9b5a5e96a

Change-Id: I0cd6ad498e46bbaa2c78ee8ad95b920b309edd90
2017-04-03 14:25:15 +00:00
Mark Salyzyn
54f20c5553 Merge "liblog: Speed up and extend the radio log redirect code" 2017-04-03 14:21:57 +00:00
Mark Salyzyn
3c013de8d8 Merge changes Ic590c230,Ibd4be82b
* changes:
  logd: liblog benchmark check BM_log_overhead regression
  liblog: benchmark add BM_log_event_overhead_42 for a well known tag
2017-04-03 14:21:41 +00:00
Mark Salyzyn
a9b5a5e96a Merge "logd: correctly label identical lines" 2017-04-03 14:21:13 +00:00
Jeff Sharkey
d185445eee Revert "Allocate GID to use reserved disk space."
This reverts commit 82f8bb785e.

Sadly, we'd have to extend CAP_SYS_RESOURCE to a bunch of execution
domains to make this work, which isn't feasible.

Bug: 36450358
Change-Id: Iffe88e45d538c044382eb0d0ac24ff11a10d73c3
2017-04-03 04:00:36 +00:00
Bowgo Tsai
5a5017c07c Merge "fs_mgr: removing fs_mgr_read_fstab_with_dt()"
am: 53108b269e

Change-Id: I32a784c7b68d12d6e4cf9c2c0c4ad13829835541
2017-04-01 03:09:27 +00:00
Treehugger Robot
53108b269e Merge "fs_mgr: removing fs_mgr_read_fstab_with_dt()" 2017-04-01 03:05:25 +00:00
Jeff Sharkey
3afe2fc987 Merge "Allocate GID to use reserved disk space."
am: 145e185ddb

Change-Id: I1ee502f8714d9e78aeca5e5ad9a78c15667722c2
2017-04-01 01:36:21 +00:00
Treehugger Robot
145e185ddb Merge "Allocate GID to use reserved disk space." 2017-04-01 01:33:16 +00:00
Keun-young Park
7830d59500 add shutdown animation
- Run shutdown animation during shutdown if surfaceflinger is
  available / running.
- services necessary for animation should be added to animation
  class.
- Keep debugging tools while non-critical services are terminated:
  logd, adbd, tombstoned

bug: 36526187
Test: many reboots

Change-Id: I758f700a622c6005f3df9f29de2b55270055ad4d
2017-03-31 16:48:20 -07:00
Jeff Sharkey
82f8bb785e Allocate GID to use reserved disk space.
Filesystems like ext4 allow the setting of the "resgid" parameter
to designate a GID that is allowed to use the "reserved" disk space
(in addition to UID 0).  We'll be granting this GID to critical
system processes, so that the system is usable enough for the user
to free up disk space used by apps.

Test: builds
Bug: 36450358
Change-Id: I224bd1e597130edb411a1528872faff1ada02a89
2017-03-31 16:39:45 -06:00
Mark Salyzyn
ae2abf112c logd: correctly label identical lines
Move lastTid array from local in LogBuffer::flushTo to per-reader
context in LogTimes::mLastTid and pass into LogBuffer::flushTo.

Replace NULL with nullptr in touched files.

Simplify LogTimeEntry::cleanSkip_Locked initialization of skipAhead
to memset, to match mLastTid memset initialization.

Test: gTest liblog-unit-tests, logd-unit-tests & logcat-unit-tests
Test: adb logcat -b all | grep chatty | grep -v identical
Bug: 36488201
Change-Id: I0c3887f220a57f80c0490be4b182657b9563aa3f
2017-03-31 13:56:38 -07:00
James Hawkins
904e8e90a5 Merge "bootstat: Refactor init/utils/boot_clock into base/chrono_utils."
am: bc9cb3885b

Change-Id: Ib7eb48b8f82dfb7bace9b3228e755f20689b2fa4
2017-03-31 20:54:03 +00:00