Commit graph

47069 commits

Author SHA1 Message Date
Victor Hsieh
ef787edd24 Merge "Initialize fs-verity keys in shell script"
am: 7f43e9fa40

Change-Id: Ie27114211fdea57171b92ad081517f897c8f5c56
2019-03-27 13:40:10 -07:00
Treehugger Robot
7f43e9fa40 Merge "Initialize fs-verity keys in shell script" 2019-03-27 20:31:19 +00:00
Yifan Hong
d8209aa315 Merge "charger: android_get_control_file on last_kmsg"
am: ee9ba3efe7

Change-Id: I8fd2f518e0592c18f507de01df232deac492a4bf
2019-03-27 12:10:27 -07:00
Yifan Hong
ee9ba3efe7 Merge "charger: android_get_control_file on last_kmsg" 2019-03-27 19:01:07 +00:00
Martin Stjernholm
fd7f92372d Merge "Remove links to libart(d).so in the runtime."
am: fdf70f1ba8

Change-Id: Ife679137b14d56c18c34552d4babff3ccb083376
2019-03-27 10:25:45 -07:00
Treehugger Robot
fdf70f1ba8 Merge "Remove links to libart(d).so in the runtime." 2019-03-27 17:12:27 +00:00
Elliott Hughes
4fcd52fdd0 Merge "libprocessgroup: add -Wexit-time-destructors."
am: 3312ca7e04

Change-Id: I99bdc851c0df8250a93c04ea4f52fe1e621a777e
2019-03-27 08:47:29 -07:00
Elliott Hughes
3312ca7e04 Merge "libprocessgroup: add -Wexit-time-destructors." 2019-03-27 15:42:02 +00:00
Siarhei Vishniakou
59dcacc84d Merge "Logtags for com.android.server.policy"
am: 29d2b05194

Change-Id: Ic10b619bf21509aa0740ecf0c5dba6d422e47c92
2019-03-27 07:47:43 -07:00
Treehugger Robot
29d2b05194 Merge "Logtags for com.android.server.policy" 2019-03-27 14:41:12 +00:00
Nick Kralevich
d25aebd7b7 Merge "libziparchive: add integer checks"
am: 80e72443d0

Change-Id: Iae932a5af77db7762eec4250f73ff72a433d642d
2019-03-27 06:11:56 -07:00
Treehugger Robot
80e72443d0 Merge "libziparchive: add integer checks" 2019-03-27 13:03:16 +00:00
Suren Baghdasaryan
bbe0e86c73 Merge "lmkd: set PSI_POLL_PERIOD to 10ms"
am: e346d03c2b

Change-Id: Ia148c74acf22e2f863eb4f5f411f3e5f0f4e5f55
2019-03-26 22:14:26 -07:00
Treehugger Robot
e346d03c2b Merge "lmkd: set PSI_POLL_PERIOD to 10ms" 2019-03-27 05:03:16 +00:00
Suren Baghdasaryan
5db6a84831 lmkd: set PSI_POLL_PERIOD to 10ms
Occasionally we see cases when 40ms polling is still too conservative.
Change to 10ms polling period. Since the polling happens only after PSI
signal and continues for 1sec this should not affect system performance.

Test: lmkd_unit_test
Bug: 129358844

Change-Id: Ib759b865b2104be23741fc0eacaa541e22d50dde
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-03-27 02:10:10 +00:00
Elliott Hughes
be87d447b4 libprocessgroup: add -Wexit-time-destructors.
Exit time destructors already caused trouble (see
dba6d44376), and without this warning,
it's too easy to reintroduce issues.

Bug: 129023204
Test: builds
Change-Id: If5fb4d0c11c74ba4971bb218059c6d37edeaf4df
2019-03-26 18:50:22 -07:00
Greg Kaiser
b6bc0075f4 Merge changes Ia84ed9ec,I1c0fde72
am: 10533c57ed

Change-Id: I47635c21b9ab08a4463f43af7d02c333c42d0f14
2019-03-26 17:43:57 -07:00
Christopher Ferris
95b9ea1ddd Merge "Add BuildId to frame information."
am: 3da5fcbf70

Change-Id: I8168b1d2ae61280423ef6ec6ff598772aaafabd5
2019-03-26 17:41:43 -07:00
Josh Gao
eaf3841404 Merge "liblog: don't return 0xFFFFFFFF as an invalid log id."
am: 49a8eecc5f

Change-Id: I587e791a1338ae4605757dc825c4dd53dd8572f1
2019-03-26 17:40:52 -07:00
Josh Gao
c9a893c1eb Merge changes I80af5f4b,I2fd0034e
am: 2decb2fc3a

