Commit Graph

32453 Commits

Author SHA1 Message Date
Mark Salyzyn 69c76c0c76 Merge "Revert "logd: add Chattiest LOG_TAG statistics"" am: 5002a48cee am: 74b66822d2
am: 614baba5fa

Change-Id: I25770538873723b6352675f8b04600eff843f5b8
2017-04-24 20:26:31 +00:00
Mark Salyzyn 614baba5fa Merge "Revert "logd: add Chattiest LOG_TAG statistics"" am: 5002a48cee
am: 74b66822d2

Change-Id: If8a4a0de8350b39e77d4d78383aa922a18663b46
2017-04-24 20:15:37 +00:00
Mark Salyzyn 74b66822d2 Merge "Revert "logd: add Chattiest LOG_TAG statistics""
am: 5002a48cee

Change-Id: I36e508b03c1e1e2ca83f9c14aaba7daee5b49325
2017-04-24 20:07:51 +00:00
Mark Salyzyn 5002a48cee Merge "Revert "logd: add Chattiest LOG_TAG statistics"" 2017-04-24 19:54:25 +00:00
Mark Salyzyn afd7e70553 Revert "logd: add Chattiest LOG_TAG statistics"
This reverts commit 903156ddaa.

Test: compile
Bug: 37254265
Change-Id: If9af79684119861ceecf4f88a4a4c84f991b188a
2017-04-24 19:52:33 +00:00
Tom Cherry d0ea8a98cd Merge changes Ic446c026,I86568a5b am: 51b7cb006f am: 41dbec9791
am: fea35fc7e4

Change-Id: Ia5e7465015618317132c63cdfaddd8cb63c2425a
2017-04-24 19:23:38 +00:00
Mark Salyzyn 0735206a83 Merge "logd: add Chattiest LOG_TAG statistics" am: 39aee46352 am: c26df4fa0f
am: ae1d2e0e83

Change-Id: I9c588b59b561e74ad186230e5ecd7df2e4dced92
2017-04-24 19:23:19 +00:00
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 2f1057755d Merge "Revert "Make the xtables lock readable only by AID_RADIO and root."" into oc-dev
am: a66d1bcd0e  -s ours

Change-Id: I4811a6ea8eda0c43e346884ba6d0b929ff5ad5f5
2017-04-22 04:43:20 +00:00
Lorenzo Colitti a66d1bcd0e Merge "Revert "Make the xtables lock readable only by AID_RADIO and root."" into oc-dev 2017-04-22 04:36:48 +00:00
Lorenzo Colitti 20d9068e00 Merge "Revert "Make the xtables lock readable only by AID_RADIO and root."" am: d272ca38f6 am: aaa2b30d5c
am: 87f9ffdac7

Change-Id: I8161bd5fd129e7eb8fc1644400a259ae96c2a0aa
2017-04-22 04:33:50 +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 1a6eb1628c Merge "Revert "Ensure update_verifier run before zygote"" am: a037bddd8a am: 615211301e
am: 2e211888c0

Change-Id: Ie9eb8fc13d35a615ff14d120816e675d8ea20f2b
2017-04-22 01:12:06 +00: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
Mark Salyzyn 401dd4ccfd Merge "liblog: test: liblog.__security miscalculation" into oc-dev
am: c92fb45a42

Change-Id: If2b4c43c4433422ef7964e0bc82569f73f633f41
2017-04-21 22:51:26 +00:00
TreeHugger Robot c92fb45a42 Merge "liblog: test: liblog.__security miscalculation" into oc-dev 2017-04-21 22:39:20 +00:00
Wei Wang 1214e236eb Merge "Ensure update_verifier run before zygote" am: a42ec8a9e3 am: 29a0f68c11
am: 73fc12cbda

Change-Id: Ife005b30f6115747309f0b3f096f5380e17f192a
2017-04-21 22:28:27 +00: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
Keun-young Park 861baa7118 early start zygote_secondary as well
am: 5fb5b81fc7

Change-Id: I19ae08101a1b1f2aec022f82a89afe26006d9146
2017-04-21 19:20:53 +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 93ee9b3cb3 Merge "early start zygote_secondary as well" am: a0bf415cad am: b7896f0a0d
am: 1abccccb71

Change-Id: I0bf50e54aacc5cd2f967c44dd5176800ee69a695
2017-04-21 17:07:33 +00: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 5fb5b81fc7 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

(cherry picked from commit f8532445b4)

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

Change-Id: Ibb02e12de4a525f3d7a412db96eaa0feb777fb10
2017-04-21 16:48:56 +00:00
Lorenzo Colitti 50e244b203 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

(cherry picked from commit b6e4b35fe4)

Change-Id: Ia1bbf8d93ec6777514be66cbd1a32dfc95df95c0
Merged-In: Ia1bbf8d93ec6777514be66cbd1a32dfc95df95c0
2017-04-22 01:48:05 +09: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 8a3969ff7f Merge "liblog: test: liblog.__security miscalculation" am: 3ed85748e1 am: 725526774b
am: f4589bb613

Change-Id: I3db41bcf74e41b622e7a77a0fcfedfb4d78b1b46
2017-04-21 15:30:27 +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
Mark Salyzyn b7140c26d5 liblog: test: liblog.__security miscalculation
(cherry pick from commit b867beac56)

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-21 08:20:56 -07:00