Prashant Malani
cfbf6d71a9
fs_mgr: Fix disable-verity for verifyatboot partitions
...
am: dd78ae75ff
2016-11-30 03:23:57 +00:00
Josh Gao
641a541a6f
Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718 am: 53a345a063 am: e3e5ea98b9 am: 9d7e954e22 am: 1a7f21d108 am: 62d55cdc90
...
am: b928a3485a
2016-11-30 03:23:42 +00:00
Josh Gao
f3e0563949
adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726 am: f55e22a7d3 am: df519a87fb am: 7f523007a1 am: 5a91535d1f am: d4b7250550 am: b71782888f am: 8dac33914a am: 2a201fff82
...
am: a198e406c8
2016-11-30 03:23:23 +00:00
Tianjie Xu
1ff7b760e7
DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: a7ba9ff00b am: 4f3df4e131 am: ccfb7619f4 -s ours am: 3bd49af10b -s ours am: af7dbf4d7a am: b01cb2a926 -s ours am: 778fff4ae8 am: 4e37d97d61 am: 0735bfdd3a am: d540186b0d -s ours am: f6e21cb1f8 am: dd11742510 am: 4f99cb9cb9
...
am: 268bdfb840
2016-11-30 03:23:04 +00:00
Tianjie Xu
8727b53a2f
Merge "DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket" into lmp-dev am: 40138b630c -s ours am: 65e59a4960 am: fb3d3904d0 -s ours am: 4b9c44dcf7 am: cc236b7e94 am: 76af41ef0a am: 18b8b0f168 -s ours am: 3ef91bbffa am: 0da14e91c6 am: 5e10383130
...
am: 80dc7605b9
2016-11-30 03:22:46 +00:00
Tianjie Xu
5a97ef91d8
DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: bef09aaf9e -s ours am: b1fada1564 am: 466a521607 -s ours am: ea11f5547c am: f93261010a am: 6a40db71f7 am: fc6c0a3480 -s ours am: 9df391f156 am: ab177b77f7 am: acdde34428
...
am: c706c7ffcc
2016-11-30 03:22:29 +00:00
Tom Cherry
524afcec4a
resolve merge conflicts of 34543c0 to nyc-mr1-dev-plus-aosp
...
Change-Id: I20f24693f201f1a15ded1fd6dfb6d56a58ebcaa8
2016-11-29 17:17:26 -08:00
Nick Kralevich
8a475f7e4a
delete toolbox/r.c
...
/dev/mem has been turned off on all Android kernels (b/19549480). This
utility cannot be used.
Test: android compiles.
Change-Id: I500021f224febb15dd8bfe6e1f6e5c398fe6f552
2016-11-29 15:45:11 -08:00
Nick Kralevich
6b694a76f5
ion.c: add O_CLOEXEC to /dev/ion open
...
Test: device boots and no obvious problems.
Change-Id: I0845b79de49b77878adaf6cd14cc506f7586cccb
2016-11-29 15:20:33 -08:00
Nick Vaccaro
9291de89b9
healthd: Show animation before waiting on timer
...
am: 6f8314900f
2016-11-29 21:40:59 +00:00
Nick Vaccaro
d918b70712
Merge "Enable CHARGER_ENABLE_SUSPEND to allow suspend" into cw-f-dev
...
am: 085c91bedd
2016-11-29 21:40:44 +00:00
Dan Willemsen
0910d2dbb9
Enable liblog on host bionic
...
Some of the __BIONIC__ checks were actually looking for an android
device. Host bionic has __BIONIC__, but not __ANDROID__.
Bug: 31559095
Test: Test linux_bionic compile
Change-Id: Ia0ca36fc9486fe8ea7e5d1b2e26ab0491903723c
2016-11-29 13:39:55 -08:00
Nick Vaccaro
b892613793
Merge "resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
2016-11-29 21:39:14 +00:00
Dan Willemsen
ab34b47b35
Enable libbase/libutils/libziparchive on host bionic
...
Bug: 31559095
Test: Test linux_bionic compile
Change-Id: Ib42c063532c1cbeb3e1418ab16a1fb54d5902aab
2016-11-29 13:38:53 -08:00
caozhiyuan
b104c502e1
init: Fix sync issue on property trigger.
...
This issue reproduces in the following senario.
1. ("", "") is added to queue;
2. property_triggers_enabled is set to 1;
3. user defined property is triggered, like sys.usb.config=adb;
4. ("sys.usb.config", "adb") is added to queue;
5. main loop interpret ("", "") and queue all current triggers to execution,
so ("sys.usb.config", "adb") is queued for execution for the first time.
6. main loop interpret ("sys.usb.config", "adb"), it is queued for
execution for a second time.
The second time makes ASIT fail.
Bug: http://b/28218187
Change-Id: I230e175e0dca8989f1e5bd812398da90082d0ec1
Signed-off-by: caozhiyuan <cao.zhiyuan@zte.com.cn>
2016-11-29 20:19:17 +00:00
Mark Salyzyn
857230c5d9
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL" am: 9bfd9f558b
...
am: 10f4044341
2016-11-29 19:51:50 +00:00
Mark Salyzyn
10f4044341
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL"
...
am: 9bfd9f558b
2016-11-29 19:46:50 +00:00
Treehugger Robot
9bfd9f558b
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL"
2016-11-29 19:37:48 +00:00
Nick Vaccaro
485c647432
resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp
...
Change-Id: Iba35210bc2133d79b2ba8ceb63e355507c7c0f03
2016-11-29 11:28:26 -08:00
Damien Bargiacchi
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
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
Mark Salyzyn
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
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
Mark Salyzyn
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
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
Daniel Rosenberg
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
Mark Salyzyn
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
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
