485c647432
resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp
...
Change-Id: Iba35210bc2133d79b2ba8ceb63e355507c7c0f03
2016-11-29 11:28:26 -08:00
b0686f88cf
Merge "Always show the battery percentage unless it is unknown" into cw-f-dev am: cd542213e8
...
am: f2fabc9926
2016-11-29 19:16:45 +00:00
bbff20dc1d
Always show the battery percentage unless it is unknown am: 3f0250c3cc
...
am: fdce0878f1
2016-11-29 19:16:30 +00:00
7216ba476f
Merge "healthd: allow override of wake interval timing" into cw-f-dev am: a1be7d1bb5
...
am: 610e0ec98f
2016-11-29 19:16:11 +00:00
e5f6c292ca
Merge "resolve merge conflicts of 1f1a6fd to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
...
am: 75c815251c
2016-11-29 19:15:49 +00:00
4cf68bd5e4
resolve merge conflicts of 1f1a6fd to nyc-mr1-dev-plus-aosp
...
am: 1e811fca22
2016-11-29 19:15:48 +00:00
f2fabc9926
Merge "Always show the battery percentage unless it is unknown" into cw-f-dev
...
am: cd542213e8
2016-11-29 19:10:59 +00:00
fdce0878f1
Always show the battery percentage unless it is unknown
...
am: 3f0250c3cc
2016-11-29 19:10:58 +00:00
610e0ec98f
Merge "healthd: allow override of wake interval timing" into cw-f-dev
...
am: a1be7d1bb5
2016-11-29 19:10:41 +00:00
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
77a97a62d0
Merge changes I1d03564f,I883e4e6c am: 5b21deb786 am: c58f49bf1b
...
am: 0c484ca04a
2016-11-29 18:28:53 +00:00
299ddad6ee
adb: be more permissive in test_push_error_reporting. am: 79ce3fe7db am: b6e9e5ddde
...
am: dfeb4ae52b
2016-11-29 18:28:49 +00:00
22436ab727
adb: make sure that file mode macros match linux. am: 05a3abfef3 am: 68fd28e334
...
am: ebccf90991
2016-11-29 18:28:44 +00:00
0c484ca04a
Merge changes I1d03564f,I883e4e6c am: 5b21deb786
...
am: c58f49bf1b
2016-11-29 18:23:56 +00:00
dfeb4ae52b
adb: be more permissive in test_push_error_reporting. am: 79ce3fe7db
...
am: b6e9e5ddde
2016-11-29 18:23:50 +00:00
e12635cc34
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE"" am: a10bd47d60 am: c509c36892
...
am: 83b8df0e8c
2016-11-29 18:23:44 +00:00
ebccf90991
adb: make sure that file mode macros match linux. am: 05a3abfef3
...
am: 68fd28e334
2016-11-29 18:23:44 +00:00
c58f49bf1b
Merge changes I1d03564f,I883e4e6c
...
am: 5b21deb786
2016-11-29 18:18:50 +00:00
b6e9e5ddde
adb: be more permissive in test_push_error_reporting.
...
am: 79ce3fe7db
2016-11-29 18:18:49 +00:00
68fd28e334
adb: make sure that file mode macros match linux.
...
am: 05a3abfef3
2016-11-29 18:18:44 +00:00
83b8df0e8c
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE"" am: a10bd47d60
...
am: c509c36892
2016-11-29 18:18:43 +00:00
c509c36892
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE""
...
am: a10bd47d60
2016-11-29 18:14:19 +00:00
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
678194ddac
libcutils: tests
...
Respect "android" and "not_windows" (linux + darwin). This
means the string test and control support routines were not
being tested on android.
Test: gTest libcutils_test
Bug: 32450474
Change-Id: I9505fefeb0a4a8c5b54aa637812b4f3c07c2893c
2016-11-29 10:08:12 -08:00
a10bd47d60
Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE""
2016-11-29 18:05:51 +00:00
d885cfbef1
Merge "init: Reworked how we wait for COLDBOOT_DONE" am: 57c31d0f17 am: 6be1d976f6
...
am: 93d6a6fada
2016-11-29 16:46:37 +00:00
93d6a6fada
Merge "init: Reworked how we wait for COLDBOOT_DONE" am: 57c31d0f17
...
am: 6be1d976f6
2016-11-29 16:41:38 +00:00
52ed8c68ee
liblog: CTS test
...
Utilize liblog-unit-tests as a CTS test
Replacement for EventLogTest#testWriteEventWithOversizeValue
along with some other mandatory logging functionality.
Test: run cts tests
Bug: 26235244
Change-Id: I71f549bd0b93f6c41e1f91565b0fbddf042e4991
2016-11-29 08:40:16 -08:00
6be1d976f6
Merge "init: Reworked how we wait for COLDBOOT_DONE"
...
am: 57c31d0f17
2016-11-29 16:36:37 +00:00
a452660d92
Revert "init: Reworked how we wait for COLDBOOT_DONE"
...
This reverts commit d36115ef2f
2016-11-29 16:34:56 +00:00
57c31d0f17
Merge "init: Reworked how we wait for COLDBOOT_DONE"
2016-11-29 16:31:12 +00:00
fc592327a9
Switch sdcardfs over to bind mounts.
...
Sdcardfs has been modified to use bind mounts
in place of three separate mounts. This lowers
resource usage, and removes a number of race
conditions around updates via differnt views.
Test: Run storage cts tests with sdcardfs enabled
Change-Id: Icdc196ba3d6f46d54d27ef91c01ffebcf81dd47e
2016-11-28 20:07:54 -08:00
0b37d01f72
liblog: event_tag_map benchmark
...
Tested on Hikey, all services stopped, shell only access, CPUs not
locked.
$ /data/nativetest64/liblog-benchmarks/liblog-benchmarks BM_lookupEvent*
iterations ns/op
Precharge: start
Precharge: stop 231
BM_lookupEventTag 10000000 153
BM_lookupEventTag_NOT 20000000 139
BM_lookupEventFormat 10000000 153
Test: run benchmarks
Bug: 31456426
Change-Id: Ice3ffa0b061d9a6b917718b2d9aedcc2348b7005
2016-11-28 15:15:58 -08:00
1e811fca22
resolve merge conflicts of 1f1a6fd to nyc-mr1-dev-plus-aosp
...
Change-Id: Ic07b6db6f47d2157aef0d04d025ba747d0a4247d
2016-11-28 14:58:30 -08:00
98b5137946
logd: mLastWorstPidOFSystem crash am: ab8ad62939 am: 045bd50ca4 -s ours
...
am: 431c355cb5
2016-11-28 22:36:41 +00:00
431c355cb5
logd: mLastWorstPidOFSystem crash am: ab8ad62939
...
am: 045bd50ca4
2016-11-28 22:24:54 +00:00
043edd0b4e
fs_mgr: support to reserved some blocks for an ext2/3/4 partition.
...
am: 7ac1234b08
2016-11-24 01:13:22 +00:00
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
d05783f75d
Merge "toolbox: exit when failed to allocate buffer for ioctl" am: 16017b3fbb am: a2c763de6f
...
am: 93865880e5
2016-11-23 01:48:31 +00:00
93865880e5
Merge "toolbox: exit when failed to allocate buffer for ioctl" am: 16017b3fbb
...
am: a2c763de6f
2016-11-23 01:46:32 +00:00
a2c763de6f
Merge "toolbox: exit when failed to allocate buffer for ioctl"
...
am: 16017b3fbb
2016-11-23 01:44:02 +00:00
16017b3fbb
Merge "toolbox: exit when failed to allocate buffer for ioctl"
2016-11-23 01:40:04 +00:00
c3f9d38a4c
Merge "change /data/bugreports to /bugreports" am: 1b2e6abf3b am: 5fae86b5fa
...
am: cb9fbb4cf6
2016-11-23 00:16:14 +00:00
cb9fbb4cf6
Merge "change /data/bugreports to /bugreports" am: 1b2e6abf3b
...
am: 5fae86b5fa
2016-11-23 00:13:43 +00:00
5fae86b5fa
Merge "change /data/bugreports to /bugreports"
...
am: 1b2e6abf3b
2016-11-23 00:11:13 +00:00
1b2e6abf3b
Merge "change /data/bugreports to /bugreports"
2016-11-23 00:06:30 +00:00
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
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
2edf6d5579
Merge "fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master" am: 72662414f6 am: 960584eeb0
...
am: f8a4fc97d6
2016-11-22 18:56:28 +00:00
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
Nick Vaccaro