Suren Baghdasaryan
bb07f38278
Merge "libprocessgroup: restrict SetupCgroups to one-time usage and only by init" am: 81cfeb54fc
...
am: f5b778131b
Change-Id: I9261786a87b46525c3642d33157e0a0863580d5d
2019-03-28 10:30:11 -07:00
Suren Baghdasaryan
f5b778131b
Merge "libprocessgroup: restrict SetupCgroups to one-time usage and only by init"
...
am: 81cfeb54fc
Change-Id: I3b6f30348624462212d17655df6dde9aff71de15
2019-03-28 10:25:25 -07:00
Suren Baghdasaryan
81cfeb54fc
Merge "libprocessgroup: restrict SetupCgroups to one-time usage and only by init"
2019-03-28 17:13:09 +00:00
Martin Stjernholm
e7540ff272
Merge "Apply the standard system linker config to all of /data." am: 60de348654
...
am: 0ec4836b71
Change-Id: I10a4012575ad5f9be3c5dd3d116c5745124ae2e6
2019-03-28 05:54:18 -07:00
Martin Stjernholm
0ec4836b71
Merge "Apply the standard system linker config to all of /data."
...
am: 60de348654
Change-Id: I72caf5af3d65b695e0f240b0e55538d40d3b0c5b
2019-03-28 05:50:11 -07:00
Martin Stjernholm
60de348654
Merge "Apply the standard system linker config to all of /data."
2019-03-28 12:37:29 +00:00
David Anderson
f8fad9d9c9
Merge "init: Support booting off GSIs installed to non-userdata block devices." am: 5aa37dc3dc
...
am: 34a9f9e204
Change-Id: I340913a23a717db7b2276fe319b01076a57bed79
2019-03-28 03:08:27 -07:00
David Anderson
34a9f9e204
Merge "init: Support booting off GSIs installed to non-userdata block devices."
...
am: 5aa37dc3dc
Change-Id: Ic9f9a6ea6e44dec0c7abe4d9ae19cb6ca67f8a0b
2019-03-28 02:59:43 -07:00
David Anderson
5aa37dc3dc
Merge "init: Support booting off GSIs installed to non-userdata block devices."
2019-03-28 09:46:44 +00:00
Suren Baghdasaryan
5b53573671
libprocessgroup: restrict SetupCgroups to one-time usage and only by init
...
SetupCgroups is called by init process during early-init stage and is not
supposed to be called again by anyone else. Ensure that the caller is the
init process, make sure cgroup.rc file is written only one time, keep the
file descriptor to cgroup.rc file open by the init process to ensure all
its further mappings stay valid even if the file is deleted.
Bug: 124774415
Test: build, run, verify no errors or warning in the logcat
Change-Id: Ib8822cf0112db7744e28d442182d54dcf06f46f2
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-03-28 01:25:22 +00:00
Victor Hsieh
98d7696248
Merge "Initialize fs-verity keys in shell script" am: 7f43e9fa40
...
am: ef787edd24
Change-Id: Id4a6ad1f890e79acfff50c32b57c920f19518bd9
2019-03-27 13:47:01 -07:00
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
0f905a7977
Merge "charger: android_get_control_file on last_kmsg" am: ee9ba3efe7
...
am: d8209aa315
Change-Id: I61f5e7dcca97aa5cf2d1e170d2e6a2e77eaf3dd9
2019-03-27 12:20:46 -07: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
0c0deebf98
Merge "Remove links to libart(d).so in the runtime." am: fdf70f1ba8
...
am: fd7f92372d
Change-Id: I98a351494d6cd9e4f79245bdb9b20fde3dccfe66
2019-03-27 10:35:54 -07: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
80ffd26c0e
Merge "libprocessgroup: add -Wexit-time-destructors." am: 3312ca7e04
...
am: 4fcd52fdd0
Change-Id: Iea468fd1c7d1c2e83e693c9b5afd0b81e4ce6e9a
2019-03-27 08:51:36 -07: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
aa6e045df2
Merge "Logtags for com.android.server.policy" am: 29d2b05194
...
am: 59dcacc84d
Change-Id: Ibb24ab19174b701d32a978b76b336c1c84d4f2ff
2019-03-27 07:59:57 -07: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
ec0c0e9158
Merge "libziparchive: add integer checks" am: 80e72443d0
...
am: d25aebd7b7
Change-Id: I2895fa552d2390a133e9e345f1acecf9be9517c7
2019-03-27 06:20:51 -07: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
fc3ccad7de
Merge "lmkd: set PSI_POLL_PERIOD to 10ms" am: e346d03c2b
...
am: bbe0e86c73
Change-Id: I5cc97b7f87cfb356127ab379695d77acd408c828
2019-03-26 22:19:29 -07: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
d095e07371
Merge changes Ia84ed9ec,I1c0fde72 am: 10533c57ed
...
am: b6bc0075f4
Change-Id: I4371bb9df7da381a7b8630a3b1c6a6afefbc5e73
2019-03-26 17:53:30 -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
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
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