Commit graph

59955 commits

Author SHA1 Message Date
TreeHugger Robot
1dc77eaa61 Merge "Abolish DmTargetDefaultKey::IsLegacy" into rvc-dev 2020-04-08 00:10:58 +00:00
Josh Gao
b3ae997474 Merge changes from topic "adbd_lz4" am: 89cce05891 am: a047e4dbf4
Change-Id: If5e8c2607efa41a9e827abd9a2fe3d5533238e8e
2020-04-07 22:10:27 +00:00
Josh Gao
441808a139 adb: implement LZ4 compression. am: ec44d35fde am: e8d1281a48
Change-Id: I77c83a4725c4523db2015f7ab891621ab8828a77
2020-04-07 22:10:25 +00:00
Josh Gao
1b68baa26c adb: fix use of wrong union variant. am: 2165717875 am: 906ae0d9b0
Change-Id: I5433d281c9e4414e670b60b1547e3280d566a0b3
2020-04-07 22:10:24 +00:00
Josh Gao
5c4fbedebd adb: fix front_size, front_data. am: 4da40a9a5b am: 3a69cc704b
Change-Id: If3422b868a2a8ae9000188603426e336e7193176
2020-04-07 22:10:22 +00:00
Josh Gao
b58e9916fb adb: add interfaces for Encoder/Decoder. am: 49ba558aa8 am: 0864b99961
Change-Id: I64298a19fb7a36fca0f987164b58aea3f526b93c
2020-04-07 22:10:18 +00:00
Josh Gao
858e13b563 Merge changes from topic "adbd_lz4" am: 89cce05891 am: a047e4dbf4
Change-Id: Ic1a798b1132fce4b2f3a5cbeacc47fd4eb16da0b
2020-04-07 22:01:29 +00:00
Josh Gao
3066ab0130 adb: implement LZ4 compression. am: ec44d35fde am: e8d1281a48
Change-Id: I77ddd6db7b95c889c5f22bafe56e7a09e8605910
2020-04-07 22:01:28 +00:00
Josh Gao
72842d3d74 adb: fix use of wrong union variant. am: 2165717875 am: 906ae0d9b0
Change-Id: I730a58ad9cb4d02931437db3042d8b87d9e1ca06
2020-04-07 22:01:27 +00:00
Josh Gao
896fee87ba adb: fix front_size, front_data. am: 4da40a9a5b am: 3a69cc704b
Change-Id: I8312e6fa315c7de176c1660c615ec264a646eec9
2020-04-07 22:01:26 +00:00
Josh Gao
ee03b2afa1 adb: add interfaces for Encoder/Decoder. am: 49ba558aa8 am: 0864b99961
Change-Id: If429decb4382162d8e5b69fa310566ac7a313a36
2020-04-07 22:01:25 +00:00
Josh Gao
a047e4dbf4 Merge changes from topic "adbd_lz4" am: 89cce05891
Change-Id: I502f8ba3a0bb330f413964c85bd6b6acb6a35c9c
2020-04-07 21:40:16 +00:00
Josh Gao
e8d1281a48 adb: implement LZ4 compression. am: ec44d35fde
Change-Id: Ie0ab6283ea843884a56bf0f0453036ae9f2e788c
2020-04-07 21:40:15 +00:00
Josh Gao
906ae0d9b0 adb: fix use of wrong union variant. am: 2165717875
Change-Id: I113892ca335419cb0eea8557e554497ed219aad3
2020-04-07 21:40:13 +00:00
Josh Gao
3a69cc704b adb: fix front_size, front_data. am: 4da40a9a5b
Change-Id: Ia54083330d8e8bde1f86821d9900644d73329bed
2020-04-07 21:40:12 +00:00
Josh Gao
0864b99961 adb: add interfaces for Encoder/Decoder. am: 49ba558aa8
Change-Id: If61913830dc03c54867a7bab3baadad780935aaa
2020-04-07 21:40:10 +00:00
Josh Gao
89cce05891 Merge changes from topic "adbd_lz4"
* changes:
  adb: add dry-run option to push/sync.
  adb: implement LZ4 compression.
  adb: fix use of wrong union variant.
  adb: fix front_size, front_data.
  adb: add interfaces for Encoder/Decoder.
