Josh Gao
88c3bd5c83
Merge "adbd: switch the default USB implementation." am: 5782600271 am: 269ef5d068
...
am: d4c49c4b44
2019-02-26 01:21:38 -08:00
Josh Gao
d4c49c4b44
Merge "adbd: switch the default USB implementation." am: 5782600271
...
am: 269ef5d068
2019-02-26 01:03:36 -08:00
Mark Salyzyn
be5ef66b47
Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)" am: a24338bff8 am: 7880279ac6
...
am: b891c46282
2019-02-26 00:44:19 -08:00
Bowgo Tsai
38eb0976d0
Merge changes from topic "fs_mgr_unit_test" am: 6d6ccdf7c6 am: b45e01bdd3
...
am: 9dc08bd409
2019-02-26 00:27:47 -08:00
Paul Trautrim
ced47c7acd
Merge "fiemap_writer: Use fallocate64" am: 032b744809 am: 06df12ba3b
...
am: e0be5694c4
2019-02-26 00:23:46 -08:00
Mark Salyzyn
afb4f183f6
Merge "fs_mgr: overlayfs: test: Add --print-time option" am: 3be9bff517 am: d36d052a20
...
am: 4f9a05b878
2019-02-26 00:18:18 -08:00
Mark Salyzyn
b891c46282
Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)" am: a24338bff8
...
am: 7880279ac6
2019-02-26 00:15:32 -08:00
Josh Gao
269ef5d068
Merge "adbd: switch the default USB implementation."
...
am: 5782600271
2019-02-26 00:12:43 -08:00
Bowgo Tsai
9dc08bd409
Merge changes from topic "fs_mgr_unit_test" am: 6d6ccdf7c6
...
am: b45e01bdd3
2019-02-25 23:54:32 -08:00
Paul Trautrim
e0be5694c4
Merge "fiemap_writer: Use fallocate64" am: 032b744809
...
am: 06df12ba3b
2019-02-25 23:45:25 -08:00
Mark Salyzyn
4f9a05b878
Merge "fs_mgr: overlayfs: test: Add --print-time option" am: 3be9bff517
...
am: d36d052a20
2019-02-25 23:28:43 -08:00
Mark Salyzyn
7880279ac6
Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)"
...
am: a24338bff8
2019-02-25 23:27:06 -08:00
Bowgo Tsai
b45e01bdd3
Merge changes from topic "fs_mgr_unit_test"
...
am: 6d6ccdf7c6
2019-02-25 23:20:47 -08:00
Neil Fuller
f54ccb8dd1
Merge "Move tzdatacheck execution after apex is mounted" am: 61b2016881 am: 3305192d3a
...
am: 6916a8fc05
2019-02-25 23:13:00 -08:00
Paul Trautrim
06df12ba3b
Merge "fiemap_writer: Use fallocate64"
...
am: 032b744809
2019-02-25 23:12:59 -08:00
Mark Salyzyn
d36d052a20
Merge "fs_mgr: overlayfs: test: Add --print-time option"
...
am: 3be9bff517
2019-02-25 23:08:58 -08:00
Neil Fuller
6916a8fc05
Merge "Move tzdatacheck execution after apex is mounted" am: 61b2016881
...
am: 3305192d3a
2019-02-25 23:02:41 -08:00
Neil Fuller
3305192d3a
Merge "Move tzdatacheck execution after apex is mounted"
...
am: 61b2016881
2019-02-25 22:51:17 -08:00
Josh Gao
5782600271
Merge "adbd: switch the default USB implementation."
2019-02-26 06:47:46 +00:00
Treehugger Robot
a24338bff8
Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)"
2019-02-26 05:34:32 +00:00
Martin Stjernholm
59b44c16cc
Merge "Add compat symlink preferred-arch /system/bin/dalvikvm." am: ef3429dae6 am: 3c469804ed
...
am: 677552f14b
2019-02-25 21:28:29 -08:00
Martin Stjernholm
677552f14b
Merge "Add compat symlink preferred-arch /system/bin/dalvikvm." am: ef3429dae6
...
am: 3c469804ed
2019-02-25 20:31:30 -08:00
Martin Stjernholm
ec8ce632ff
Merge "Avoid runtime namespace becoming parent for classloader-namespace." am: d39f262aad am: 409d6e5360
...
am: f5b1865786
2019-02-25 19:29:08 -08:00
Alex Buynytskyy
04bcfcb380
Merge "Adding EXEC version of calling ABB." am: e257772bb2 am: b590a59bc4
...
am: 5c18315e47
2019-02-25 19:27:59 -08:00
Dongwon Kang
6ac42d7363
Merge "Add permitted path in media namesapce for extractor process." am: ed7458e03e am: 0dfb54f747
...
am: 38259e37f4
2019-02-25 19:27:05 -08:00
Xin Li
dd89f4564f
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master am: 3e59659403 -s ours
...
am: cc9afe6486
2019-02-25 19:19:02 -08:00
Treehugger Robot
6d6ccdf7c6
Merge changes from topic "fs_mgr_unit_test"
...
* changes:
Fix fs_mgr_unit_test
fs_mgr: add test_suites: ["device-tests"]
2019-02-26 02:35:42 +00:00
Martin Stjernholm
f5b1865786
Merge "Avoid runtime namespace becoming parent for classloader-namespace." am: d39f262aad
...
am: 409d6e5360
2019-02-25 18:08:42 -08:00
Alex Buynytskyy
5c18315e47
Merge "Adding EXEC version of calling ABB." am: e257772bb2
...
am: b590a59bc4
2019-02-25 18:07:37 -08:00
Dongwon Kang
38259e37f4
Merge "Add permitted path in media namesapce for extractor process." am: ed7458e03e
...
am: 0dfb54f747
2019-02-25 18:06:51 -08:00
Xin Li
cc9afe6486
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master
...
am: 3e59659403
2019-02-25 18:05:33 -08:00
Xin Li
c47f412fd2
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 2d544cf8ce -s ours
...
am: dfa2db058b
2019-02-25 17:20:40 -08:00
Xin Li
dfa2db058b
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
am: 2d544cf8ce
2019-02-25 16:20:07 -08:00
Bowgo Tsai
338d62ebe9
Merge "libfs_avb: support rollback protection for Live GSI" am: 084d3b9124 am: 5d1bb2a41f
...
am: 809b29ab0b
2019-02-25 15:40:10 -08:00
Orion Hodson
b13f84a41c
Merge "Remove dependency on libcutils" am: 4ac1829d7e am: 2c17cca557
...
am: ca3916b056
2019-02-25 15:38:25 -08:00
Julien Desprez
bf29ccab6e
Merge "Revert the explicit config, see topic" am: 1914fc65f8 am: ee57fadf2d
...
am: 79d2d7f18d
2019-02-25 15:31:59 -08:00
Julien Desprez
4306ad0096
Merge "Temporarily @ignore test_reconnect" am: 9bfa166ad9 am: 84d796dac4
...
am: b1687ed7e3
2019-02-25 15:28:52 -08:00
David Anderson
07c5ec0846
Merge "init: Set a property indicating that we're booting into a GSI." am: 1cdd96cb10 am: bf1bcf4cad
...
am: ed49007bef
2019-02-25 15:20:36 -08:00
Treehugger Robot
032b744809
Merge "fiemap_writer: Use fallocate64"
2019-02-25 22:54:49 +00:00
Bowgo Tsai
809b29ab0b
Merge "libfs_avb: support rollback protection for Live GSI" am: 084d3b9124
...
am: 5d1bb2a41f
2019-02-25 13:42:40 -08:00
Orion Hodson
ca3916b056
Merge "Remove dependency on libcutils" am: 4ac1829d7e
...
am: 2c17cca557
2019-02-25 13:41:46 -08:00
Mark Salyzyn
3be9bff517
Merge "fs_mgr: overlayfs: test: Add --print-time option"
2019-02-25 21:36:42 +00:00
Mark Salyzyn
94a0dedbc4
fs_mgr: overlayfs: test: Add --print-time option
...
Make it easier to collect test execution time.
Clean up some noise restoring device to original state.
Test: adb-remount-test.sh --print-time
Bug: 123079041
Change-Id: I56f12698ff25362dcefcf8a6ddd8f96a23b37f34
2019-02-25 21:33:33 +00:00
Mark Salyzyn
3f014a2abf
fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)
...
init first stage manufactures a / mount pointing to /dev/root and
we can not use that for checking the filesystem. Result is /system
overlay is mounted in second stage.
This adjustment to special case /dev/root is safe for overlayfs
handling because we will also gate on content in
/mnt/scratch/overlay/system, which will not be set during runtime
setup because check will have the proper block device at that time.
Test: adb-remount-test.sh
Bug: 123079041
Change-Id: I9c6674163955155f26ad2b0c9b78e9ff6507a514
2019-02-25 13:30:51 -08:00
Julien Desprez
79d2d7f18d
Merge "Revert the explicit config, see topic" am: 1914fc65f8
...
am: ee57fadf2d
2019-02-25 13:15:12 -08:00
Julien Desprez
b1687ed7e3
Merge "Temporarily @ignore test_reconnect" am: 9bfa166ad9
...
am: 84d796dac4
2019-02-25 13:14:24 -08:00
David Anderson
ed49007bef
Merge "init: Set a property indicating that we're booting into a GSI." am: 1cdd96cb10
...
am: bf1bcf4cad
2019-02-25 13:13:36 -08:00
Treehugger Robot
61b2016881
Merge "Move tzdatacheck execution after apex is mounted"
2019-02-25 13:30:36 +00:00
Paul Trautrim
3d001e7ebb
fiemap_writer: Use fallocate64
...
This is necessary for cf_x86.
Test: gsi_tool install
Change-Id: Ifb1afc149f76a98e9db8f9d71a74542416113590
2019-02-25 16:59:26 +09:00
Martin Stjernholm
3c469804ed
Merge "Add compat symlink preferred-arch /system/bin/dalvikvm."
...
am: ef3429dae6
2019-02-24 16:26:06 -08:00
