Commit graph

29903 commits

Author SHA1 Message Date
Tom Cherry
fea35fc7e4 Merge changes Ic446c026,I86568a5b am: 51b7cb006f
am: 41dbec9791

Change-Id: I597c7cd6e7c52760d56545891dbc2a671eafb430
2017-04-24 19:15:17 +00:00
Mark Salyzyn
ae1d2e0e83 Merge "logd: add Chattiest LOG_TAG statistics" am: 39aee46352
am: c26df4fa0f

Change-Id: I31af54d5ecca20cf8e1e3cdc41aaeff3feca3d64
2017-04-24 19:14:58 +00:00
Tom Cherry
41dbec9791 Merge changes Ic446c026,I86568a5b
am: 51b7cb006f

Change-Id: Ia0a69e72bdc4ff7ded9ce7ce2aa183d401441b9a
2017-04-24 19:01:28 +00:00
Mark Salyzyn
c26df4fa0f Merge "logd: add Chattiest LOG_TAG statistics"
am: 39aee46352

Change-Id: Ibf4d87a0ba42c9a2a0ec3bdd5a16b5d29f37618c
2017-04-24 19:01:05 +00:00
Tom Cherry
51b7cb006f Merge changes Ic446c026,I86568a5b
* changes:
  init: create init_tests.cpp
  init: clean up the SectionParser interface and Parser class
2017-04-24 18:02:05 +00:00
Treehugger Robot
39aee46352 Merge "logd: add Chattiest LOG_TAG statistics" 2017-04-24 14:35:36 +00:00
Lorenzo Colitti
87f9ffdac7 Merge "Revert "Make the xtables lock readable only by AID_RADIO and root."" am: d272ca38f6
am: aaa2b30d5c

Change-Id: Iec3b4c60ee07b8208ae55badb5e0df268a4a7178
2017-04-22 04:30:49 +00:00
Lorenzo Colitti
aaa2b30d5c Merge "Revert "Make the xtables lock readable only by AID_RADIO and root.""
am: d272ca38f6

Change-Id: Iaba9526ef774432758bdd03394e999313686973d
2017-04-22 04:27:49 +00:00
Lorenzo Colitti
d272ca38f6 Merge "Revert "Make the xtables lock readable only by AID_RADIO and root."" 2017-04-22 04:21:18 +00:00
Tom Cherry
ad54d094cd init: create init_tests.cpp
Start a init_tests.cpp file for end-to-end tests that parse small init script
segments and verify that they act as expected.

The first tests ensure that the execution order of event triggers
happens appropriately.

Test: Boot bullhead, run unit tests

Change-Id: Ic446c02605ab796fd41e0596ce1fd381aee80ce0
2017-04-21 18:27:42 -07:00
Tom Cherry
30a6f276fd init: clean up the SectionParser interface and Parser class
Remove the dependency on Action and Service from what should be a
generic Parser class.

Make ActionParser, ImportParser, and ServiceParser take a pointer to
their associated classes instead of accessing them through a
singleton.

Misc fixes to SectionParser Interface:
1) Make SectionParser::ParseLineSection() non-const as it always should
have been.
2) Use Rvalue references where appropriate
3) Remove extra std::string& filename in SectionParser::EndFile()
4) Only have SectionParser::ParseSection() as pure virtual

Document SectionParser.

Make ImportParser report the filename and line number of failed imports.

Make ServiceParser report the filename and line number of duplicated services.

Test: Boot bullhead

Change-Id: I86568a5b375fb4f27f4cb235ed1e37635f01d630
2017-04-21 18:26:40 -07:00
Keun-young Park
2e211888c0 Merge "Revert "Ensure update_verifier run before zygote"" am: a037bddd8a
am: 615211301e

Change-Id: I8331e8769b00f50bc4009d935c3bd6c7b6668381
2017-04-22 01:09:37 +00:00
Keun-young Park
615211301e Merge "Revert "Ensure update_verifier run before zygote""
am: a037bddd8a

