Joel Galenson
68e79940ea
Merge "Move chmod of /sys/kernel/debug/tracing to fix tracing." am: 13c3a582de
...
am: c4f2163954
Change-Id: Iecf99f50cc1201ccd743bd72494dd35b55068aa1
2017-07-28 16:14:53 +00:00
Joel Galenson
c4f2163954
Merge "Move chmod of /sys/kernel/debug/tracing to fix tracing."
...
am: 13c3a582de
Change-Id: I63ca85ffce7aead567c34069135fb066c5a026de
2017-07-28 16:12:23 +00:00
Treehugger Robot
13c3a582de
Merge "Move chmod of /sys/kernel/debug/tracing to fix tracing."
2017-07-28 16:07:48 +00:00
Joel Galenson
d48c4cf234
Move chmod of /sys/kernel/debug/tracing to fix tracing.
...
This is a temporary fix, since we're still not sure exactly what the
bug is.
Bug: 62547086
Test: Built, flashed, and booted Sailfish. Verified that the file has
the correct permission and that wifi and atrace work.
Change-Id: I43275e974a11754eca274f1b77d15cdd03a3b365
(cherry picked from commit 62962dd5b7 )
2017-07-27 18:06:40 -07:00
Christine Hallstrom
d356bed062
DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth am: 2e06a0ff6e -s ours am: 3c31204e68 -s ours
...
am: 3a66fd2174 -s ours
Change-Id: I164417e9a6e7995ec1f02d8dd71d14debde74cef
2017-07-27 22:38:35 +00:00
Christine Hallstrom
3a66fd2174
DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth am: 2e06a0ff6e -s ours
...
am: 3c31204e68 -s ours
Change-Id: I251108805c58aabdd41f31a015a6760ea36878e0
2017-07-27 22:35:35 +00:00
Christine Hallstrom
3c31204e68
DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth
...
am: 2e06a0ff6e -s ours
Change-Id: Ib595080a5bd778e6f844657c785708a37277633f
2017-07-27 22:33:22 +00:00
Christine Hallstrom
2e06a0ff6e
DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth
...
Bug: 62410937
Change-Id: Ic6ddba03ee6316dc54d5d41b35c90fe3d9057723
2017-07-27 20:55:12 +00:00
Tom Cherry
70c71dfe58
Merge "init: shutdown services in the opposite order that they started" am: 8e7942cbd1
...
am: 9f030d89dc
Change-Id: I5c83460633c56fcf740ca939b0dd931bee6854ab
2017-07-27 17:50:13 +00:00
Tom Cherry
9f030d89dc
Merge "init: shutdown services in the opposite order that they started"
...
am: 8e7942cbd1
Change-Id: Ibd6b25f77dc3f4033902ec25323ff4e6cab024a2
2017-07-27 17:48:12 +00:00
Tom Cherry
8e7942cbd1
Merge "init: shutdown services in the opposite order that they started"
2017-07-27 17:42:46 +00:00
Siqi Lin
227b806688
Merge "rootdir: record last build fingerprint" am: 4e8227420e
...
am: e5fa38c731
Change-Id: I1bfd0394849fc5b3c54eb951f0e21a49004e6f13
2017-07-27 14:35:27 +00:00
Siqi Lin
e5fa38c731
Merge "rootdir: record last build fingerprint"
...
am: 4e8227420e
Change-Id: I59664c816a8fbf4d7776270b28f4673418d30bcb
2017-07-27 14:33:02 +00:00
Treehugger Robot
4e8227420e
Merge "rootdir: record last build fingerprint"
2017-07-27 14:26:16 +00:00
Ben Fennema
ec7afe31a0
Merge "init: fix type of 2nd argument passed to prctl" am: 1b506c54c2
...
am: f01f4e9d4a
Change-Id: Ie84551e47139dbdbbf7a9a27a849718b43e00fa7
2017-07-27 07:00:28 +00:00
Ben Fennema
f01f4e9d4a
Merge "init: fix type of 2nd argument passed to prctl"
...
am: 1b506c54c2
Change-Id: I5b4de3ee0e55d99e8d63f98fdcbd39de70ff0337
2017-07-27 06:57:58 +00:00
Treehugger Robot
1b506c54c2
Merge "init: fix type of 2nd argument passed to prctl"
2017-07-27 06:51:52 +00:00
Ben Fennema
a72436067d
init: fix type of 2nd argument passed to prctl
...
prctl(PR_SET_SECUREBITS, ...) expects an unsigned long as its 2nd argument.
Passing in a int64_t happens to work with a 64-bit kernel, but does not
work with a 32-bit kernel.
Bug: 63680332
Test: boot 32-bit kernel; verify services with capabilities can successfully
set those capabilties
Change-Id: I60250d107a77b54b2e9fe3419b4480b921c7e2f8
Signed-off-by: Ben Fennema <fennema@google.com>
2017-07-27 03:31:18 +00:00
Tom Cherry
9d36683fd7
Merge "init: only use signed-integer-overflow sanitizer" am: a19f481c8c
...
am: 2eada2af9c
Change-Id: Ic0da94313de22222d4312cf097fd5dcd43c76344
2017-07-27 00:58:03 +00:00
Josh Gao
18e429af26
Merge "adbd: add logging to troubleshoot usb issues." am: 5550901152
...
am: 07c337bb7d
Change-Id: Idc911e96b8fc6698fea18c5a39eb4d786210ec58
2017-07-27 00:57:38 +00:00
Tom Cherry
2eada2af9c
Merge "init: only use signed-integer-overflow sanitizer"
...
am: a19f481c8c
Change-Id: I7f1e3ad1008f4d7d3588bbeca7c72bb0d9defeec
2017-07-27 00:49:55 +00:00
Josh Gao
07c337bb7d
Merge "adbd: add logging to troubleshoot usb issues."
...
am: 5550901152
Change-Id: I3ca18fdd1c55eaca10ad790a6678a7e9e8e974bb
2017-07-27 00:46:21 +00:00
Treehugger Robot
a19f481c8c
Merge "init: only use signed-integer-overflow sanitizer"
2017-07-27 00:20:11 +00:00
Treehugger Robot
5550901152
Merge "adbd: add logging to troubleshoot usb issues."
2017-07-27 00:17:15 +00:00
Tom Cherry
5938379e91
init: shutdown services in the opposite order that they started
...
Currently, the order that we kill to services during shutdown is the
order of services_ in ServiceManager and that is defacto the order in
which they were parsed, which is not a very useful ordering.
Related to this, we have seen a few issues during shutdown that may be
related to services with dependencies on other services, where the
dependency is killed first and the dependent service then misbehaves.
This change allows services to keep track of the order in which they
were started and shutdown then uses that information to kill running
services in the opposite order that they were started.
Bug: 64067984
Test: Boot and reboot bullhead
Change-Id: I6b4cacb03aed2a72ae98a346bce41ed5434a09c2
2017-07-26 16:48:06 -07:00
Siqi Lin
16bb36197b
rootdir: record last build fingerprint
...
We can't copy /default.prop so just write the value of
$(ro.build.fingerprint) to /data/misc/recovery/ro.build.fingerprint
and rotate it after reboot instead.
Bug: 62793047
Test: manual - reboot phone and check /data/misc/recovery
Change-Id: I130a4b7a01d9e1bfe9baecde2781626eb72e768b
(cherry picked from commit b9b76de6ff )
2017-07-26 16:45:10 -07:00
Tom Cherry
2ffd65e1d1
init: only use signed-integer-overflow sanitizer
...
We've blown up twice in init due to the unsigned integer overflow
sanitizer despite the overflows in question being both defined and
intentional.
Test: boot
Change-Id: I08effe3202ac1367d858982ff5478b3a088bab37
2017-07-26 14:25:25 -07:00
James Hawkins
dedcd34cd2
Merge "bootstat: Log even more boot reasons." am: 29b9411685
...
am: b4c27af150
Change-Id: I411e73d18c2977799b0d7855b0ce48c5edcdc338
2017-07-26 19:39:51 +00:00
James Hawkins
b4c27af150
Merge "bootstat: Log even more boot reasons."
...
am: 29b9411685
Change-Id: I2c326dab9f4f20da2e7cdeabc364c05eee460850
2017-07-26 19:35:51 +00:00
Treehugger Robot
29b9411685
Merge "bootstat: Log even more boot reasons."
2017-07-26 19:27:03 +00:00
Josh Gao
184f571cfd
adbd: add logging to troubleshoot usb issues.
...
Bug: http://b/63899881
Bug: http://b/63901259
Bug: http://b/63904904
Test: treehugger
Change-Id: Ifbc3caa6b416093bf8e127194003747c910352dc
2017-07-26 11:08:15 -07:00
Adam Lesinski
e88c6633af
Merge "Add definition of off64_t for mac os builds" am: 3e0b594619
...
am: 0b60b181c4
Change-Id: If6e297d32275dd20c9f3ec0f7da45c3715154c54
2017-07-26 00:12:03 +00:00
Adam Lesinski
0b60b181c4
Merge "Add definition of off64_t for mac os builds"
...
am: 3e0b594619
Change-Id: If2e9243a0f32e776676ef18c1933b8e2e649857c
2017-07-26 00:08:34 +00:00
Adam Lesinski
3e0b594619
Merge "Add definition of off64_t for mac os builds"
2017-07-25 23:55:00 +00:00
Adam Lesinski
5fff67f2ec
Add definition of off64_t for mac os builds
...
Mac OS does not define off64_t, since off_t is always 64 bit.
Test: manual
Change-Id: Ib02a912a2eaf38143e124f2b6aaf294ecf84ff88
2017-07-25 16:26:23 -07:00
James Hawkins
8d7f63da26
bootstat: Log even more boot reasons.
...
Bug: 27555866
Test: None
Change-Id: I8ab6597a323f5973d8b1c22c2c7422ef0c2efcc3
2017-07-25 15:58:48 -07:00
Adam Lesinski
0d4fcc5fc9
Merge "libziparchive: Use ReadAtOffset exclusively" am: a0360ad6a3
...
am: 67a3a88c24
Change-Id: Iaf778d8cbc1081844e753130a623cb7a463535f5
2017-07-25 22:33:44 +00:00
Lennart Wieboldt
8a8b97b271
Merge "Remove LOCAL_CLANG and clang: true" am: 80ec81cf4b
...
am: f7b315c985
Change-Id: Id5ebeb3271a36f21bf28c186f7ec227d31bb10ac
2017-07-25 22:33:27 +00:00
Adam Lesinski
67a3a88c24
Merge "libziparchive: Use ReadAtOffset exclusively"
...
am: a0360ad6a3
Change-Id: Ic6804698ca4c612f8f619c2684b1d2010e1ba024
2017-07-25 22:29:13 +00:00
Lennart Wieboldt
f7b315c985
Merge "Remove LOCAL_CLANG and clang: true"
...
am: 80ec81cf4b
Change-Id: Ia7f79d8e25ee9870fe44d198568d0e5dabdff811
2017-07-25 22:28:56 +00:00
Adam Lesinski
a0360ad6a3
Merge "libziparchive: Use ReadAtOffset exclusively"
2017-07-25 22:22:21 +00:00
Treehugger Robot
80ec81cf4b
Merge "Remove LOCAL_CLANG and clang: true"
2017-07-25 22:20:23 +00:00
Siarhei Vishniakou
a0e5e3abce
Merge "Add thread safety analysis annotations." am: e7ce8c8485
...
am: f23f21a231
Change-Id: Icbe910717db9805c06d761e79c435bb33d21d1cf
2017-07-25 21:46:53 +00:00
Siarhei Vishniakou
f23f21a231
Merge "Add thread safety analysis annotations."
...
am: e7ce8c8485
Change-Id: I4963b623b6e5a190bfee1dcfec01fe009ba0e94f
2017-07-25 21:42:54 +00:00
Treehugger Robot
e7ce8c8485
Merge "Add thread safety analysis annotations."
2017-07-25 21:37:27 +00:00
Wei Wang
34e13498dc
Merge "Do not umount roofs even if it is R/W." am: 43567e39dc
...
am: 22782a7269
Change-Id: I84024bff22fee8569c0f1193d6f3d8417d3cbc1b
2017-07-25 20:44:21 +00:00
Wei Wang
22782a7269
Merge "Do not umount roofs even if it is R/W."
...
am: 43567e39dc
Change-Id: I89bfb662469c28559eb628e48aee1ecb262ad2ee
2017-07-25 20:41:19 +00:00
Treehugger Robot
43567e39dc
Merge "Do not umount roofs even if it is R/W."
2017-07-25 20:35:50 +00:00
Steve Muckle
eb7db75c28
Merge "init: add support for global seccomp boot option" am: 9f1980e2fc
...
am: 5a79972238
Change-Id: Ide7500d4ff4d9eebf2fea1d81ff77044a6d63c57
2017-07-25 20:30:30 +00:00
Steve Muckle
5a79972238
Merge "init: add support for global seccomp boot option"
...
am: 9f1980e2fc
Change-Id: I35532202b360ef32cdb21c048cd3d2e1139b7d67
2017-07-25 20:26:29 +00:00