2020-04-07 21:30:30 +00:00
Josh Gao
09e7e0e419 Merge "adb: add option to disable kill-server." am: edd7771583 am: a893592e56
Change-Id: Id0f7cd931310ebb29b4b52687b3a83b8ad909055
2020-04-07 21:22:15 +00:00
Josh Gao
06369affd4 Merge "adb: add option to disable kill-server." am: edd7771583 am: a893592e56
Change-Id: I322447e7c6a02607144635d8632ca7641c1ea353
2020-04-07 21:22:08 +00:00
Josh Gao
a893592e56 Merge "adb: add option to disable kill-server." am: edd7771583
Change-Id: I61ea760903d3e1b5335e2aa550346378c07f2c58
2020-04-07 21:07:25 +00:00
Will Mcvicker
58bf0dd979 Merge "first_stage_init: increase serial console tries to 50" into rvc-dev am: 51ae53fa1c
Change-Id: I53c4ada3e9319d7889e67124c61dfadf6c4ff1b8
2020-04-07 21:00:26 +00:00
Josh Gao
edd7771583 Merge "adb: add option to disable kill-server." 2020-04-07 20:36:47 +00:00
Will Mcvicker
51ae53fa1c Merge "first_stage_init: increase serial console tries to 50" into rvc-dev 2020-04-07 20:24:02 +00:00
Nikita Ioffe
fbb47244ce [automerger skipped] Manually unmount /data_mirror mounts in the right order am: a680e261e6 -s ours
am skip reason: Change-Id I57ff9182807630d8cbcf3ca6374fdd6dc6379da5 with SHA-1 bf66f433d6 is in history

Change-Id: I607469128e2670d68755c35ff005582a2523c49f
2020-04-07 20:11:17 +00:00
Elliott Hughes
fccfc9dc7e Merge "Add missing static for macOS inline." am: a0c191867f am: 838f9e14f4
Change-Id: I740c61f13f9e98d9bddb1a195fdeb039070c2551
2020-04-07 20:05:02 +00:00
Elliott Hughes
8bb8c06357 Merge "Add missing static for macOS inline." am: a0c191867f am: 838f9e14f4
Change-Id: Ia2e1fefb98067b7220ac266a577d5544c11d7cb1
2020-04-07 20:04:54 +00:00
Elliott Hughes
838f9e14f4 Merge "Add missing static for macOS inline." am: a0c191867f
Change-Id: I29bd44fc0b71754d6478a137016741a97efb72b9
2020-04-07 19:54:22 +00:00
Elliott Hughes
a0c191867f Merge "Add missing static for macOS inline." 2020-04-07 19:43:29 +00:00
Tianjie
088c403e23 Allow ExtractToMemory to accept an empty buffer for empty entries
We don't actually need to extract the empty entries. Since the old
code support extracting the empty entry to a empty buffer, add the
support back in ExtractToMemory.

Bug: 153393683
Test: unittests pass

Change-Id: Idb9f0f4e6e4ffd4b44b80ddd3f54069bb7cedd7b
2020-04-07 12:25:16 -07:00
Nikita Ioffe
b0f419d7cf Merge "Manually unmount /data_mirror mounts in the right order" am: 9cd3c84dc1 am: 6cdf64a2ef
Change-Id: Ic371031aa1a52898d7a31423e9c76d72b49e8fcc
2020-04-07 18:03:38 +00:00
Nikita Ioffe
0a5ed30d7e Merge "Manually unmount /data_mirror mounts in the right order" am: 9cd3c84dc1 am: 6cdf64a2ef
Change-Id: I6d7e3f2ebf77a29c5f54ea3ad4c284df551403c2
2020-04-07 18:03:26 +00:00
Nikita Ioffe
a680e261e6 Manually unmount /data_mirror mounts in the right order
Test: atest CtsUserspaceRebootHostSideTestCases
Bug: 152823078
Change-Id: I57ff9182807630d8cbcf3ca6374fdd6dc6379da5
Merged-In: I57ff9182807630d8cbcf3ca6374fdd6dc6379da5
(cherry picked from commit bf66f433d6)
2020-04-07 18:54:48 +01:00
Nikita Ioffe
6cdf64a2ef Merge "Manually unmount /data_mirror mounts in the right order" am: 9cd3c84dc1
Change-Id: Ifa4598ef52a1127c2344c0d5a157af673bc8911d
2020-04-07 17:47:14 +00:00
Nikita Ioffe
9cd3c84dc1 Merge "Manually unmount /data_mirror mounts in the right order" 2020-04-07 17:34:52 +00:00
Nikita Ioffe
f99fdbecbc [automerger skipped] get_mounted_entry_for_userdata: Realpath block devices from fstabs am: 7facdac6af -s ours
am skip reason: Change-Id I139c2be46336a632bbaee86667019c075d7de814 with SHA-1 7aa37f1f21 is in history