Change-Id: I535056ddbe20cd43d844167b72840105b13eeb64
2017-04-22 01:05:36 +00:00
Keun-young Park
a037bddd8a Merge "Revert "Ensure update_verifier run before zygote"" 2017-04-22 00:56:48 +00:00
Keun-young Park
2de3344180 Revert "Ensure update_verifier run before zygote"
This reverts commit 5dc05effec.

Change-Id: Ic041860dee8a2993c6b4890beca4da745cfbfb60
2017-04-22 00:43:55 +00:00
Mark Salyzyn
903156ddaa logd: add Chattiest LOG_TAG statistics
Report global LOG_TAG usage.

Test: gTest liblog-unit-tests, logd-unit-tests & logcat-unit-tests
Test: manual: inspect logcat -S results around 'Chattiest TAGs'
Bug: 37254265
Change-Id: I32473a1d9131c87e4fb7841d5cc0ea9cc14c63cd
2017-04-21 15:55:10 -07:00
Wei Wang
73fc12cbda Merge "Ensure update_verifier run before zygote" am: a42ec8a9e3
am: 29a0f68c11

Change-Id: Ic7e700c71062486cc5a281c9fa36c39354893ecf
2017-04-21 22:24:54 +00:00
Wei Wang
29a0f68c11 Merge "Ensure update_verifier run before zygote"
am: a42ec8a9e3

Change-Id: Ifded709acce34be00956567b9599f83bb3f051bf
2017-04-21 22:21:55 +00:00
Treehugger Robot
a42ec8a9e3 Merge "Ensure update_verifier run before zygote" 2017-04-21 22:16:52 +00:00
Wei Wang
5dc05effec Ensure update_verifier run before zygote
Currently zygote is started early for FBE device but update_verifier is run later
which creates a potential risk. This CL ensures update_verifier run before
zygote touches anything within data/ partition. With this change, we also start zygote
early for unencrypted/unsupported encryption state device.

Bug: 37543411
Test: marlin boots
Change-Id: I95daa73bc1a503eecb70d7be78251b74b773abf8
2017-04-21 11:54:55 -07:00
Keun-young Park
1abccccb71 Merge "early start zygote_secondary as well" am: a0bf415cad
am: b7896f0a0d

Change-Id: Ibc070c240c73366e992fd289799b8f618f5e6bb7
2017-04-21 17:04:33 +00:00
Keun-young Park
b7896f0a0d Merge "early start zygote_secondary as well"
am: a0bf415cad

Change-Id: I3b4840313e0b80aa134d2469f8c27b32dd5f1c93
2017-04-21 17:02:03 +00:00
Keun-young Park
a0bf415cad Merge "early start zygote_secondary as well" 2017-04-21 16:49:11 +00:00
Sandeep Patil
dba5e13593 Merge "fs_mgr: remove the repetitive and annoying bootconfig error print" am: 515e7a4fc4
am: d1078c42ce

Change-Id: I2b735716342c046cd160a4a16a16911dbe53574a
2017-04-21 16:42:30 +00:00
Lorenzo Colitti
b6e4b35fe4 Revert "Make the xtables lock readable only by AID_RADIO and root."
This reverts commit 5e801e7bd5.

The file permissions don't allow access to the lock on devices
where vendor code runs with UID root and GID radio. They are
no longer necessary because we have a more flexible selinux-based
solution in https://android-review.googlesource.com/#/c/354223/ .

Test: strace -f -e flock -p <netmgrd_pid> on angler shows flock succeeds
Test: strace -f -e flock -p <netmgrd_pid> on marlin shows flock succeeds
Test: netd_unit_test passes on marlin
Test: strace -f -e flock -p <netd_pid> on marlin shows flock succeeds
Bug: 36108349
Bug: 37483189
Change-Id: Ia1bbf8d93ec6777514be66cbd1a32dfc95df95c0
2017-04-21 16:41:35 +00:00
Sandeep Patil
d1078c42ce Merge "fs_mgr: remove the repetitive and annoying bootconfig error print"
am: 515e7a4fc4

