David Anderson
4b519dc9ba
Merge "init: Support booting off GSIs installed to non-userdata block devices." am: 5aa37dc3dc am: 34a9f9e204
...
am: f8fad9d9c9
Change-Id: I66eb282c44f03acf8abcb63f815acd4104160d0a
2019-03-28 03:21:46 -07: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
Dimitry Ivanov
f6fd41c423
Merge "Add dependency on libdl_android"
2019-03-28 09:05:53 +00:00
Victor Hsieh
c4430f3489
Merge "Initialize fs-verity keys in shell script" am: 7f43e9fa40 am: ef787edd24
...
am: 98d7696248
Change-Id: Ie144188d08d295b1c34b1593772f74fed96a4197
2019-03-27 13:51:14 -07: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
d9c1711a77
Merge "charger: android_get_control_file on last_kmsg" am: ee9ba3efe7 am: d8209aa315
...
am: 0f905a7977
Change-Id: I0f23d287fa2ba0da00a3b9ad5b42fe6c8e7157d6
2019-03-27 12:41:32 -07: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
6ba5d996d7
Merge "Remove links to libart(d).so in the runtime." am: fdf70f1ba8 am: fd7f92372d
...
am: 0c0deebf98
Change-Id: If5fcd8b69ac72c436141140f155ad1c4d99524a4
2019-03-27 10:43:21 -07: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
Yao Chen
5f547f50c1
Merge "Report last atom tag of the failed stats log."
2019-03-27 16:21:17 +00:00
Elliott Hughes
d4214fa558
Merge "libprocessgroup: add -Wexit-time-destructors." am: 3312ca7e04 am: 4fcd52fdd0
...
am: 80ffd26c0e
Change-Id: I1e29235b637d14a249169743387680e2c26318c8
2019-03-27 08:55:52 -07: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
db6692b630
[automerger skipped] Merge "Logtags for com.android.server.policy" am: 29d2b05194 am: 59dcacc84d
...
am: aa6e045df2 -s ours
am skip reason: change_id Ida903499e9af8650299e3965787b4ac966b66915 with SHA1 6606d8df32 is in history
Change-Id: I3f751f86d6f721ec533c4304141b175d23e20fc2
2019-03-27 08:12:08 -07: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
94e63fcb04
Merge "libziparchive: add integer checks" am: 80e72443d0 am: d25aebd7b7
...
am: ec0c0e9158
Change-Id: I27d6db4f880689f966da899f90fa3a9dfa1ef608
2019-03-27 06:28:23 -07: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
8523bc2bbe
Merge "lmkd: set PSI_POLL_PERIOD to 10ms" am: e346d03c2b am: bbe0e86c73
...
am: fc3ccad7de
Change-Id: I36b9a34f8996e9db69cb5697bf752f9b330c9554
2019-03-26 22:23:58 -07: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
TreeHugger Robot
9dcec693e4
Merge "Logtags for com.android.server.policy"
2019-03-27 02:50:23 +00:00
Yao Chen
cf776d9b83
Report last atom tag of the failed stats log.
...
Test: manually tested with statsd
Change-Id: I4de61a2eea393e8518cb76147598778293440a81
2019-03-26 19:47:16 -07: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
e0a1be42cb
Merge changes Ia84ed9ec,I1c0fde72 am: 10533c57ed am: b6bc0075f4
...
am: d095e07371
Change-Id: I85cb7c71f37565e220a16ea6f21548887ef8e20c
2019-03-26 18:17:41 -07:00
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
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