Damien Bargiacchi
fdce0878f1
Always show the battery percentage unless it is unknown
...
am: 3f0250c3cc
2016-11-29 19:10:58 +00:00
Nick Vaccaro
610e0ec98f
Merge "healthd: allow override of wake interval timing" into cw-f-dev
...
am: a1be7d1bb5
2016-11-29 19:10:41 +00:00
Nick Vaccaro
75c815251c
Merge "resolve merge conflicts of 1f1a6fd to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
2016-11-29 19:08:45 +00:00
Josh Gao
0c484ca04a
Merge changes I1d03564f,I883e4e6c am: 5b21deb786
...
am: c58f49bf1b
2016-11-29 18:23:56 +00:00
Josh Gao
dfeb4ae52b
adb: be more permissive in test_push_error_reporting. am: 79ce3fe7db
...
am: b6e9e5ddde
2016-11-29 18:23:50 +00:00
Josh Gao
ebccf90991
adb: make sure that file mode macros match linux. am: 05a3abfef3
...
am: 68fd28e334
2016-11-29 18:23:44 +00:00
Josh Gao
c58f49bf1b
Merge changes I1d03564f,I883e4e6c
...
am: 5b21deb786
2016-11-29 18:18:50 +00:00
Josh Gao
b6e9e5ddde
adb: be more permissive in test_push_error_reporting.
...
am: 79ce3fe7db
2016-11-29 18:18:49 +00:00
Josh Gao
68fd28e334
adb: make sure that file mode macros match linux.
...
am: 05a3abfef3
2016-11-29 18:18:44 +00:00
Elliott Hughes
83b8df0e8c
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE"" am: a10bd47d60
...
am: c509c36892
2016-11-29 18:18:43 +00:00
Elliott Hughes
c509c36892
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE""
...
am: a10bd47d60
2016-11-29 18:14:19 +00:00
Treehugger Robot
5b21deb786
Merge changes I1d03564f,I883e4e6c
...
* changes:
adb: be more permissive in test_push_error_reporting.
adb: make sure that file mode macros match linux.
2016-11-29 18:13:07 +00:00
Treehugger Robot
a10bd47d60
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE""
2016-11-29 18:05:51 +00:00
Billy Lau
93d6a6fada
Merge "init: Reworked how we wait for COLDBOOT_DONE" am: 57c31d0f17
...
am: 6be1d976f6
2016-11-29 16:41:38 +00:00
Billy Lau
6be1d976f6
Merge "init: Reworked how we wait for COLDBOOT_DONE"
...
am: 57c31d0f17
2016-11-29 16:36:37 +00:00
Elliott Hughes
a452660d92
Revert "init: Reworked how we wait for COLDBOOT_DONE"
...
This reverts commit d36115ef2f
2016-11-29 16:34:56 +00:00
Billy Lau
57c31d0f17
Merge "init: Reworked how we wait for COLDBOOT_DONE"
2016-11-29 16:31:12 +00:00
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
431c355cb5
logd: mLastWorstPidOFSystem crash am: ab8ad62939
...
am: 045bd50ca4
2016-11-28 22:24:54 +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
93865880e5
Merge "toolbox: exit when failed to allocate buffer for ioctl" am: 16017b3fbb
...
am: a2c763de6f
2016-11-23 01:46:32 +00:00
Ting-Yuan Huang
a2c763de6f
Merge "toolbox: exit when failed to allocate buffer for ioctl"
...
am: 16017b3fbb
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
cb9fbb4cf6
Merge "change /data/bugreports to /bugreports" am: 1b2e6abf3b
...
am: 5fae86b5fa
2016-11-23 00:13:43 +00:00
Nick Kralevich
5fae86b5fa
Merge "change /data/bugreports to /bugreports"
...
am: 1b2e6abf3b
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
f8a4fc97d6
Merge "fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master" am: 72662414f6
...
am: 960584eeb0
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
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
c3bbcb885c
Merge "liblog: add private android_log_write_list_buffer()" am: 636c851f8d
...
am: a95e19abd2
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
2016-11-22 15:59:31 +00:00
Mark Salyzyn
a95e19abd2
Merge "liblog: add private android_log_write_list_buffer()"
...
am: 636c851f8d
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
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
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
70056e91fe
init.rc: delete extra whitespace
...
am: 715e33452e
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
6b74f73df3
Merge "Revert "Revert "init: create /dev/urandom, /dev/random in first stage.""" am: b6552f376c
...
am: 4b1a329309
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
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
Peter Enderborg
456df4099f
Merge "Add support for max_comp_streams option for zram" am: a9ea1e4d99
...
am: 3c4dfb6fc4
2016-11-18 23:31:01 +00:00
Peter Enderborg
3c4dfb6fc4
Merge "Add support for max_comp_streams option for zram"
...
am: a9ea1e4d99
2016-11-18 23:25:21 +00:00