Change-Id: I8cdffd2ab6fc3cc5527d7f8f99f8303ad2c0db35
2017-04-21 16:37:29 +00:00
Treehugger Robot
515e7a4fc4 Merge "fs_mgr: remove the repetitive and annoying bootconfig error print" 2017-04-21 16:29:37 +00:00
Mark Salyzyn
f4589bb613 Merge "liblog: test: liblog.__security miscalculation" am: 3ed85748e1
am: 725526774b

Change-Id: I9027d158e1af9cf270c3c297fcf5fa2dd11ea351
2017-04-21 15:27:26 +00:00
Mark Salyzyn
725526774b Merge "liblog: test: liblog.__security miscalculation"
am: 3ed85748e1

Change-Id: I7f590ae54efd191986b3232fb55d3faf36617007
2017-04-21 15:23:26 +00:00
Treehugger Robot
3ed85748e1 Merge "liblog: test: liblog.__security miscalculation" 2017-04-21 15:17:03 +00:00
Keun-young Park
f8532445b4 early start zygote_secondary as well
- late start of zygote_secondary leads into occasional
  1 second wait for starting system service.
- Early start secondary zygote so that there is no additional
  wait.

bug: 37508384
Test: python packages/services/Car/tools/bootanalyze/bootanalyze.py -r -c packages/services/Car/tools/bootanalyze/config.yaml -n 100 -f -e 16 -w 30
Change-Id: I2e4eb0b59a9a8417b56a72fe2de6fa2a6e1ab0a2
2017-04-20 18:31:48 -07:00
Sandeep Patil
73fbf0ee16 fs_mgr: remove the repetitive and annoying bootconfig error print
The new changes to slotselect() call makes it try to find the
"slot" config before trying "slot_suffix" and that causes fs_mgr to
print the needless error and spam the kernel logs for no reason.
Remove the print.

Test: Builds for sailfish

Change-Id: I020575d70f4cd6e137e82c127b5d5234d709d0e3
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-04-20 14:41:23 -07:00
Colin Cross
5d29c3f3fd Merge changes Ia11dffde,I76f24890 am: bd53ea4063
am: 280e3beec3

Change-Id: I34433c86b27de92ad665ec4b4c92c2801f7f63a0
2017-04-20 21:25:19 +00:00
Colin Cross
280e3beec3 Merge changes Ia11dffde,I76f24890
am: bd53ea4063

Change-Id: I663c310dcc025a666b76e67e0f67d9680ef64ea9
2017-04-20 21:22:46 +00:00
Treehugger Robot
bd53ea4063 Merge changes Ia11dffde,I76f24890
* changes:
  Convert libnetutils to Android.bp
  Don't export libutils_headers from libbase
2017-04-20 21:19:17 +00:00
Tom Cherry
c7e559ca40 Merge "init: fix errno handling on KillProcessGroup" am: f890ca9a1f
am: db9f2cb46d

Change-Id: I9ba2f0e8475a625081a6ae8470772ee7e0e087dc
2017-04-20 20:58:12 +00:00
Tom Cherry
db9f2cb46d Merge "init: fix errno handling on KillProcessGroup"
am: f890ca9a1f

Change-Id: I0bf7aee5a23a7ab51ca922e7f5b9b086936ca461
2017-04-20 20:55:12 +00:00
Tom Cherry
f890ca9a1f Merge "init: fix errno handling on KillProcessGroup" 2017-04-20 20:48:49 +00:00
Mark Salyzyn
b867beac56 liblog: test: liblog.__security miscalculation
The gTest should not be able to set ro.device_owner, either as a unit
test or a CTS test.  The CTS test should not be able to set
persist.logd.security, the gTest may as it is run on userdebug with
root, so check if we are root to discern expectations.

