Christopher Ferris
24e5f851da
Merge "Add BuildId to frame information." am: 3da5fcbf70 am: 95b9ea1ddd
...
am: 36eb80073e
Change-Id: I9805df037b12432d1daa18c1accaa68669f635aa
2019-03-26 18:16:37 -07:00
Josh Gao
6107d0a26c
Merge "liblog: don't return 0xFFFFFFFF as an invalid log id." am: 49a8eecc5f am: eaf3841404
...
am: 216aabeab7
Change-Id: I3bc37e2b1a799386f1792477075d5a9b8ebe98d8
2019-03-26 18:15:02 -07:00
Josh Gao
3d26a86676
Merge changes I80af5f4b,I2fd0034e am: 2decb2fc3a am: c9a893c1eb
...
am: 448aed3c73
Change-Id: I783537a4b2ec10659c563b4461186d2230895e35
2019-03-26 18:08:11 -07:00
Christopher Ferris
36eb80073e
Merge "Add BuildId to frame information." am: 3da5fcbf70
...
am: 95b9ea1ddd
Change-Id: I82c95aa7d16f4705e7119167f1c93de28fc22e41
2019-03-26 17:52:31 -07:00
Josh Gao
216aabeab7
Merge "liblog: don't return 0xFFFFFFFF as an invalid log id." am: 49a8eecc5f
...
am: eaf3841404
Change-Id: Ie22e4650b4385a01d55052d60a54e4b92ffe3a23
2019-03-26 17:51:38 -07:00
Josh Gao
448aed3c73
Merge changes I80af5f4b,I2fd0034e am: 2decb2fc3a
...
am: c9a893c1eb
Change-Id: I7226d6078ecbd07f4bfcd9471e2ef25b0c7913b1
2019-03-26 17:50:43 -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
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
c45ba3e8bb
Merge changes from topic "lpdumpd" am: f959fffc1c am: ee7da7c711
...
am: 53c3f30d90
Change-Id: I48c0b2b59c48bdaf3c4fed8a03525f1fd2a9cf98
2019-03-26 16:40:04 -07:00
Yifan Hong
b3e0c1bdf8
liblp: Replace open with GetControlFileOrOpen am: 26328e80b1 am: 6c09f79eb1
...
am: f66d772e4f
Change-Id: I0d4bf6c75018d6d5aeaf36ce9b3b4cb75e3605d9
2019-03-26 16:38:57 -07:00
Yifan Hong
9718f571eb
init: expand prop in 'file' am: 567f1874fd am: 9d227e921f
...
am: 396dd7d2e8
Change-Id: Ie9bbc3723da28c1f6ab682c2d86e208adbde027d
2019-03-26 16:38:11 -07:00
Yifan Hong
82faf0949f
libcutils: android_get_control_file uses realpath. am: dd6eefca30 am: 877436dd25
...
am: 353d08605d
Change-Id: Ia22a3af3de76eace5f8cb6e58ebc2a8c9d59437f
2019-03-26 16:37:24 -07:00
Yifan Hong
53c3f30d90
Merge changes from topic "lpdumpd" am: f959fffc1c
...
am: ee7da7c711
Change-Id: Ia75e9367484478b5df5482ce949b9c6b7a89f9c7
2019-03-26 15:37:49 -07:00
Yifan Hong
f66d772e4f
liblp: Replace open with GetControlFileOrOpen am: 26328e80b1
...
am: 6c09f79eb1
Change-Id: Ic0898c029191d5b452d5e9660f4a8b703df08e9e
2019-03-26 15:36:58 -07:00
Yifan Hong
396dd7d2e8
init: expand prop in 'file' am: 567f1874fd
...
am: 9d227e921f
Change-Id: Id51b5f55a583d09ec644cf83ab1b121ce798062e
2019-03-26 15:36:18 -07:00
Yifan Hong
353d08605d
libcutils: android_get_control_file uses realpath. am: dd6eefca30
...
am: 877436dd25
Change-Id: Id5bd92bd726015459840ac3a414c9efdb3c970c0
2019-03-26 15:35:40 -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
Nick Kralevich
a8fbf49748
Merge "Revert "libprocessgroup: make sure SetupCgroups is called once and only by init"" am: eac1220fba am: 138ab0ec52
...
am: f7c4bfd616
Change-Id: Iadb882806d934fc9c9bfc6fe69478edd805dddb0
2019-03-26 08:49:28 -07:00
Nick Kralevich
f7c4bfd616
Merge "Revert "libprocessgroup: make sure SetupCgroups is called once and only by init"" am: eac1220fba
...
am: 138ab0ec52
Change-Id: I4064836753d4c7eb19762c0258d3701619246dc5
2019-03-26 08:44:57 -07: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
57616a7307
Merge "Tighten native API surface." am: d2c4eb0dae am: 5f920a0a57
...
am: ae89bfb67d
Change-Id: I73608d1d987c00a08452d98ebe13620eb1237d1b
2019-03-26 02:48:14 -07:00
Pete Bentley
ae89bfb67d
Merge "Tighten native API surface." am: d2c4eb0dae
...
am: 5f920a0a57
Change-Id: I905d0e33099761a637c94b0d998199a71cdeae7c
2019-03-26 02:39:26 -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
333671d94c
Merge "Enlarge cmd buffer size of FrameworkListener" am: 5f890050b7 am: 0f419320d3
...
am: 8f0d3cdafa
Change-Id: Ia53874838d9887cec89137d630fa76843df722a2
2019-03-25 23:03:46 -07:00
Luke Huang
8f0d3cdafa
Merge "Enlarge cmd buffer size of FrameworkListener" am: 5f890050b7
...
am: 0f419320d3
Change-Id: I3396300154582b0a14b1ed60e6d6dfd5243e0f0f
2019-03-25 23:00:36 -07: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
df30064601
Merge "lmkd: Fix meminfo logs missing SwapTotal and having wrong field order" am: eedd5f6855 am: 318e33a401
...
am: 1b7fb341f1
Change-Id: I1187c9c2ab83a086807ca76bd2ca28da5cd0b808
2019-03-25 15:37:05 -07:00
Suren Baghdasaryan
1b7fb341f1
Merge "lmkd: Fix meminfo logs missing SwapTotal and having wrong field order" am: eedd5f6855
...
am: 318e33a401
Change-Id: I229f6f19e3f7a29793484dc53d2ae5c6af5de8f2
2019-03-25 15:33:07 -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
bd17187590
Merge "Add the two best build system janitors." am: 8a5a918ef8 am: b574250b5b
...
am: 3b06c428dd
Change-Id: I43b69832a34a3ec766c50b1b4d6e27a233f4c814
2019-03-25 13:53:28 -07:00
Suren Baghdasaryan
7824023e0e
Merge "libprocessgroup: make sure SetupCgroups is called once and only by init" am: 7b2187c372 am: 7bb7f6ef28
...
am: bfdad9eaa2
Change-Id: Id15764d8292eb6cea58205e8beacb142175741e1
2019-03-25 13:50:27 -07:00
Elliott Hughes
3b06c428dd
Merge "Add the two best build system janitors." am: 8a5a918ef8
...
am: b574250b5b
Change-Id: I9c2d88927a7edd4742018483dc9863cacd55e4aa
2019-03-25 13:50:01 -07:00
Suren Baghdasaryan
bfdad9eaa2
Merge "libprocessgroup: make sure SetupCgroups is called once and only by init" am: 7b2187c372
...
am: 7bb7f6ef28
Change-Id: Ibadde55dfd606723f03e9656ca176d540c566167
2019-03-25 13:44:30 -07:00