Erick Reyes
dde98330cb
Merge "libmeminfo: make libdmabufinfo and dmabuf_dump vendor available" am: 2d31b4b023
...
am: 9321874f2e
2019-02-10 08:18:20 -08:00
Erick Reyes
9321874f2e
Merge "libmeminfo: make libdmabufinfo and dmabuf_dump vendor available"
...
am: 2d31b4b023
2019-02-10 08:15:09 -08:00
Treehugger Robot
2d31b4b023
Merge "libmeminfo: make libdmabufinfo and dmabuf_dump vendor available"
2019-02-10 14:54:53 +00:00
Jiyong Park
76a125bf4e
Merge "Eliminate the APEX name in fs_config using wildcard" am: ea353cab91
...
am: 2e0f43c6ba
2019-02-08 17:45:37 -08:00
Jiyong Park
2e0f43c6ba
Merge "Eliminate the APEX name in fs_config using wildcard"
...
am: ea353cab91
2019-02-08 17:41:27 -08:00
Martin Stjernholm
2f5fb2ba2c
Merge "Revert^2 "Enable APEX stubs for libnativeloader."" am: 03cb8010ef
...
am: 41c92187a5
2019-02-08 17:37:36 -08:00
Treehugger Robot
ea353cab91
Merge "Eliminate the APEX name in fs_config using wildcard"
2019-02-09 01:32:50 +00:00
Martin Stjernholm
41c92187a5
Merge "Revert^2 "Enable APEX stubs for libnativeloader.""
...
am: 03cb8010ef
2019-02-08 17:28:02 -08:00
Treehugger Robot
03cb8010ef
Merge "Revert^2 "Enable APEX stubs for libnativeloader.""
2019-02-09 01:16:32 +00:00
Mark Salyzyn
2dc70539b8
Merge "bootstat: crash when parsing ro.boot.boottime" am: c1fd33546e
...
am: 2d63629f5f
2019-02-08 16:51:23 -08:00
Mark Salyzyn
2d63629f5f
Merge "bootstat: crash when parsing ro.boot.boottime"
...
am: c1fd33546e
2019-02-08 16:47:38 -08:00
Treehugger Robot
c1fd33546e
Merge "bootstat: crash when parsing ro.boot.boottime"
2019-02-08 23:50:42 +00:00
Mark Salyzyn
a9728e72de
Merge "fs_mgr: overlayfs: documentation: update kernel patch details" am: 9560f14755
...
am: 2678d22fd3
2019-02-08 13:01:36 -08:00
Mark Salyzyn
2678d22fd3
Merge "fs_mgr: overlayfs: documentation: update kernel patch details"
...
am: 9560f14755
2019-02-08 12:57:27 -08:00
Mark Salyzyn
9560f14755
Merge "fs_mgr: overlayfs: documentation: update kernel patch details"
2019-02-08 20:46:24 +00:00
Mark Salyzyn
7c72116c43
bootstat: crash when parsing ro.boot.boottime
...
If ro.boot.boottime is malformed or truncated, it will crash
bootstat operations.
Test: compile
Bug: 121161069
Bug: 124114707
Change-Id: Ie2edcffb6d54a8e0c7f2e9a89ae4b29cce246d75
2019-02-08 19:54:41 +00:00
Mark Salyzyn
60d5467bd8
fs_mgr: overlayfs: documentation: update kernel patch details
...
Confusion has occurred with respect to the kernel patch requirements,
added some clarity.
Corrected some spelling mistakes in other areas.
Test: inspect gitties and run spell
Bug: 118225373
Change-Id: I4ff9497aa5a584b20e9cb2028342aa4e7e4660c3
2019-02-08 11:49:05 -08:00
Jiyong Park
defdb18675
Eliminate the APEX name in fs_config using wildcard
...
Bug: 123743953
Test: Marlin/sailfish boots to the UI
Change-Id: If1669122be78255879ffb8c8c0a7408a34b5e617
2019-02-09 02:59:17 +09:00
Jiyong Park
6e1875ffea
Merge "fs_config supports shell wildcard patterns" am: 2210f80e48
...
am: 4fe80fa336
2019-02-08 07:54:57 -08:00
Jiyong Park
4fe80fa336
Merge "fs_config supports shell wildcard patterns"
...
am: 2210f80e48
2019-02-08 07:48:54 -08:00
Treehugger Robot
2210f80e48
Merge "fs_config supports shell wildcard patterns"
2019-02-08 15:38:43 +00:00
Colin Cross
a06f9d2a62
Merge "Fix 32-bit dmabuf_dump build" am: 2dcb4160fa
...
am: f2ec660d23
2019-02-08 01:32:41 -08:00
Colin Cross
f2ec660d23
Merge "Fix 32-bit dmabuf_dump build"
...
am: 2dcb4160fa
2019-02-08 01:28:31 -08:00
Treehugger Robot
2dcb4160fa
Merge "Fix 32-bit dmabuf_dump build"
2019-02-08 09:22:05 +00:00
Nicolas Geoffray
5b6ca2baf8
Merge "Don't abort the build if a repo doesn't have the test/vts/tools/build/." am: 82503887fa
...
am: 4cfa281a8d
2019-02-08 01:04:35 -08:00
Nicolas Geoffray
4cfa281a8d
Merge "Don't abort the build if a repo doesn't have the test/vts/tools/build/."
...
am: 82503887fa
2019-02-08 01:00:25 -08:00
Nicolas Geoffray
82503887fa
Merge "Don't abort the build if a repo doesn't have the test/vts/tools/build/."
2019-02-08 08:48:28 +00:00
Nicolas Geoffray
646c6d902d
Don't abort the build if a repo doesn't have the test/vts/tools/build/.
...
Test: build with master-art manifest
Exempt-From-Owner-Approval: Required for unbreaking ART development.
Change-Id: I6afc0e5444dfa21532a4c802f8c463091cab2b11
2019-02-08 08:47:12 +00:00
Josh Gao
e90e12de63
Merge "adb: "support" O_CLOEXEC in adb_open on Windows." am: 9c4fda6cd2
...
am: c1f4e167b6
2019-02-07 23:07:30 -08:00
Josh Gao
c1f4e167b6
Merge "adb: "support" O_CLOEXEC in adb_open on Windows."
...
am: 9c4fda6cd2
2019-02-07 23:02:55 -08:00
Treehugger Robot
9c4fda6cd2
Merge "adb: "support" O_CLOEXEC in adb_open on Windows."
2019-02-08 06:56:47 +00:00
Josh Gao
001adec269
Merge "adb: hopefully deflake test_adb.py." am: 151499e47e
...
am: ad68f429ca
2019-02-07 21:58:51 -08:00
Josh Gao
ad68f429ca
Merge "adb: hopefully deflake test_adb.py."
...
am: 151499e47e
2019-02-07 21:54:41 -08:00
Treehugger Robot
151499e47e
Merge "adb: hopefully deflake test_adb.py."
2019-02-08 05:46:16 +00:00
Colin Cross
0a92453a14
Fix 32-bit dmabuf_dump build
...
Fixes:
system/core/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp:109:39: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat]
Test: lunch aosp_arm-eng && m dmabuf_dump
Change-Id: Ie605d9b94f5eff888f6a64801512216253a6babb
2019-02-07 21:35:03 -08:00
Wei Wang
12e538aa48
Merge "bootstat: Update boot reason property earlier" am: 575996837c
...
am: a3c0dd8444
2019-02-07 19:11:57 -08:00
Erick Reyes
3e5c08537e
Merge "meminfo: add tools/dmabufinfo_dump to dmabufinfo" am: 708d45979c
...
am: bfee2d4e16
2019-02-07 19:11:08 -08:00
Wei Wang
a3c0dd8444
Merge "bootstat: Update boot reason property earlier"
...
am: 575996837c
2019-02-07 19:07:40 -08:00
Erick Reyes
bfee2d4e16
Merge "meminfo: add tools/dmabufinfo_dump to dmabufinfo"
...
am: 708d45979c
2019-02-07 19:06:59 -08:00
Wei Wang
575996837c
Merge "bootstat: Update boot reason property earlier"
2019-02-08 02:55:13 +00:00
Wei Wang
4e9c653c93
bootstat: Update boot reason property earlier
...
bootstat updates boot reason upon boot_complete, however users of the
updated properties e.g. getLastShutdownReason from PowerManager could
be called before boot_complete. This introduces a inconsistency and
racing for those APIs.
In this CL, we change boot reason to be updated at the same time when
zygote starts where persist properties have been loaded already. Also
the initialization of bootloader's boot reason is pulled into post-fs
where all kernel command line arguments have been parsed in init already.
Bug: 122696730
Bug: 119509425
Test: trigger thermal shutdown and see warnings
Test: verify boot reason properties updated correctly post boot
Change-Id: Ia393b98ea072bc0ae6e4110d111393b34be0ee5d
Signed-off-by: Wei Wang <wvw@google.com>
2019-02-08 02:55:06 +00:00
Treehugger Robot
708d45979c
Merge "meminfo: add tools/dmabufinfo_dump to dmabufinfo"
2019-02-08 02:53:54 +00:00
Tri Vo
33ebf97171
Merge "vts test for /proc/<pid>/smaps_rollup" am: a0b17a3d8b
...
am: 6e62fa3a58
2019-02-07 18:19:22 -08:00
Tri Vo
6e62fa3a58
Merge "vts test for /proc/<pid>/smaps_rollup"
...
am: a0b17a3d8b
2019-02-07 18:15:11 -08:00
Erick Reyes
e88be1a9e1
Merge "meminfo: Fix dmabufinfo total ref accounting" am: 32afafa67e
...
am: 5b2347da1d
2019-02-07 18:11:05 -08:00
Treehugger Robot
a0b17a3d8b
Merge "vts test for /proc/<pid>/smaps_rollup"
2019-02-08 02:05:55 +00:00
Erick Reyes
5b2347da1d
Merge "meminfo: Fix dmabufinfo total ref accounting"
...
am: 32afafa67e
2019-02-07 17:54:45 -08:00
Josh Gao
aa95aa063f
adb: hopefully deflake test_adb.py.
...
The reconnection test is spuriously failing on test infrastructure for
unclear reasons, which might be due to a race between the connection
attempt and the first command we send. Insert a sleep to hopefully
reduce the flakiness.
Bug: http://b/123247844
Test: ./test_adb.py (but it didn't fail for me in the first place)
Change-Id: Ic36924c16bae424accfec700af4623794fd1f123
2019-02-07 17:53:29 -08:00
Erick Reyes
32afafa67e
Merge "meminfo: Fix dmabufinfo total ref accounting"
2019-02-08 01:48:01 +00:00
Jesse Hall
1e45b6c7d9
Merge "Freshen libsystem/OWNERS" am: 3dbdf65afc
...
am: 20ee5af257
2019-02-07 14:51:06 -08:00
