Josh Gao
d575bc93a5
Merge changes I86c3ec0f,I57d1a30a,Ib50d289b,I791a4f82,I316a8799, ... am: 216d158daf
...
am: ff7b56f917
Change-Id: I8dbbc43a2690cd35528dae59a3625c5288dc7a64
2019-02-26 13:21:03 -08:00
Josh Gao
ff7b56f917
Merge changes I86c3ec0f,I57d1a30a,Ib50d289b,I791a4f82,I316a8799, ...
...
am: 216d158daf
Change-Id: I44e6f7071425d4d4e627d336a7ba07b5314a2643
2019-02-26 13:13:07 -08:00
Nicolas Geoffray
f2472a1d72
Merge "Add a DEX2OAT_BOOTCLASSPATH variable." am: 1706eb08fe
...
am: e25fa6da1b
Change-Id: Iac2edb56374e571a3a741edfa9279a82a63f50f8
2019-02-26 13:10:39 -08:00
Nicolas Geoffray
e25fa6da1b
Merge "Add a DEX2OAT_BOOTCLASSPATH variable."
...
am: 1706eb08fe
Change-Id: I99097127c5742c2184366a061cf5e69648f53a29
2019-02-26 13:02:04 -08:00
Josh Gao
216d158daf
Merge changes I86c3ec0f,I57d1a30a,Ib50d289b,I791a4f82,I316a8799, ...
...
* changes:
adb: switch sockets.cpp to ConsumePrefix.
adbd: switch abb to ConsumePrefix.
adb: increment server version.
adb: wait for device to disconnect upon `adb root`.
adb: implement wait-for-disconnect.
adb: tell the client what transport it received.
adbd: switch daemon/services to ConsumePrefix.
adb: switch host_service_to_socket to string_view.
adb: switch handle_host_request to string_view.
adb: switch adb_io.h to string_view.
adb: add helper to consume a prefix on a string_view.
adb: make ParseUint reject garbage at the end by default.
2019-02-26 20:55:19 +00:00
Nicolas Geoffray
1706eb08fe
Merge "Add a DEX2OAT_BOOTCLASSPATH variable."
2019-02-26 20:38:32 +00:00
David Anderson
9fb4aaa1a7
Merge "Allow fiemap_writer_test to run in arbitrary directories." am: e99564fc62
...
am: 58fc986bd1
Change-Id: I050833d59d58e6e545f5f97fce14735a40d08e2e
2019-02-26 11:49:32 -08:00
David Anderson
58fc986bd1
Merge "Allow fiemap_writer_test to run in arbitrary directories."
...
am: e99564fc62
Change-Id: I90dd03e7a6e6a6916c2b3d1d1866a944cc097345
2019-02-26 11:46:24 -08:00
David Anderson
e99564fc62
Merge "Allow fiemap_writer_test to run in arbitrary directories."
2019-02-26 19:33:36 +00:00
Martin Stjernholm
bc43c7c05d
Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external." am: 21c29cfade
...
am: e6ab117292
Change-Id: I564f0e3a18a9b6f0842303fdc6ce8ea76277e3c5
2019-02-26 09:34:52 -08:00
Martin Stjernholm
e6ab117292
Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external."
...
am: 21c29cfade
Change-Id: I1526f70910aa0ecd49d303bc848a3d08e4aa7a76
2019-02-26 09:30:44 -08:00
Treehugger Robot
21c29cfade
Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external."
2019-02-26 17:19:42 +00:00
Nicolas Geoffray
0c49d1759c
Add a DEX2OAT_BOOTCLASSPATH variable.
...
Bug: 119800099
Test: m
Change-Id: I8ae4ecea6da2ef541736a38822b100a620d72a8a
2019-02-26 12:57:17 +00:00
Juju Sung
e8cce305b4
Merge "lmkd: Remove redundant free swap and free memory check" am: 89a7cc48cc
...
am: ab0319ece8
Change-Id: I727d624f1149452ce755c0145f13a286f6422048
2019-02-26 02:54:06 -08:00
Juju Sung
ab0319ece8
Merge "lmkd: Remove redundant free swap and free memory check"
...
am: 89a7cc48cc
Change-Id: I905a1d573d2fa66588a4dd436f4d1bd4cdf009ff
2019-02-26 02:08:59 -08:00
Treehugger Robot
89a7cc48cc
Merge "lmkd: Remove redundant free swap and free memory check"
2019-02-26 09:53:31 +00:00
Josh Gao
d4c49c4b44
Merge "adbd: switch the default USB implementation." am: 5782600271
...
am: 269ef5d068
Change-Id: I479f1de000ad2c9732550e0dc78a23ece811ff16
2019-02-26 01:03:36 -08:00
Mark Salyzyn
b891c46282
Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)" am: a24338bff8
...
am: 7880279ac6
Change-Id: I3aaf4b4506432f5f0a3c82e053886b3e78e65c60
2019-02-26 00:15:32 -08:00
Josh Gao
269ef5d068
Merge "adbd: switch the default USB implementation."
...
am: 5782600271
Change-Id: Idbc6eba721e06bfa4659f2aac1592f6bdf84a9a5
2019-02-26 00:12:43 -08:00
Bowgo Tsai
9dc08bd409
Merge changes from topic "fs_mgr_unit_test" am: 6d6ccdf7c6
...
am: b45e01bdd3
Change-Id: Idc3b23df9b087b578e8904139aefd09a49fce84d
2019-02-25 23:54:32 -08:00
Paul Trautrim
e0be5694c4
Merge "fiemap_writer: Use fallocate64" am: 032b744809
...
am: 06df12ba3b
Change-Id: Ifc1c6e48c1320171632bc7dfe6679cb4006f3f6a
2019-02-25 23:45:25 -08:00
Mark Salyzyn
4f9a05b878
Merge "fs_mgr: overlayfs: test: Add --print-time option" am: 3be9bff517
...
am: d36d052a20
Change-Id: Ia6f7bdcfe562d0119c6ace5c7f453fc927417cbf
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
Change-Id: I14c0c136c362dff252ea7d1ffbff7a054e4686d9
2019-02-25 23:27:06 -08:00
Bowgo Tsai
b45e01bdd3
Merge changes from topic "fs_mgr_unit_test"
...
am: 6d6ccdf7c6
Change-Id: I5dbb8cc6871d76d0a8608ff4db368e5865686742
2019-02-25 23:20:47 -08:00
Paul Trautrim
06df12ba3b
Merge "fiemap_writer: Use fallocate64"
...
am: 032b744809
Change-Id: Icca45dde6e0e7e15eddb456da641167d1d401cd7
2019-02-25 23:12:59 -08:00
Mark Salyzyn
d36d052a20
Merge "fs_mgr: overlayfs: test: Add --print-time option"
...
am: 3be9bff517
Change-Id: I7026f55a132445115b078e19d3bac547c923fac8
2019-02-25 23:08:58 -08:00
Neil Fuller
6916a8fc05
Merge "Move tzdatacheck execution after apex is mounted" am: 61b2016881
...
am: 3305192d3a
Change-Id: Ibd10e2778c66dd7a4ff3d1139f5a783405d73941
2019-02-25 23:02:41 -08:00
Neil Fuller
3305192d3a
Merge "Move tzdatacheck execution after apex is mounted"
...
am: 61b2016881
Change-Id: Ib8b0773a2abed59a7464a1eab034db394b9b2c53
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
677552f14b
Merge "Add compat symlink preferred-arch /system/bin/dalvikvm." am: ef3429dae6
...
am: 3c469804ed
Change-Id: Ic2d297ec3ca9fcd217d7fe49b288b77d254887c2
2019-02-25 20:31:30 -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
Change-Id: I1cced499e3c2fb55a3d1a80b2b4e2b3d99ce6540
2019-02-25 18:08:42 -08:00
Alex Buynytskyy
5c18315e47
Merge "Adding EXEC version of calling ABB." am: e257772bb2
...
am: b590a59bc4
Change-Id: I03f608319604fac010b321112fee670e16688a41
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
Change-Id: Id709bf9e2e755658c0e651929be714614491777b
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
-s ours
am skip reason: subject contains skip directive
Change-Id: I555e88c522ac6036ba6e3968e42318ab147e8c24
2019-02-25 18:05:33 -08:00
Xin Li
dfa2db058b
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
am: 2d544cf8ce
-s ours
am skip reason: subject contains skip directive
Change-Id: I3f850473d57c1de65ef13055bf4c1ea8110c7b9f
2019-02-25 16:20:07 -08:00
David Anderson
82b54d2a5e
Allow fiemap_writer_test to run in arbitrary directories.
...
This allows fiemap_writer_test to be run on any read-write partition or
block device.
Bug: 126230649
Test: fiemap_writer_test
Change-Id: Ie002cb77c84c683e5f242695882ba78d510eca36
2019-02-25 15:38:14 -08:00
Treehugger Robot
032b744809
Merge "fiemap_writer: Use fallocate64"
2019-02-25 22:54:49 +00:00
Josh Gao
43f3805950
adb: switch sockets.cpp to ConsumePrefix.
...
Test: mma
Change-Id: I86c3ec0fd90fe45e59c0187f664d46020bad2c0f
2019-02-25 13:59:00 -08:00
Josh Gao
ccc584523a
adbd: switch abb to ConsumePrefix.
...
Test: mma
Change-Id: I57d1a30a526c97c5b5a2718740b76220da6eea39
2019-02-25 13:59:00 -08:00
Josh Gao
aa4f31a124
adb: increment server version.
...
Increment the server version for adb_connect with transport id, and
wait-for-disconnect.
Bug: http://b/124244488
Test: none
Change-Id: Ib50d289b68fce4befbf1f5d9507d7e6f9cc1f4f5
2019-02-25 13:59:00 -08:00
Josh Gao
2020dd6f2e
adb: wait for device to disconnect upon adb root
.
...
Previously, there was a race where if adb root took longer than 3
seconds to take effect, we'd return early and allow subsequent commands
to be targeted at the still-not-dead transport, and spuriously fail.
Bug: http://b/124244488
Test: test_device.py
Change-Id: I791a4f82946eb28e4d37729ab0ed3b7fc05b42a2
2019-02-25 13:59:00 -08:00
Josh Gao
1e9e471c9c
adb: implement wait-for-disconnect.
...
Bug: http://b/124244488
Test: manual
Change-Id: I316a87994924c51c785e46a4900380c58e726985
2019-02-25 13:59:00 -08:00
Josh Gao
79797ecbb1
adb: tell the client what transport it received.
...
Prerequisite for making `adb root` wait for the device that it told to
restart to disappear: the client needs to know which transport to wait
on.
Bug: http://b/124244488
Test: manual
Change-Id: I474559838ad7c0e961e9d2a98c902bca3b60d6c8
2019-02-25 13:49:25 -08:00
Josh Gao
2df76b7ee7
adbd: switch daemon/services to ConsumePrefix.
...
Test: mma
Change-Id: Ib4bb7d3352219a9883a5089e08225fb17145c2ee
2019-02-25 13:49:25 -08:00
Josh Gao
0ecc4020d6
adb: switch host_service_to_socket to string_view.
...
Test: manual
Change-Id: I09b83cc82edb10c1a51ecc5ebb8d9fe5294222c3
2019-02-25 13:49:25 -08:00
Josh Gao
769f853f96
adb: switch handle_host_request to string_view.
...
Test: test_adb.py
Test: test_device.py
Change-Id: Ideae5262a6dff2e27c50f666144d48f874837290
2019-02-25 13:49:25 -08:00
Josh Gao
342b661e81
adb: switch adb_io.h to string_view.
...
Test: mma
Change-Id: Ifa16502bac18429491426c45ece562657cff1689
2019-02-25 13:49:25 -08:00
Josh Gao
ac8da2a7df
adb: add helper to consume a prefix on a string_view.
...
It's error-prone to manually writing code of the following form:
if (foo.starts_with("some_prefix:")) {
foo.remove_prefix(strlen("some_prefix:"));
}
Add a helper to do that for us.
Test: mma
Change-Id: I5df391deba8b6c036fcbf17a1f1c79af8d9abd2b
2019-02-25 13:49:25 -08:00