Test: gTest liblog-unit-tests --gtest_filter=liblog.__security
Test: cts-tradefed run cts-dev -a armeabi-v7a -m CtsLiblogTestCases -t liblog#__security
Bug: 36480230
Change-Id: I1da88aae34da4e2fca8dd88d740eeb879d9c65bb
2017-04-20 13:26:12 -07:00
Yabin Cui
66cfd45a34 Merge "adb: fix two device offline problems." am: 2e821078e4
am: ae6a3605d2

Change-Id: I9d08addcc464ca68989b4a0c654c681eb5cf6347
2017-04-20 19:51:42 +00:00
Yabin Cui
ae6a3605d2 Merge "adb: fix two device offline problems."
am: 2e821078e4

Change-Id: Iffba674a90dae88610541fe93c8df751e9ad63d2
2017-04-20 19:49:08 +00:00
Treehugger Robot
2e821078e4 Merge "adb: fix two device offline problems." 2017-04-20 19:45:18 +00:00
Mark Salyzyn
529be90503 Merge changes I6555c135,If5723ff4 am: d9982803ed
am: b3259f39c2

Change-Id: I9823a3b1e791d07dadb3fafb6b6e0b5c8978034e
2017-04-20 17:54:29 +00:00
Mark Salyzyn
b3259f39c2 Merge changes I6555c135,If5723ff4
am: d9982803ed

Change-Id: I35bc074d7945bb7a9c99c37262f572afa4d52a6f
2017-04-20 17:52:00 +00:00
Colin Cross
cafe889aa8 Convert libnetutils to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: Ia11dffde6fc4d89be6ee651be06b48131c877dc0
2017-04-20 10:36:43 -07:00
Colin Cross
4eda982a77 Don't export libutils_headers from libbase
libutils headers are only used by the implementation of libbase,
and should not be exported to everything that uses libbase headers.

Test: m -j
Change-Id: I76f248908f649e3a3c91cd3e84d629a0049939ef
2017-04-20 10:36:32 -07:00
Treehugger Robot
d9982803ed Merge changes I6555c135,If5723ff4
* changes:
  logcat: test: also check "failed to clear" in blocking_clear
  logd: reader/writer element locks
2017-04-20 17:33:50 +00:00
Dan Willemsen
720faf195c Merge "Convert libusbhost to Android.bp" am: a58c4b5bcd
am: dff208c80c

Change-Id: I4d874b95bc668e93a2a4bc2baee9d38b4b8d5e25
2017-04-20 17:22:27 +00:00
Dan Willemsen
dff208c80c Merge "Convert libusbhost to Android.bp"
am: a58c4b5bcd

Change-Id: I71112a018a735a1ba20ca17e652f87fbdade2fed
2017-04-20 17:19:58 +00:00
Yabin Cui
b5e11415d9 adb: fix two device offline problems.
When device goes offline, user usually has to manually replug the
usb device. This patch tries to solve two offline situations, all
because when adb on host is killed, the adbd on device is not notified.

1. When adb server is killed while pushing a large file to device,
the device is still reading the unfinished large message. So the
device thinks of the CNXN message as part of the previous unfinished
message, so it doesn't reply and the device is in offline state.

The solution is to add a write_msg_lock in atransport struct. And it
kicks the transport only after sending a whole message. By kicking
all transports before exit, we ensure that we don't write part of
a message to any device. So next time we start adb server, the device
should be waiting for a new message.

2. When adb server is killed while pulling a large file from device,
the device is still trying to send the unfinished large message. So
adb on host usually reads data with EOVERFLOW error. This is because
adb on host is reading less than one packet sent from device.

The solution is to use buffered read on host. The max packet size
of bulk transactions in USB 3.0 is 1024 bytes. By preparing an at least
1024 bytes buffer when reading, EOVERFLOW no longer occurs. And teach
adb host to ignore wrong messages.

To be safe, this patch doesn't change any logic on device.

Bug: http://b/32952319
Test: run python -m unittest -q test_device.DeviceOfflineTest
Test: on linux/mac/windows with bullhead, ryu.
Change-Id: Ib149d30028a62a6f03857b8a95ab5a1d6e9b9c4e
2017-04-20 10:14:59 -07:00