Change-Id: If1e294d8b6d678542937a78b64231715188a6a6a
2020-04-07 16:35:26 +00:00
Nikita Ioffe
bf66f433d6 Manually unmount /data_mirror mounts in the right order
Test: atest CtsUserspaceRebootHostSideTestCases
Bug: 152823078
Change-Id: I57ff9182807630d8cbcf3ca6374fdd6dc6379da5
2020-04-07 15:43:10 +00:00
Paul Crowley
c9c9d1288f Abolish DmTargetDefaultKey::IsLegacy
To make it easier to support disk formats created using old versions
of dm-default-key with new kernels, stop checking the kernel module
version; instead, the caller decides whether to use the old or new
options format.

Bug: 150761030
Test: crosshatch and cuttlefish boot normally; cuttlefish
    fails with "default-key: Not enough arguments" as expected when
    option is set to 1
Cherry-Picked-From: 539b98fb58
Merged-In: I810bb7e085b9b8648858de1a02165162d1fd163e
Change-Id: I810bb7e085b9b8648858de1a02165162d1fd163e
2020-04-07 07:33:05 -07:00
Nikita Ioffe
7facdac6af get_mounted_entry_for_userdata: Realpath block devices from fstabs
Use realpath as a canonical representation of block devices. This makes
it easier to reason about block devices. This also fixes a bug, in which
fs_mgr_get_mounted_entry_for_userdata didn't properly work on devices
that don't support metadata encryption.

Test: atest CtsFsMgrTestCases
Test: atest CtsUserspaceRebootHostSideTestCases
Bug: 153363818
Change-Id: I139c2be46336a632bbaee86667019c075d7de814
Merged-In: I139c2be46336a632bbaee86667019c075d7de814
(cherry picked from commit 7aa37f1f21)
2020-04-07 14:04:06 +01:00
Nikita Ioffe
e57d08c960 Merge "get_mounted_entry_for_userdata: Realpath block devices from fstabs" am: 74429fc121 am: 2b45a4ef85
Change-Id: I61ab734cf71e324a90a273179863ef3067299424
2020-04-07 12:27:45 +00:00
Nikita Ioffe
7dcdb5797b Merge "get_mounted_entry_for_userdata: Realpath block devices from fstabs" am: 74429fc121 am: 2b45a4ef85
Change-Id: Ie3b02e6cf06f47cd49d39f65b972235b8ee921d2
2020-04-07 12:27:45 +00:00
Nikita Ioffe
2b45a4ef85 Merge "get_mounted_entry_for_userdata: Realpath block devices from fstabs" am: 74429fc121
Change-Id: I9795f62d3534c46072622e48f32c263be147617b
2020-04-07 12:16:00 +00:00
Nikita Ioffe
74429fc121 Merge "get_mounted_entry_for_userdata: Realpath block devices from fstabs" 2020-04-07 12:01:29 +00:00
Josh Gao
914d642551 Merge "Revert "Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor""" am: 20f079ec66 am: 36e15dd5c3
Change-Id: I92352cfbcacc3122bd67098aa3c016879a31541d
2020-04-07 11:33:28 +00:00
Josh Gao
d7ec5c57cb Merge "Revert "Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor""" am: 20f079ec66 am: 36e15dd5c3
Change-Id: Ide3877ebd2a93da173b303723ec1216ed20b15d5
2020-04-07 11:33:08 +00:00
Josh Gao
6cc08dbf6a Merge "Revert "Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor""" into rvc-dev am: 60375b7cc6
Change-Id: I60c273c8ffd3404f4cd165932887ec9b81d9c2c8
2020-04-07 11:19:32 +00:00
Josh Gao
36e15dd5c3 Merge "Revert "Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor""" am: 20f079ec66
Change-Id: I5ef0f12580ab3b10c9eed83604d3c49827b6d77c
2020-04-07 11:19:20 +00:00
Josh Gao
60375b7cc6 Merge "Revert "Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor""" into rvc-dev 2020-04-07 11:08:07 +00:00
Josh Gao
20f079ec66 Merge "Revert "Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor""" 2020-04-07 11:08:00 +00:00
Treehugger Robot
3dc11eea4d Merge "Rename vts-core to vts" am: edf8335c72 am: be1fdfc322
Change-Id: I8459a905348fe17bb0eb47e064f0e6cf1f747f2e
2020-04-07 05:44:47 +00:00
Treehugger Robot
aa8b66794d [automerger skipped] Merge "Rename vts-core to vts" am: edf8335c72 am: be1fdfc322 -s ours
am skip reason: Change-Id I24779951257ce37fc18929f214d3cf5f76c23a19 with SHA-1 a7b9a2bfd2 is in history

Change-Id: I7cfd70068b0e52581f79df13014d3ab833eb5ed7
2020-04-07 05:44:37 +00:00