Nick Vaccaro
1e811fca22
resolve merge conflicts of 1f1a6fd
to nyc-mr1-dev-plus-aosp
...
Change-Id: Ic07b6db6f47d2157aef0d04d025ba747d0a4247d
2016-11-28 14:58:30 -08:00
Mark Salyzyn
98b5137946
logd: mLastWorstPidOFSystem crash am: ab8ad62939
am: 045bd50ca4
-s ours
...
am: 431c355cb5
Change-Id: I48f34024eb634c3c2d63c2023db9019f95996161
2016-11-28 22:36:41 +00:00
Mark Salyzyn
431c355cb5
logd: mLastWorstPidOFSystem crash am: ab8ad62939
...
am: 045bd50ca4
-s ours
Change-Id: I5dfa731304b31ee2a986da4aae63f130e91c3c56
2016-11-28 22:24:54 +00:00
liminghao
043edd0b4e
fs_mgr: support to reserved some blocks for an ext2/3/4 partition.
...
am: 7ac1234b08
Change-Id: Iafbe1f2108f08f88f854a35f6774dad9d1827e03
2016-11-24 01:13:22 +00:00
liminghao
7ac1234b08
fs_mgr: support to reserved some blocks for an ext2/3/4 partition.
...
These reserved blocks used to root or claim to CAP_SYS_RESOURCES process.
Change-Id: I4893bdb08399bf31a7640d4a63f4952cd636576f
Merged-In: I4893bdb08399bf31a7640d4a63f4952cd636576f
Signed-off-by: liminghao <liminghao@xiaomi.com>
2016-11-23 14:58:13 -08:00
Ting-Yuan Huang
d05783f75d
Merge "toolbox: exit when failed to allocate buffer for ioctl" am: 16017b3fbb
am: a2c763de6f
...
am: 93865880e5
Change-Id: I4cf73ee6b9cdd1c1fda73a03b9299ac40adc235b
2016-11-23 01:48:31 +00:00
Ting-Yuan Huang
93865880e5
Merge "toolbox: exit when failed to allocate buffer for ioctl" am: 16017b3fbb
...
am: a2c763de6f
Change-Id: I1f827779131f45444f1ed3c42ad5b6dfea14cfe5
2016-11-23 01:46:32 +00:00
Ting-Yuan Huang
a2c763de6f
Merge "toolbox: exit when failed to allocate buffer for ioctl"
...
am: 16017b3fbb
Change-Id: I9b83aa7be127654ab1997393cd118d57d01a1122
2016-11-23 01:44:02 +00:00
Treehugger Robot
16017b3fbb
Merge "toolbox: exit when failed to allocate buffer for ioctl"
2016-11-23 01:40:04 +00:00
Nick Kralevich
c3f9d38a4c
Merge "change /data/bugreports to /bugreports" am: 1b2e6abf3b
am: 5fae86b5fa
...
am: cb9fbb4cf6
Change-Id: I9bf9253db9377ac81f2a37f8976e042fd54f74c2
2016-11-23 00:16:14 +00:00
Nick Kralevich
cb9fbb4cf6
Merge "change /data/bugreports to /bugreports" am: 1b2e6abf3b
...
am: 5fae86b5fa
Change-Id: I2df004fd046f3bae8732d0cba128e19c64814db4
2016-11-23 00:13:43 +00:00
Nick Kralevich
5fae86b5fa
Merge "change /data/bugreports to /bugreports"
...
am: 1b2e6abf3b
Change-Id: I7de15de91a688f8fe4a203a84b54e7dcfa106782
2016-11-23 00:11:13 +00:00
Treehugger Robot
1b2e6abf3b
Merge "change /data/bugreports to /bugreports"
2016-11-23 00:06:30 +00:00
Ting-Yuan Huang
1c2f612c18
toolbox: exit when failed to allocate buffer for ioctl
...
This is a "shouldn't happen" case.
Test: make WITH_TIDY=1 mmma system/core/toolbox
Change-Id: I51e44e17837b03d6df6f8c4c3e1aeab8253e094d
2016-11-22 15:33:34 -08:00
Billy Lau
d36115ef2f
init: Reworked how we wait for COLDBOOT_DONE
...
Bug: 31800756
Instead of strictly timing out after 1s waiting for COLDBOOT_DONE,
we wait for a considerably longer period of time, which would also
allow slower non-production heavily instrumented debug builds to
boot up.
Upon successful wait, we measure the time taken and record the
value into a system property: ro.cold_boot.duration.
If timeout is still reached, we log an error message and abandon
boot process, rebooting into recovery mode instead.
Change-Id: Ic1df80546d8721b0e8c998ff294d5c5102de4e98
2016-11-22 21:25:02 +00:00
Jin Qian
2edf6d5579
Merge "fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master" am: 72662414f6
am: 960584eeb0
...
am: f8a4fc97d6
-s ours
Change-Id: I7180d073692bca1df2207c20fe3365565f988fcc
2016-11-22 18:56:28 +00:00
Jin Qian
f8a4fc97d6
Merge "fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master" am: 72662414f6
...
am: 960584eeb0
Change-Id: I98543758b3a7dfdca058fc1f8a61d31454f971e2
2016-11-22 18:50:33 +00:00
Jin Qian
960584eeb0
Merge "fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master"
...
am: 72662414f6
Change-Id: I2d761ee4db65f6c5c98f3cea2f58588e4bc66ec5
2016-11-22 18:47:38 +00:00
Jin Qian
72662414f6
Merge "fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master"
2016-11-22 18:42:39 +00:00
Nick Kralevich
c4084c6694
change /data/bugreports to /bugreports
...
It's 5 characters shorter, has no runtime costs, can be stored on a
read-only partition, and avoids problems like b/27262109 and b/27204904.
It allows makes some security hardening easier.
Bug: 27262109
Bug: 27204904
Bug: 32799236
Test: verified new symlink created and old one not present
Change-Id: Ief362e13569ad9c868a7f0f9c4dbd6a328c96c6b
2016-11-22 08:57:25 -08:00
Mark Salyzyn
a1817f68b0
Merge "liblog: add private android_log_write_list_buffer()" am: 636c851f8d
am: a95e19abd2
...
am: c3bbcb885c
Change-Id: Ic526ef78294e4ca43703b450350653b2e324c9a3
2016-11-22 16:02:15 +00:00
Mark Salyzyn
cc451d6a70
Merge "liblog: move android_log_event_context class to log/log_event_list.h" am: 418558f8af
am: d96b925d9c
...
am: ef7df80ea3
Change-Id: I56d922c235e7916f82a34f97d06cca6930846575
2016-11-22 16:02:01 +00:00
Mark Salyzyn
c3bbcb885c
Merge "liblog: add private android_log_write_list_buffer()" am: 636c851f8d
...
am: a95e19abd2
Change-Id: I06d63ab4b34a6033f1ecde4671e488aa88ed4f90
2016-11-22 15:59:46 +00:00
Mark Salyzyn
ef7df80ea3
Merge "liblog: move android_log_event_context class to log/log_event_list.h" am: 418558f8af
...
am: d96b925d9c
Change-Id: I5eb81613ed74a6e95fd0e0f2d2f0e3f760b2fdfd
2016-11-22 15:59:31 +00:00
Mark Salyzyn
a95e19abd2
Merge "liblog: add private android_log_write_list_buffer()"
...
am: 636c851f8d
Change-Id: If0c24576c69b9d2aad6637c7548d61f79173e932
2016-11-22 15:56:49 +00:00
Mark Salyzyn
d96b925d9c
Merge "liblog: move android_log_event_context class to log/log_event_list.h"
...
am: 418558f8af
Change-Id: I4f537d4010e60b86ad4f565135804cf92fa7bd37
2016-11-22 15:56:32 +00:00
Treehugger Robot
636c851f8d
Merge "liblog: add private android_log_write_list_buffer()"
2016-11-22 15:53:32 +00:00
Treehugger Robot
418558f8af
Merge "liblog: move android_log_event_context class to log/log_event_list.h"
2016-11-22 15:51:38 +00:00
Josh Gao
79ce3fe7db
adb: be more permissive in test_push_error_reporting.
...
Be agnostic to whether /system is writable when testing push error
reporting.
Test: python test_device.py
Change-Id: I1d03564fa35442c20e2c96a7f5b56d39868efc52
2016-11-21 18:39:21 -08:00
Josh Gao
05a3abfef3
adb: make sure that file mode macros match linux.
...
We use <sys/stat.h> mode macros on the host to parse modes sent over
from the device, so they had better match. Add static_asserts to ensure
this.
(Also, fix the cases where they don't.)
Test: mma -j48, compiled the static_asserts on darwin manually
Change-Id: I883e4e6c7489ea64d3c02d26790ac8293366d989
2016-11-21 18:39:21 -08:00
Mark Salyzyn
1179eb8048
system/core: replace EVENT_TAG_MAP_FILE with NULL
...
NULL represents system default. In the future, NULL could represent
static and dynamic tags, which can come from multiple files based on
implementation details in the liblog library.
Test: gTest logd-unit-tests & liblog-unit-tests
Bug: 31456426
Change-Id: I0e3d296de81ca299ae63d7b83781639ee67ec298
2016-11-21 11:13:02 -08:00
Mark Salyzyn
2ca4f49476
liblog: add private android_log_write_list_buffer()
...
Allows us to compose an event message for our own in-memory purposes.
Will be used to compose an event message in logd and directly write
it to just the pmsg buffer. Provide an internal enhanced C++ wrapper
for event handling.
Test: gTest liblog-unit-tests --gtest_filter=liblog.android_log_write_list_buffer
Bug: 31456426
Change-Id: I98246898ba580f9e506baba8af2fd1b26a2a8aae
2016-11-21 09:46:39 -08:00
Mark Salyzyn
472245d962
liblog: move android_log_event_context class to log/log_event_list.h
...
rename class from android_log_event_context to android_log_event_list
Test: gTest logcat-unit-tests
Bug: 31992412
Bug: 31456426
Change-Id: Ib61cbca7d453837d64959c56b0e11f8c5edbfbdd
2016-11-21 09:46:34 -08:00
Nick Kralevich
6bef57560f
init.rc: delete extra whitespace am: 715e33452e
...
am: 70056e91fe
Change-Id: Ic475f870c768831d9e246f9bc26fd35dd0032268
2016-11-20 01:06:05 +00:00
Nick Kralevich
70056e91fe
init.rc: delete extra whitespace
...
am: 715e33452e
Change-Id: Id6ea87d2e10ac10f653f52714a1db6cb654fc974
2016-11-20 01:02:34 +00:00
Nick Kralevich
715e33452e
init.rc: delete extra whitespace
...
causes merge conflicts.
Test: none
Change-Id: Ic83db2b3e2f972955efadfc8df8fe8ec918a7609
2016-11-19 16:07:40 -08:00
Evgenii Stepanov
b047f46cdc
Merge "Revert "Revert "init: create /dev/urandom, /dev/random in first stage.""" am: b6552f376c
am: 4b1a329309
...
am: 6b74f73df3
Change-Id: I000892d7e464626fe0a541e1a0392d984ba6d49b
2016-11-19 00:58:33 +00:00
Evgenii Stepanov
6b74f73df3
Merge "Revert "Revert "init: create /dev/urandom, /dev/random in first stage.""" am: b6552f376c
...
am: 4b1a329309
Change-Id: I117873a695d351931b97625dbec9487c0858a975
2016-11-19 00:55:02 +00:00
Evgenii Stepanov
4b1a329309
Merge "Revert "Revert "init: create /dev/urandom, /dev/random in first stage."""
...
am: b6552f376c
Change-Id: I3291276426ad5e1acb457da7ad938958d7f0f461
2016-11-19 00:51:33 +00:00
Treehugger Robot
b6552f376c
Merge "Revert "Revert "init: create /dev/urandom, /dev/random in first stage."""
2016-11-19 00:48:14 +00:00
Jin Qian
0067e03251
fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master
...
Change-Id: I53a8c6158b4dd1bf5e14ef0a842b7f43ca8bae31
2016-11-18 16:38:40 -08:00
Jin Qian
c64f11ef64
resolve merge conflicts of 456df40
to nyc-mr2-dev-plus-aosp
...
Change-Id: I968f88ea425fb69a0395451fa290f1947e185859
2016-11-18 15:55:51 -08:00
Peter Enderborg
456df4099f
Merge "Add support for max_comp_streams option for zram" am: a9ea1e4d99
...
am: 3c4dfb6fc4
Change-Id: Icd88ade981256ce396477d519934025c9410c92c
2016-11-18 23:31:01 +00:00
Peter Enderborg
3c4dfb6fc4
Merge "Add support for max_comp_streams option for zram"
...
am: a9ea1e4d99
Change-Id: I0ef7127e1352b7dc9ae226bee7fe340d864f97ab
2016-11-18 23:25:21 +00:00
Treehugger Robot
a9ea1e4d99
Merge "Add support for max_comp_streams option for zram"
2016-11-18 23:09:44 +00:00
Evgenii Stepanov
102daa30a3
Revert "Revert "init: create /dev/urandom, /dev/random in first stage.""
...
This reverts commit 4c8a76e250
.
Test: booted angler-userdebug
Change-Id: I2257a44b7cf624065e5653754062a117f3e44c98
2016-11-18 15:09:18 -08:00
Peter Enderborg
4d217f02d3
Add support for max_comp_streams option for zram
...
With this option the fstab can include a parameter for zram
the enables more streams for kernels that does not have
dynamic stream task handling.
Test: Made sure max_comp_streams is set according to fstab.
Change-Id: I22e158a075a8a86b4e80d3b13989896929c0d223
2016-11-18 21:19:25 +00:00
Mark Salyzyn
f2cb1f00da
Merge "logd: add EXIT command" am: 16300f192b
am: 2cfd0e08e9
...
am: e8c605a43d
Change-Id: I8285a5a76286250252840de9103c4a088d6b44df
2016-11-18 16:16:54 +00:00
Mark Salyzyn
e8c605a43d
Merge "logd: add EXIT command" am: 16300f192b
...
am: 2cfd0e08e9
Change-Id: Ibf18f74d7192944a5cc5c3640a8f45350a8a3883
2016-11-18 16:13:24 +00:00
Mark Salyzyn
2cfd0e08e9
Merge "logd: add EXIT command"
...
am: 16300f192b
Change-Id: Idd68cfba26f8fcc928db4fe2483d30e5d4f49a59
2016-11-18 16:10:23 +00:00