James Hawkins
ebe84bbcd4
Merge "bootstat: Fix the boot complete signal for FBE devices."
...
am: 6e5f730243
Change-Id: I18a54e10b495434a7a4b78d44d37814a09fbf919
2016-12-02 01:54:54 +00:00
Treehugger Robot
6e5f730243
Merge "bootstat: Fix the boot complete signal for FBE devices."
2016-12-02 01:46:46 +00:00
James Hawkins
e4079fbdef
bootstat: Fix the boot complete signal for FBE devices.
...
FBE devices suffice with bootanim=stopped, but must be gated on
ro.crypto.type=file.
Bug: 33049941
Test: adb reboot && adb logcat | grep bootstat < Has output
Change-Id: I346d47aaf9d1d4b40f05906056849630b922a20d
2016-12-01 14:02:17 -08:00
Mark Salyzyn
27123d52fc
Merge "liblog: fortify event_log_tags test"
...
am: de07029ad0
Change-Id: I70b7c3d0bf07c061a04f8770979efd7b87bc6cec
2016-12-01 17:45:58 +00:00
Treehugger Robot
de07029ad0
Merge "liblog: fortify event_log_tags test"
2016-12-01 17:24:33 +00:00
Wei Wang
c746ecbcbe
Merge "init: don't wait if we have more work to do"
...
am: 32ee9fc24a
Change-Id: Ie260a9e3d491b9108dc7681ede5a0e3ceac9ef79
2016-12-01 03:51:19 +00:00
Treehugger Robot
32ee9fc24a
Merge "init: don't wait if we have more work to do"
2016-12-01 03:45:41 +00:00
Wei Wang
16db4346a2
init: don't wait if we have more work to do
...
Bug: 33212253
Test: On marlin
Change-Id: I8502eaa73fac6953d358af01482760b3249cfd67
2016-11-30 18:09:29 -08:00
Jin Qian
eee645ec2a
Merge "fs_mgr: support to reserved some blocks for an ext2/3/4 partition."
...
am: bde6ddbbfa
-s ours
Change-Id: Icaac50e60b7ee881e593dea2ad5f10bf33aceb15
2016-12-01 01:52:43 +00:00
Jin Qian
bde6ddbbfa
Merge "fs_mgr: support to reserved some blocks for an ext2/3/4 partition."
2016-12-01 01:35:37 +00:00
Elliott Hughes
8656ed109b
Merge "Use hasmntopt(3) rather than reinventing the wheel."
...
am: 769a5a1962
Change-Id: I62541c0ff6961888239a7686bb37115b39fc787b
2016-11-30 22:49:53 +00:00
Elliott Hughes
769a5a1962
Merge "Use hasmntopt(3) rather than reinventing the wheel."
2016-11-30 22:32:44 +00:00
Mark Salyzyn
3cd9e31446
liblog: fortify event_log_tags test
...
Robustness fortification. Deal with gtest failure if event-log-tags
file is updated, adb sync for example, and thus will report
Shared_Dirty instead of Shared_Clear. Add check for Private_Dirty
and Private_Clean being clear at zero too as a bonus.
Test: gTest liblog-unit-tests --gtest_filter=liblog.event_log_tags
Bug: 31456426
Change-Id: Id912929fdd65499aa532a15653ef387a997a5054
2016-11-30 11:08:46 -08:00
Pirama Arumuga Nainar
66d86967bd
Merge "Statically link LLVM libraries into backtrace_test"
...
am: 9e8467a070
Change-Id: Iddd06215b4a696283f645080d4183dd524827af4
2016-11-30 18:36:16 +00:00
Pirama Arumuga Nainar
473f17cde0
Statically link LLVM libraries into backtrace_test
...
am: c198b150d4
Change-Id: I5d0db1329ac17a2a59cac589b9ab34c909f903ea
2016-11-30 18:36:14 +00:00
Treehugger Robot
9e8467a070
Merge "Statically link LLVM libraries into backtrace_test"
2016-11-30 18:27:39 +00:00
Elliott Hughes
65016074c2
Merge "init: Fix sync issue on property trigger."
...
am: 80d2f01fbf
Change-Id: Iae57b79abeb7a372c0e483316d328d5307c66b73
2016-11-30 17:54:31 +00:00
Pirama Arumuga Nainar
c198b150d4
Statically link LLVM libraries into backtrace_test
...
Bug: http://b/28866258
Remove dependency of backtrace_test on libLLVM. Also clean up
specification for libbacktrace_offline module. Since it is a static
library now, dependencies are only needed to automatically include
necessary headers.
Test: 32-bit and 64-bit backtrace_test passes on host and on Angler.
mma in system/extras/simpleperf, cts/tests/tests/simpleperf
m test-art-host
Change-Id: I76b0db14d067fa7b140a99edd237370ac04fe873
2016-11-30 17:43:20 +00:00
Elliott Hughes
80d2f01fbf
Merge "init: Fix sync issue on property trigger."
2016-11-30 17:39:55 +00:00
Elliott Hughes
8c1838823a
Use hasmntopt(3) rather than reinventing the wheel.
...
Bug: N/A
Test: "power off" still works
Change-Id: I11d3dc22f98ac71608c9929a3fd43319c787d49e
2016-11-30 09:37:17 -08:00
Mark Salyzyn
6878cd20e6
Merge "libcutils: tests"
...
am: bac388e424
Change-Id: I86a00ea257985836400b530c1e60bdc5e070dd00
2016-11-30 17:28:39 +00:00
Treehugger Robot
bac388e424
Merge "libcutils: tests"
2016-11-30 17:21:46 +00:00
Oleksiy Avramchenko
8a96f5e4a7
Merge "logcat: Fix --last usage option typo"
...
am: 95a53b8b7a
Change-Id: Ic18c2cec4c72cd97353c22f9e41c926baac8085b
2016-11-30 17:01:37 +00:00
Treehugger Robot
95a53b8b7a
Merge "logcat: Fix --last usage option typo"
2016-11-30 16:55:23 +00:00
Mark Salyzyn
815e0bd6fa
Merge "liblog: CTS test"
...
am: f1f7333e7c
Change-Id: I400e7c1aa53fd431102bff843e672ee1fe49e8f7
2016-11-30 16:34:05 +00:00
Treehugger Robot
f1f7333e7c
Merge "liblog: CTS test"
2016-11-30 16:25:11 +00:00
Mark Salyzyn
6b4a2ec603
Merge "liblog: event_tag_map benchmark"
...
am: 4afb3ef952
Change-Id: I986ef28441dc87f2ade0fd50ffceeb0a4beddf88
2016-11-30 15:37:33 +00:00
Treehugger Robot
4afb3ef952
Merge "liblog: event_tag_map benchmark"
2016-11-30 15:31:11 +00:00
Oleksiy Avramchenko
39e2d22b93
logcat: Fix --last usage option typo
...
Test: mm
Change-Id: I0b7a1615857acd4cd467f1ff1752eeae86d84eca
2016-11-30 13:42:14 +01:00
Nick Kralevich
84ccb2dbe0
Merge "ion.c: add O_CLOEXEC to /dev/ion open"
...
am: d91e35fb09
Change-Id: I97fcb4d10ae1a724fc24588f1ee3b0e783d40a62
2016-11-30 09:19:16 +00:00
Richard Uhler
3ff028c7db
Merge "debuggerd: Dump list of open files on process crash."
...
am: b675f7cd32
Change-Id: Iec231fc7eb57fa2c51aabc0fb75b4a09c47004cd
2016-11-30 09:18:57 +00:00
Treehugger Robot
d91e35fb09
Merge "ion.c: add O_CLOEXEC to /dev/ion open"
2016-11-30 07:54:48 +00:00
Treehugger Robot
b675f7cd32
Merge "debuggerd: Dump list of open files on process crash."
2016-11-30 07:53:09 +00:00
Dan Willemsen
695e6182d3
Merge changes Ia0ca36fc,Ib42c0635
...
am: 1abc3cd641
Change-Id: I67bfecac71d4fef20835dab3d226ec3d54847fa0
2016-11-30 06:06:07 +00:00
Dan Willemsen
32010171bd
Enable liblog on host bionic
...
am: 0910d2dbb9
Change-Id: I127b74998a678bc69c70cabcbdcf5586feb80172
2016-11-30 06:06:06 +00:00
Dan Willemsen
69b0123549
Enable libbase/libutils/libziparchive on host bionic
...
am: ab34b47b35
Change-Id: If8e762eace58a494efede9ef5cb09be99b74e5b8
2016-11-30 06:05:59 +00:00
Treehugger Robot
1abc3cd641
Merge changes Ia0ca36fc,Ib42c0635
...
* changes:
Enable liblog on host bionic
Enable libbase/libutils/libziparchive on host bionic
2016-11-30 05:59:53 +00:00
Daniel Rosenberg
895cd44bd9
Merge "Switch sdcardfs over to bind mounts."
...
am: 94b9e4df04
Change-Id: I2dc89613d382ea5fd86bd1a1736310d3e8e49dbc
2016-11-30 05:20:40 +00:00
Treehugger Robot
94b9e4df04
Merge "Switch sdcardfs over to bind mounts."
2016-11-30 05:15:33 +00:00
Nick Kralevich
604ed83934
Merge "delete toolbox/r.c"
...
am: 08f0c4c998
Change-Id: I2725b81599d2b90473a96e0748911ca3bbf46211
2016-11-30 04:32:54 +00:00
Treehugger Robot
08f0c4c998
Merge "delete toolbox/r.c"
2016-11-30 04:27:32 +00: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
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
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
10f4044341
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL"
...
am: 9bfd9f558b
Change-Id: Ief7fcc4f7dd8086186b38c091fed626560ca7215
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
Josh Gao
c58f49bf1b
Merge changes I1d03564f,I883e4e6c
...
am: 5b21deb786
Change-Id: I0a92e6f94174c76731159957172a6596cb9147ce
2016-11-29 18:18:50 +00:00
Josh Gao
b6e9e5ddde
adb: be more permissive in test_push_error_reporting.
...
am: 79ce3fe7db
Change-Id: I1239b5af85edca9ae6fa1a38f755b5707bbc614b
2016-11-29 18:18:49 +00:00