Commit graph

29516 commits

Author SHA1 Message Date
Mark Salyzyn
c26df4fa0f Merge "logd: add Chattiest LOG_TAG statistics"
am: 39aee46352

Change-Id: Ibf4d87a0ba42c9a2a0ec3bdd5a16b5d29f37618c
2017-04-24 19:01:05 +00:00
Treehugger Robot
39aee46352 Merge "logd: add Chattiest LOG_TAG statistics" 2017-04-24 14:35:36 +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
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
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
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
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
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
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
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
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
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
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
Treehugger Robot
a58c4b5bcd Merge "Convert libusbhost to Android.bp" 2017-04-20 17:07:43 +00:00
Dan Willemsen
a5c6017d8f Convert libusbhost to Android.bp
See build/soong/README.md for more information.

Test: mmma -j system/core/libusbhost
Change-Id: I57109380678bd452af545d4c5b1b9d2356b356b8
2017-04-20 08:37:12 -07:00
Mark Salyzyn
2ad8ed5138 Merge "logd: statistics add logspan"
am: e32517d773

Change-Id: I92ec192fdd5d2cf7469b3ac77fdb387e3e19e54a
2017-04-20 15:25:50 +00:00
Mark Salyzyn
0a1424e196 logcat: test: also check "failed to clear" in blocking_clear
Add more detail about logcat.blocking_clear test failure

Test: gTest logcat-unit-test --gtest_filter=logcat.blocking_clear
Bug: 37483775
Change-Id: I6555c13593781a1278d9106e66c2dec6009a2215
2017-04-20 08:24:38 -07:00
Mark Salyzyn
3c501b50b4 logd: reader/writer element locks
Switch to a reader writer lock for the Element List lock.  Also setup
for a reader writer lock for the Times list, but continue to use a
mutex where rdlock() and wrlock() are the same implementation for now.

This should improve general reader performance and prevent blocking of
other reader operations or exit by a single hung logd.reader.per
thread.  For example, a full length logcat of an empty buffer (eg:
crash log buffer) will hold a lock while the iterator scans the entire
list.

Test: gTest liblog-unit-tests, logd-unit-tests, logcat-unit-tests
Bug: 37378309
Bug: 37483775
Change-Id: If5723ff4a978e17d828a75321e8f0ba91d4a09e0
2017-04-20 08:24:38 -07:00
Mark Salyzyn
e32517d773 Merge "logd: statistics add logspan" 2017-04-20 15:19:05 +00:00
Christopher Ferris
0597e4a8af Merge "Add function definitions for MapInfo."
am: 4c1560ce5c

Change-Id: Ifb6d06f5349c737c3bd826564d32ada0f7734887
2017-04-20 02:12:24 +00:00
Christopher Ferris
4c1560ce5c Merge "Add function definitions for MapInfo." 2017-04-20 02:08:33 +00:00
Steven Moreland
004f8f9633 Merge changes from topic 'system-vendor-internal-pick'
am: 3dfaa44491

Change-Id: I9e782c46d9ddf43b61c8feb5e2c33f2a295e8358
2017-04-20 01:50:40 +00:00
Steven Moreland
74f60ea50a libsync: vendor_available
am: 9990de1f64

Change-Id: Ia345026f98a48b3975e9694681848b49f1880e2a
2017-04-20 01:50:24 +00:00
Steven Moreland
af13aaf618 Remove VNDK warning.
am: 2bd4342234

Change-Id: If5f2e965e944180e77132a105227c4efb344087e
2017-04-20 01:50:05 +00:00
Steven Moreland
45102312a3 libbase: make vendor_available
am: d10a023208

Change-Id: I34554045272dcb8c74179010ee6cde4eb899eef3
2017-04-20 01:49:47 +00:00
Steven Moreland
d4010ad4b8 libcutils: vendor_available
am: 385fe692cc

Change-Id: I3f729a42636ea2f00ac42c1a134f1a0600db1bee
2017-04-20 01:49:30 +00:00
Steven Moreland
9529a0fe6f libbacktrace: make vendor_available
am: bb11af88e2

Change-Id: I718890b9ea326dd0f8ae5e70b311e32cadf382d0
2017-04-20 01:49:05 +00:00
Steven Moreland
10a28989b8 libbase: add libbase_headers
am: 3c71bbdde3

Change-Id: Id7d32390e1e6963b2a472526ade0de0ff70a968a
2017-04-20 01:48:44 +00:00
Treehugger Robot
3dfaa44491 Merge changes from topic 'system-vendor-internal-pick'
* changes:
  libbase: fix build breakage
  libsync: vendor_available
  Remove VNDK warning.
  libbase: make vendor_available
  libcutils: vendor_available
  libbacktrace: make vendor_available
  libbase: add libbase_headers
2017-04-20 01:39:23 +00:00
Elliott Hughes
e6b808ea5b Merge "Fix various adb error reporting bugs."
am: 8dead17a58

Change-Id: I4587f92de271d11137fad4e6e843abc17267cbcf
2017-04-20 00:47:18 +00:00