Tianjie Xu and android-build-merger
f980ad94ef
Merge "Move load & restore logs to logging.cpp" am: 3aff98aee8
...
am: c3a273b33a
Change-Id: Iea229ce291f97333e1b47cc050731783ffc1e47f
2019-04-16 11:23:54 -07:00
Tianjie Xu and android-build-merger
c3a273b33a
Merge "Move load & restore logs to logging.cpp"
...
am: 3aff98aee8
Change-Id: I7da098091879ca823be31bd12b60dc12d5c45145
2019-04-16 11:07:47 -07:00
Tao Bao and android-build-merger
265ff4fffd
Merge "Remove the FD parameter from FuseDataProvider ctor." am: bb0c6e1fe7
...
am: 510daac2cc
Change-Id: I4bc8b5a42804ec83a29a339f82b8ce4ce3b59709
2019-04-16 10:58:48 -07:00
Tianjie Xu and Gerrit Code Review
3aff98aee8
Merge "Move load & restore logs to logging.cpp"
2019-04-16 17:57:02 +00:00
Tao Bao and android-build-merger
510daac2cc
Merge "Remove the FD parameter from FuseDataProvider ctor."
...
am: bb0c6e1fe7
Change-Id: I56b4751370b621bb78be64e77c78d44b367c9990
2019-04-16 10:51:23 -07:00
Treehugger Robot and Gerrit Code Review
bb0c6e1fe7
Merge "Remove the FD parameter from FuseDataProvider ctor."
2019-04-16 17:25:08 +00:00
xunchang
2239b9e4dd
Move load & restore logs to logging.cpp
...
We perform these steps to perserve the recovery logs when wiping
/cache partition. Move them to logging.cpp to keep the actually
EraseVolume function concise.
Bug: 130166585
Test: unit tests pass, mount cache and check last log after cache
Change-Id: Idc52833817a446f3a0148a3dd2112f911c9ef48d
2019-04-15 23:18:13 -07:00
Tao Bao
2be9737cf4
Remove the FD parameter from FuseDataProvider ctor.
...
This leaves the FD implementation details to subclasses. In particular,
it allows minadbd to do additional works with the FD after sideloading.
Bug: 128415917
Test: atest recovery_component_test
Test: atest minadbd_test
Test: Sideload package on taimen.
Change-Id: I106bbaad05201227bbc5fe28890bbbb06fdcb67e
2019-04-15 16:53:31 -07:00
Tianjie Xu and android-build-merger
97e692fab3
Merge "Move wipe cache|data to libinstall" am: 9fc764f1f0
...
am: 2148d317cd
Change-Id: Ifdfe1766035a0d99b6c608a76c28f6d566cb5f65
2019-04-15 16:03:19 -07:00
Tianjie Xu and android-build-merger
2148d317cd
Merge "Move wipe cache|data to libinstall"
...
am: 9fc764f1f0
Change-Id: I6d3fc5b0fa75a25a96d8939e0f9c3b04de1f5245
2019-04-15 15:57:17 -07:00
Tianjie Xu and Gerrit Code Review
9fc764f1f0
Merge "Move wipe cache|data to libinstall"
2019-04-15 22:34:19 +00:00
xunchang
316e971746
Move wipe cache|data to libinstall
...
Therefore, libinstall becomes the sole owner to handle the request
from minadbd service.
The change also includes
1. move logging.cpp out of librecovery
2. drop the dependency on common.h
3. now it's more sensible to move the wipe_cache as part of
install_package. move the wipe_cache to the end of the function.
Bug: 130166585
Test: wipe data and cache from menu
Change-Id: I6f356dccdb38015c50acf756bac246f87c30fc1f
2019-04-15 12:22:11 -07:00
Bill Yi and android-build-merger
b5937efb0d
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 0b172415fd -s ours
...
am: 440d03ede2 -s ours
am skip reason: subject contains skip directive
Change-Id: I6c5b3c8702cf7471ad4800042cf63214682dd98b
2019-04-13 05:05:56 -07:00
Bill Yi and android-build-merger
440d03ede2
[automerger skipped] Merge "Import translations. DO NOT MERGE"
...
am: 0b172415fd -s ours
am skip reason: subject contains skip directive
Change-Id: If5cfd25a964ca17fe36abe979de0f1ea6fe21d92
2019-04-13 04:56:33 -07:00
Treehugger Robot and Gerrit Code Review
0b172415fd
Merge "Import translations. DO NOT MERGE"
2019-04-13 11:43:41 +00:00
Bill Yi
29077dc25a
Import translations. DO NOT MERGE
...
Change-Id: Ic746bf49180622c3de6029067a811b91007ed507
Auto-generated-cl: translation import
2019-04-13 01:52:59 -07:00
Tianjie Xu and android-build-merger
e087edcab0
Merge "Add socket communication between recovery and minadbd" am: 6c5f70b9b2
...
am: f9709883f1
Change-Id: If9a1d29a35039ae4c634656b3ae1630387f7ec06
2019-04-11 17:06:17 -07:00
Tianjie Xu and android-build-merger
f9709883f1
Merge "Add socket communication between recovery and minadbd"
...
am: 6c5f70b9b2
Change-Id: Iad5a591943b860bd4234b43c0b1f0a9609173993
2019-04-11 16:57:53 -07:00
Tianjie Xu and Gerrit Code Review
6c5f70b9b2
Merge "Add socket communication between recovery and minadbd"
2019-04-11 23:42:25 +00:00
xunchang
34690ced91
Add socket communication between recovery and minadbd
...
This cl adds a socket pair to support the communication between recovery
and minadbd. Therefore, minadbd will be able to issue multiple commands
to recovery and get back the status of each command.
This cl also switches the adb sideload from the recovery menu to use
this protocol; and moves minadbd to a separate binary.
Bug: 130166585
Test: sideload a package
Change-Id: I80d36d5c4e6fe1ae3ea23640907bc50c0dc0d482
2019-04-11 14:23:53 -07:00
Tao Bao and android-build-merger
8630a658e9
Merge "Build libinstall as a static library." am: 38d5e60874
...
am: a8cc70fbe1
Change-Id: I30675d37479d3c183f1e04f995d576627d85569f
2019-04-09 03:47:42 -07:00
Tao Bao and android-build-merger
a8cc70fbe1
Merge "Build libinstall as a static library."
...
am: 38d5e60874
Change-Id: Iafa5f28ec978dc1276a5b2bfdbb433e77e216dac
2019-04-08 15:05:28 -07:00
Tao Bao and Gerrit Code Review
38d5e60874
Merge "Build libinstall as a static library."
2019-04-08 21:22:15 +00:00
Tao Bao
0deed3389b
Build libinstall as a static library.
...
It was once considered to be shared between recovery and minadbd, so
that the latter can start an install on its own. The plan has been
changed, since package install -- including device wipe operations --
could be device-specific, which should be done by recovery only.
This CL moves libinstall back to a static library, which also saves the
overall size (reducing from 140256 + 660576 to 555880 bytes on
aosp_taimen-userdebug).
Bug: 130166585
Test: Run recovery_component_test.
Test: `adb sideload` on taimen.
Change-Id: Ib1f5f79f235df4682c0bd104425c9c122f6091ba
2019-04-08 11:59:48 -07:00
Tao Bao and android-build-merger
98b49695d1
Merge "libotautil exports libfstab header." am: 8e0821e690
...
am: 416343e73a
Change-Id: I113d96d69978e9e6084e99481749c97b1a2d2928
2019-04-04 00:38:46 -07:00
Bill Rassieur and android-build-merger
7df2da5948
Merge master@5428150 into git_qt-dev-plus-aosp.
...
am: 86de943dcc
Change-Id: I13691eb31834462d14b9a7ea07eebc75dfba7de0
2019-04-03 17:20:26 -07:00
Tao Bao and android-build-merger
416343e73a
Merge "libotautil exports libfstab header."
...
am: 8e0821e690
Change-Id: I652370bda1e5523379c20612e20de1f16cc1201a
2019-04-03 17:06:38 -07:00
Tao Bao and Gerrit Code Review
8e0821e690
Merge "libotautil exports libfstab header."
2019-04-03 23:48:21 +00:00
Bill Rassieur and android-build-merger
549321c723
Merge master@5406228 into git_qt-dev-plus-aosp.
...
am: 74253cca39
Change-Id: I8694e28304a111d7bc6675993a8219d4c328d3a6
2019-04-03 16:11:09 -07:00
Tao Bao
cecad743c1
libotautil exports libfstab header.
...
otautil/roots.h includes <fstab/fstab.h>, but users of otautil/roots.h
don't need to explicitly depend on libfstab unless they have a real
need.
Also remove the unneeded include of <fstab/fstab.h> from
fsck_unshare_blocks.cpp.
Test: mmma -j bootable/recovery
Change-Id: Id3dc995a4769e631ab242843ee439bd94b2bf0bc
2019-04-03 11:41:54 -07:00
David Anderson and android-build-merger
53cbda8056
Merge "Append -verity when looking for verity device-mapper names." am: bc2eab4315 am: 9a53189ae5
...
am: 5fa37b77d1
Change-Id: I44383f3609730fc12aeac24061a7940010a60338
2019-04-02 15:09:14 -07:00
David Anderson and android-build-merger
5fa37b77d1
Merge "Append -verity when looking for verity device-mapper names." am: bc2eab4315
...
am: 9a53189ae5
Change-Id: Ibc664119ec22f7dd1906f1afc44015829c6e3d2e
2019-04-02 14:08:44 -07:00
David Anderson and android-build-merger
9a53189ae5
Merge "Append -verity when looking for verity device-mapper names."
...
am: bc2eab4315
Change-Id: I39b5e0f2f0baf8d459a535de470c99f8a5d4adf9
2019-04-02 14:04:49 -07:00
David Anderson and Gerrit Code Review
bc2eab4315
Merge "Append -verity when looking for verity device-mapper names."
2019-04-02 20:16:36 +00:00
Bill Rassieur
86de943dcc
Merge master@5428150 into git_qt-dev-plus-aosp.
...
Change-Id: I1c69d7c91e68fd4baba7b6510acf2a69e1a6c5d7
BUG: 129345239
2019-04-02 18:26:46 +00:00
David Anderson
c52663c4ea
Append -verity when looking for verity device-mapper names.
...
Bug: 123666267
Test: recovery_component_test passes
Change-Id: I9b608b3fbfa14cc45ad0b4de6cb5cecdef983acb
2019-04-01 17:13:11 -07:00
Tao Bao and android-build-merger
1055819fa8
Merge changes Ibbe7084e,If584fc8a am: bb8f0fff17 am: effd4ca883
...
am: 64ec642955
Change-Id: I9294ea938a634e9d95cb2639eea150c2fb1ac30c
2019-03-30 08:41:12 -07:00
Tao Bao and android-build-merger
64ec642955
Merge changes Ibbe7084e,If584fc8a am: bb8f0fff17
...
am: effd4ca883
Change-Id: Icb25c9b6be3e08b346f9e44f0c4f3d358f548204
2019-03-30 08:37:12 -07:00
Tao Bao and android-build-merger
effd4ca883
Merge changes Ibbe7084e,If584fc8a
...
am: bb8f0fff17
Change-Id: I1df188d9a668dffc2f81000c30ae1d6fd2f4bb1c
2019-03-30 08:33:15 -07:00
Tao Bao and Gerrit Code Review
bb8f0fff17
Merge changes Ibbe7084e,If584fc8a
...
* changes:
recovery: Remove SetUsbConfig() out of common.h.
Remove ui_print().
2019-03-30 15:18:18 +00:00
Tao Bao
e0cfab3de9
recovery: Remove SetUsbConfig() out of common.h.
...
libinstall now has its own copy.
Test: mmma -j bootable/recovery
Change-Id: Ibbe7084e15baeb7e744f2175d5944477092acc9e
2019-03-29 15:54:02 -07:00
Tao Bao
bc982a4f88
Remove ui_print().
...
This used to be a helper function that allows printing message to UI.
We no longer have any active user in bootable/recovery. Device-specific
code can achieve the same functionality by calling GetUI()->Print()
instead.
Test: mmma -j bootable/recovery
Change-Id: If584fc8a51d1af466f1d94d8ea5faa262603a784
2019-03-29 15:50:02 -07:00
Tianjie Xu and android-build-merger
8e39f3d54e
Merge "Move install to separate module" am: a232d9dccb am: 3f25d6bb07
...
am: 719c7edd2a
Change-Id: I06348c5bafedd3a3b610dea2bcac4e2622aec24c
2019-03-29 15:04:04 -07:00
Tianjie Xu and android-build-merger
719c7edd2a
Merge "Move install to separate module" am: a232d9dccb
...
am: 3f25d6bb07
Change-Id: I1b37d0263bbd383ba71c6025b7fb26b3651d7b8a
2019-03-29 14:54:00 -07:00
Tianjie Xu and android-build-merger
3f25d6bb07
Merge "Move install to separate module"
...
am: a232d9dccb
Change-Id: I6de83aec6ab98ae5280bad07e3359c4bb38abd5e
2019-03-29 14:43:56 -07:00
Tianjie Xu and Gerrit Code Review
a232d9dccb
Merge "Move install to separate module"
2019-03-29 21:23:49 +00:00
xunchang
2478885f3c
Move install to separate module
...
Build libinstall as a shared library. Also drop the dependency on the
global variables in common.h.
Test: unit tests pass, sideload an OTA
Change-Id: I30a20047768ce00689fc0e7851c1c5d712a365a0
2019-03-29 10:27:51 -07:00
Bill Peckham and android-build-merger
575fc7ec07
Merge "Use flags = 0 to avoid fd closing for child updater process" am: 50bda24f1e am: 111663d893
...
am: 2796a9d00f
Change-Id: Ib6473290e13400c791b8e31ffeab0e1507d270bb
2019-03-29 06:57:42 -07:00
Bill Peckham and android-build-merger
2796a9d00f
Merge "Use flags = 0 to avoid fd closing for child updater process" am: 50bda24f1e
...
am: 111663d893
Change-Id: Ie92945a3223a6bc773886fafd16f1d0679cd462a
2019-03-29 06:53:41 -07:00
Bill Peckham and android-build-merger
111663d893
Merge "Use flags = 0 to avoid fd closing for child updater process"
...
am: 50bda24f1e
Change-Id: I0ddb3f3cb29d63922f0c3972e5800f03bd5a85ac
2019-03-29 06:49:40 -07:00