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
Jesse Hall
20ee5af257
Merge "Freshen libsystem/OWNERS"
...
am: 3dbdf65afc
2019-02-07 14:47:28 -08:00
Treehugger Robot
3dbdf65afc
Merge "Freshen libsystem/OWNERS"
2019-02-07 22:33:39 +00:00
Josh Gao
4b019a5f25
adb: "support" O_CLOEXEC in adb_open on Windows.
...
Previously, we were rejecting the flag and failing with EINVAL. File
handles aren't inherited by default, so just ignore the flag.
Bug: http://b/123753498
Test: adb install --streaming foo.apk
Change-Id: I17401fcdd58024956d47a5c4c0c57b06831d9817
2019-02-07 14:23:39 -08:00
Mark Salyzyn
478fdb8d9b
Merge "fs_mgr: overlayfs: fs_mgr_overlay_setup true if already mounted" am: c6a2d7d5cd
...
am: d191b29fb7
2019-02-07 10:37:21 -08:00
Mark Salyzyn
d191b29fb7
Merge "fs_mgr: overlayfs: fs_mgr_overlay_setup true if already mounted"
...
am: c6a2d7d5cd
2019-02-07 10:33:13 -08:00
Mark Salyzyn
6a1b476338
Merge "fs_mgr: overlayfs support legacy devices (marlin)" am: 4e3a5f61a4
...
am: 694af77137
2019-02-07 10:26:03 -08:00
Mark Salyzyn
c6a2d7d5cd
Merge "fs_mgr: overlayfs: fs_mgr_overlay_setup true if already mounted"
2019-02-07 18:25:55 +00:00
Jesse Hall
9c8e3c3a93
Freshen libsystem/OWNERS
...
Test: none
Change-Id: I6ce1f28bdc6553910a4e4dafb125d05d9e11035a
2019-02-07 10:19:01 -08:00
Mark Salyzyn
694af77137
Merge "fs_mgr: overlayfs support legacy devices (marlin)"
...
am: 4e3a5f61a4
2019-02-07 10:17:09 -08:00
Mark Salyzyn
4e3a5f61a4
Merge "fs_mgr: overlayfs support legacy devices (marlin)"
2019-02-07 18:03:55 +00:00
Jiyong Park
b97eeb34c4
Merge "Configure /system/apex/com.android.runtime.[debug|release]/bin/*" am: 186661d135
...
am: 6649f7447e
2019-02-07 08:26:34 -08:00
Jiyong Park
6649f7447e
Merge "Configure /system/apex/com.android.runtime.[debug|release]/bin/*"
...
am: 186661d135
2019-02-07 08:21:58 -08:00
Jiyong Park
186661d135
Merge "Configure /system/apex/com.android.runtime.[debug|release]/bin/*"
2019-02-07 16:08:24 +00:00
Elliott Hughes
a8a2412222
Merge "MappedFile and FileMap should support zero-length mappings." am: 5f5ffc8e19
...
am: 756066f0c5
2019-02-07 07:55:50 -08:00
Elliott Hughes
756066f0c5
Merge "MappedFile and FileMap should support zero-length mappings."
...
am: 5f5ffc8e19
2019-02-07 07:51:42 -08:00
Elliott Hughes
5f5ffc8e19
Merge "MappedFile and FileMap should support zero-length mappings."
2019-02-07 15:45:03 +00:00
Joel Fernandes
e3b45e5c31
Merge changes from topic "memfd-support" am: 3133b695e0
...
am: b03663ebdf
2019-02-07 06:27:43 -08:00
Joel Fernandes
b03663ebdf
Merge changes from topic "memfd-support"
...
am: 3133b695e0
2019-02-07 06:23:51 -08:00
Joel Fernandes
3133b695e0
Merge changes from topic "memfd-support"
...
* changes:
init: set the sys.use_memfd property to false
Add support for memfd
2019-02-07 14:17:13 +00:00
Martin Stjernholm
97b256e3b5
Merge "Add some overview docs for classloader-namespace." am: d338c1f8e6
...
am: 76ea084a85
2019-02-06 21:46:45 -08:00
Martin Stjernholm
76ea084a85
Merge "Add some overview docs for classloader-namespace."
...
am: d338c1f8e6
2019-02-06 21:42:38 -08:00