Change-Id: I192bf6f4f5798f7c84c2d91517e3800dc428c0a5
2019-03-26 17:40:05 -07:00
Treehugger Robot
10533c57ed Merge changes Ia84ed9ec,I1c0fde72
* changes:
  fastboot: Avoid extra std::string copies
  adb: Avoid extra std::string copies
2019-03-27 00:33:05 +00:00
Christopher Ferris
3da5fcbf70 Merge "Add BuildId to frame information." 2019-03-27 00:26:03 +00:00
Josh Gao
49a8eecc5f Merge "liblog: don't return 0xFFFFFFFF as an invalid log id." 2019-03-27 00:24:47 +00:00
Josh Gao
2decb2fc3a Merge changes I80af5f4b,I2fd0034e
* changes:
  adbd: listen to all functionfs events.
  adbd: increment writes_submitted_ before submitting writes.
2019-03-27 00:24:43 +00:00
Yifan Hong
dc9c08b900 charger: android_get_control_file on last_kmsg
Call android_get_control_file on last_kmsg files if the file
descriptor is provided by init.

Also, uses base::Read(File|Fd)ToString functions to read the
files (because load_file doesn't support fd arguments).

Test: charger mode
Test: manual kernel panic, then start charger; seen last kmsg.

Bug: 129138950
Change-Id: Idd3376e349f29586a1e66faab2c0f1bf73e0eda5
2019-03-26 15:51:55 -07:00
Yifan Hong
ee7da7c711 Merge changes from topic "lpdumpd"
am: f959fffc1c

Change-Id: I024ccc86df450b21115b76b8062975f2ba18378e
2019-03-26 14:29:48 -07:00
Yifan Hong
6c09f79eb1 liblp: Replace open with GetControlFileOrOpen
am: 26328e80b1

Change-Id: I8e65cef4b99cedf924e1fc0c75a0edc6fe1cca03
2019-03-26 14:28:42 -07:00
Yifan Hong
9d227e921f init: expand prop in 'file'
am: 567f1874fd

Change-Id: I87a2cd6fd5c38b6c216687596d734040329c8e0e
2019-03-26 14:27:25 -07:00
Yifan Hong
877436dd25 libcutils: android_get_control_file uses realpath.
am: dd6eefca30

Change-Id: Ifad26db11e55d9b4d8cdca6b6c41c1d0b071eb96
2019-03-26 14:26:09 -07:00
Josh Gao
6933d54e09 adbd: listen to all functionfs events.
Monitor for FUNCTIONFS_UNBIND as well, so that in the case where we get
FUNCTIONFS_BIND, FUNCTIONFS_UNBIND, FUNCTIONFS_BIND, we don't trigger an
assertion failure from seeing two FUNCTIONFS_BINDs.

Bug: http://b/129134256
Test: manual
Change-Id: I80af5f4b833513e932262638b9f8d76bbcb35504
2019-03-26 13:38:41 -07:00
Yifan Hong
f959fffc1c Merge changes from topic "lpdumpd"
* changes:
  libbase: realpath is wrapped with TEMP_FAILURE_RETRY
  liblp: Replace open with GetControlFileOrOpen
  init: expand prop in 'file'
  libcutils: android_get_control_file uses realpath.
2019-03-26 20:35:36 +00:00
Josh Gao
63b52ec13b adbd: increment writes_submitted_ before submitting writes.
If we fail to submit writes for some reason (e.g. the USB cable was
unplugged), another thread that's waiting on the write mutex can enter
SubmitWrites and attempt to resubmit the writes that we already failed
to submit, leading to a failed assertion of !IoBlock::pending.

Increment writes_submitted_ before actually calling io_submit, so we
skip over these writes and fall through to exit.

Bug: http://b/129134256
Test: manually unplugged a blueline
Change-Id: I2fd0034e45db22c8f637c81039ce686b7aa6a03b
2019-03-26 13:06:38 -07:00
Siarhei Vishniakou
6bd71b979c Logtags for com.android.server.policy
The definitions for event log tags are currently in system/core. Instead
of keeping them there, reserve a range for these event tags and move
them into com.android.server.policy.

Currently it is only used by PhoneWindowManager.

Bug: 128933363
Test: build only
Change-Id: Ida903499e9af8650299e3965787b4ac966b66915
Merged-In: Ida903499e9af8650299e3965787b4ac966b66915
2019-03-26 12:36:53 -07:00
Greg Kaiser
b49d9e19dc fastboot: Avoid extra std::string copies
The function do_for_partitions() takes a const std::string
reference, so it's inefficient to pass a std::string::c_str().

Test: TreeHugger
Change-Id: Ia84ed9ec691ee2f524c61dd25a81b2995bb0bb33
2019-03-26 12:04:05 -07:00
Greg Kaiser
e2125fdeb1 adb: Avoid extra std::string copies
When a function argument takes a std::string, it's inefficient to
pass std::string::c_str(), since that creates an additional copy.
So we change these calling sites.

Test: TreeHugger
Change-Id: I1c0fde7275eb3ebd3baf05ec62581b0243655608
2019-03-26 12:00:19 -07:00
Martin Stjernholm
5c074e0ab9 Remove links to libart(d).so in the runtime.
They are not needed since the binaries and relevant exported libraries have
moved to the Runtime APEX.

Test: Flash and boot
Test: atest CtsJniTestCases CtsJdwpTestCases
Bug: 119867084
Change-Id: If416fbae7057aec02059bb31a4dcd8b63dcc0cad
2019-03-26 17:24:12 +00:00
Nick Kralevich
138ab0ec52 Merge "Revert "libprocessgroup: make sure SetupCgroups is called once and only by init""
am: eac1220fba

Change-Id: Ibf1ea3109f51b98ecfadf2fa6f8fa53c535c99a5
2019-03-26 08:40:42 -07:00
Nick Kralevich
eac1220fba Merge "Revert "libprocessgroup: make sure SetupCgroups is called once and only by init"" 2019-03-26 15:28:31 +00:00
Christopher Ferris
7813345faa Add BuildId to frame information.
Update debuggerd to print BuildId information by default.

Bug: 120975492

Test: New unit tests pass.
Test: debuggerd -b <PID> shows build id information.
Test: tombstones include build id information.
Change-Id: I019b031113d0b77385516223c63455b868924440
2019-03-26 08:04:40 -07:00
Pete Bentley
5f920a0a57 Merge "Tighten native API surface."
am: d2c4eb0dae

Change-Id: I1733369762a612f53b23b8b4a5ce8d0ccc959d34
2019-03-26 02:30:52 -07:00
Pete Bentley
d2c4eb0dae Merge "Tighten native API surface." 2019-03-26 09:19:37 +00:00
Luke Huang
0f419320d3 Merge "Enlarge cmd buffer size of FrameworkListener"
am: 5f890050b7

Change-Id: I91c8bc1e3199b3be40b0c716a8df4b822254def5
2019-03-25 22:55:24 -07:00
Luke Huang
5f890050b7 Merge "Enlarge cmd buffer size of FrameworkListener" 2019-03-26 05:44:10 +00:00
Suren Baghdasaryan
c8ac3b9152 Revert "libprocessgroup: make sure SetupCgroups is called once and only by init"
This reverts commit 798e805715.

Reason for revert: causes SELinux policy denials when vold calls KillProcessesWithOpenFiles.

Bug: 129298168
Change-Id: Ie00bfc2b743757209b40b55d2ee038d7d20c73ff
2019-03-26 02:49:13 +00:00
Josh Gao
c6ad69d1d4 liblog: don't return 0xFFFFFFFF as an invalid log id.
There are a bunch of branches that check "id >= LOG_ID_MAX", but because
C++ hates you, this does a promotion to signed int despite the
fact that both sides of the comparison are the same enum with an
underlying type of unsigned int. (C++17 §7.6.3)

Return LOG_ID_MAX instead of a value that gets promoted to signed -1, to
avoid this.

Bug: http://b/129272512
Test: /data/nativetest64/logcat-unit-tests/logcat-unit-tests
Change-Id: I4b3ee662d76d5cc80d9a9625d17f7e5b5980de41
2019-03-25 16:41:39 -07:00
Suren Baghdasaryan
318e33a401 Merge "lmkd: Fix meminfo logs missing SwapTotal and having wrong field order"
am: eedd5f6855

Change-Id: I89f2abf04b6b50a69528ccd383b38bb83a8b164c
2019-03-25 15:28:17 -07:00
Suren Baghdasaryan
eedd5f6855 Merge "lmkd: Fix meminfo logs missing SwapTotal and having wrong field order" 2019-03-25 22:17:21 +00:00
Elliott Hughes
b574250b5b Merge "Add the two best build system janitors."
am: 8a5a918ef8

Change-Id: I628b238ac8931b333ab9e33e8f3b56d648f2ae92
2019-03-25 13:44:29 -07:00
Suren Baghdasaryan
7bb7f6ef28 Merge "libprocessgroup: make sure SetupCgroups is called once and only by init"
am: 7b2187c372

Change-Id: I1b1562f7042de6268bcd238adfdad1e8ffe6629e
2019-03-25 13:40:13 -07:00
Treehugger Robot
8a5a918ef8 Merge "Add the two best build system janitors." 2019-03-25 20:35:13 +00:00