Commit Graph

7670 Commits

Author SHA1 Message Date
xunchang aed1428737 [automerger skipped] DO NOT MERGE: Add socket communication between recovery and minadbd am: 95d67323a4 -s ours
am: 06e006ca60 -s ours
am skip reason: subject contains skip directive

Change-Id: I284e5df434448b9484ff15dd474f73418a6d0287
2019-04-16 23:40:10 -07:00
Tao Bao e8a7f8a430 [automerger skipped] DO NOT MERGE: Build libinstall as a static library. am: 2f8afba707 -s ours
am: b937028417 -s ours
am skip reason: subject contains skip directive

Change-Id: I5423f195ae2d0af2cb9f9ce06936cc1d764db6e3
2019-04-16 23:40:04 -07:00
xunchang 06e006ca60 [automerger skipped] DO NOT MERGE: Add socket communication between recovery and minadbd
am: 95d67323a4 -s ours
am skip reason: SHA1 95d67323a4 skipped by user xunchang

Change-Id: I8e5c027a88b224523728a37f1b8b68a1b1490421
2019-04-16 22:06:24 -07:00
Tao Bao b937028417 [automerger skipped] DO NOT MERGE: Build libinstall as a static library.
am: 2f8afba707 -s ours
am skip reason: SHA1 2f8afba707 skipped by user xunchang

Change-Id: Id6835cbd7845acdb91a8bb7b0888a003b01c48a3
2019-04-16 22:06:17 -07:00
Tianjie Xu 883426085c Merge "Move load & restore logs to logging.cpp" am: 3aff98aee8 am: c3a273b33a
am: f980ad94ef

Change-Id: Ib9dc6cca578c1c045c4eaa7f3f4e42527e1d5c2b
2019-04-16 12:42:11 -07:00
Tao Bao 0549efe3c1 Merge "Remove the FD parameter from FuseDataProvider ctor." am: bb0c6e1fe7 am: 510daac2cc
am: 265ff4fffd

Change-Id: I8e7851aafbd45d440874fb0756f97347194bfb6a
2019-04-16 12:26:59 -07:00
xunchang 95d67323a4 DO NOT MERGE: 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
(cherry picked from commit 34690ced91)
2019-04-16 19:26:20 +00:00
Tao Bao 2f8afba707 DO NOT MERGE: 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-16 19:25:23 +00:00
Tianjie Xu 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 c3a273b33a Merge "Move load & restore logs to logging.cpp"
am: 3aff98aee8

Change-Id: I7da098091879ca823be31bd12b60dc12d5c45145
2019-04-16 11:07:47 -07:00
Tao Bao 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 3aff98aee8 Merge "Move load & restore logs to logging.cpp" 2019-04-16 17:57:02 +00:00
Tao Bao 510daac2cc Merge "Remove the FD parameter from FuseDataProvider ctor."
am: bb0c6e1fe7

Change-Id: I56b4751370b621bb78be64e77c78d44b367c9990
2019-04-16 10:51:23 -07:00
Treehugger Robot 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 2e1c88306b Merge "Move wipe cache|data to libinstall" am: 9fc764f1f0 am: 2148d317cd
am: 97e692fab3

Change-Id: I0417a4f2eb0d3237db5070e7d355be48d511355c
2019-04-15 16:38:43 -07:00
Tianjie Xu 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 2148d317cd Merge "Move wipe cache|data to libinstall"
am: 9fc764f1f0

Change-Id: I6d3fc5b0fa75a25a96d8939e0f9c3b04de1f5245
2019-04-15 15:57:17 -07:00
Tianjie Xu 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 90019a4cf2 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 0b172415fd -s ours am: 440d03ede2 -s ours
am: b5937efb0d -s ours
am skip reason: subject contains skip directive

Change-Id: I3692dbb4a164e9d483c8117ff0e608db344d5205
2019-04-13 05:10:55 -07:00
Bill Yi 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 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 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
TreeHugger Robot 6003a93bc2 Merge "Import translations. DO NOT MERGE" 2019-04-12 06:57:26 +00:00
Tianjie Xu de013b52b1 Merge "Add socket communication between recovery and minadbd" am: 6c5f70b9b2 am: f9709883f1
am: e087edcab0

Change-Id: I7339df203a1f6dbfb1120130d3e22c19575140eb
2019-04-11 17:41:48 -07:00
Tianjie Xu 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 f9709883f1 Merge "Add socket communication between recovery and minadbd"
am: 6c5f70b9b2

Change-Id: Iad5a591943b860bd4234b43c0b1f0a9609173993
2019-04-11 16:57:53 -07:00
Bill Yi 79c5fb32e8 Import translations. DO NOT MERGE
Change-Id: I87585a82fccf625bc05c5805fc90459d572cee10
Auto-generated-cl: translation import
2019-04-11 16:52:41 -07:00
Tianjie Xu 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 33d47824c6 Merge "Build libinstall as a static library." am: 38d5e60874 am: a8cc70fbe1
am: 8630a658e9

Change-Id: I77dd3c85763aa7c780cce62940764023c2ededeb
2019-04-09 05:11:42 -07:00
Tao Bao 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 a8cc70fbe1 Merge "Build libinstall as a static library."
am: 38d5e60874

Change-Id: Iafa5f28ec978dc1276a5b2bfdbb433e77e216dac
2019-04-08 15:05:28 -07:00
Tao Bao 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
Bill Yi 5954a237cb Import translations. DO NOT MERGE
Change-Id: I6aff7f01df0c28775a2dbef26ee3476cb5d83060
Auto-generated-cl: translation import
2019-04-08 09:53:18 -07:00
Tao Bao 5361e8bd2b Merge "libotautil exports libfstab header." am: 8e0821e690 am: 416343e73a
am: 98b49695d1

Change-Id: I3c20aba59450ed7c08b2b181309fcc8b5ba8a3f7
2019-04-04 01:10:59 -07:00
Tao Bao 98b49695d1 Merge "libotautil exports libfstab header." am: 8e0821e690
am: 416343e73a

Change-Id: I113d96d69978e9e6084e99481749c97b1a2d2928
2019-04-04 00:38:46 -07:00
Bill Rassieur 3defb84d6a Merge master@5406228 into qt-dev. am: a1382c23b4
am: 909f234f4d

Change-Id: Icdf86c896a2b8ee8147f90e60e7203662d7cd053
2019-04-03 19:47:45 -07:00
Tao Bao d308b3a6b0 Merge "libotautil exports libfstab header." am: 8e0821e690 am: 416343e73a
am: 19d587d22c

Change-Id: Id40eeb018b6ad5dfb0d5326b8c1144dba4788619
2019-04-03 17:59:57 -07:00
Tao Bao 19d587d22c Merge "libotautil exports libfstab header." am: 8e0821e690
am: 416343e73a

Change-Id: I5abbf4631d23b5dd3dd0ceda62442d26d4e928ae
2019-04-03 17:29:10 -07:00
Bill Rassieur 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 416343e73a Merge "libotautil exports libfstab header."
am: 8e0821e690

Change-Id: I652370bda1e5523379c20612e20de1f16cc1201a
2019-04-03 17:06:38 -07:00
Tao Bao 8e0821e690 Merge "libotautil exports libfstab header." 2019-04-03 23:48:21 +00:00
Bill Rassieur 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
Bill Rassieur 909f234f4d Merge master@5406228 into qt-dev.
am: a1382c23b4

Change-Id: I09d027b01e2e94035d71a65cdf6fd5f79fc22ba7
2019-04-03 08:31:11 -07:00