Commit Graph
7667 Commits
Author SHA1 Message Date
Tao Baoandandroid-build-merger 2050b0efb9 Merge "minadbd: Support rescue install and getprop commands." am: f365574a60
am: 8c7085878c

Change-Id: Ie21b5177cccdc2e65d7ceedac89b8402a44ced27
2019-04-22 15:45:47 -07:00
Tao Baoandandroid-build-merger 8c7085878c Merge "minadbd: Support rescue install and getprop commands."
am: f365574a60

Change-Id: I380d0ae30f1ea9e03bfdb880be1107acd2fb28d8
2019-04-22 15:23:45 -07:00
Tao BaoandGerrit Code Review f365574a60 Merge "minadbd: Support rescue install and getprop commands." 2019-04-22 22:08:52 +00:00
Tao Bao ed717ca17d minadbd: Support rescue install and getprop commands.
Bug: 128415917
Test: Enter rescue mode on taimen. Send the following commands:
      `adb rescue getprop ro.build.fingerprint`
      `adb rescue getprop ro.build.date.utc`
      `adb rescue install /path/to/package.zip`
Test: Sideload on taimen w/ `adb sideload /path/to/package.zip`.
Change-Id: Ibc25daf9fd13f7002e54789f67aaf85d06976bb8
2019-04-19 12:53:55 -07:00
Tao Baoandandroid-build-merger df739f4835 Merge "Allow entering rescue mode via recovery UI." am: b951138ebe
am: bca2ceb7a7

Change-Id: I0551d7fa0cfd8fa7c8d1ce6e4447e99a584e4c1e
2019-04-18 15:10:24 -07:00
Tao Baoandandroid-build-merger bca2ceb7a7 Merge "Allow entering rescue mode via recovery UI."
am: b951138ebe

Change-Id: I76b5e4de39d45622bb3c644145fd2cbb9a04bd0f
2019-04-18 15:05:29 -07:00
Tao BaoandGerrit Code Review b951138ebe Merge "Allow entering rescue mode via recovery UI." 2019-04-18 21:45:50 +00:00
Bill Yiandandroid-build-merger ca44dc4aa4 [automerger skipped] Import translations. DO NOT MERGE
am: d0052c30ce -s ours
am skip reason: subject contains skip directive

Change-Id: I6f80b1be7b7f0ab1046b1d65e1110de4a093cc83
2019-04-17 15:19:22 -07:00
Tao Bao c6dc325e88 Allow entering rescue mode via recovery UI.
Only enabled on debuggable builds.

Bug: 128415917
Test: Sideload package on taimen.
Test: Choose "Enter rescue" from recovery UI.
Change-Id: I913dbdbcffd3179e6fa72ca862f74ca8f1364b02
2019-04-17 14:07:23 -07:00
xunchangandandroid-build-merger 46ecbc897c DO NOT MERGE: Move load & restore logs to logging.cpp
am: cd780b456f

Change-Id: Ieade28272c726cf7e81da7cc633fe40489db17d4
2019-04-16 22:06:39 -07:00
xunchangandandroid-build-merger fde9a21127 [automerger skipped] DO NOT MERGE: Move wipe cache|data to libinstall
am: 388d253b9c -s ours
am skip reason: SHA1 388d253b9c skipped by user xunchang

Change-Id: I6d2b097e941a5e0c45c420a33d0a733bb384184e
2019-04-16 22:06:32 -07:00
xunchangandandroid-build-merger 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 Baoandandroid-build-merger 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
Bill Yi d0052c30ce Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie58e59d8d2731350f58bc9733e4599f75a3aca61
2019-04-16 19:59:20 -07:00
xunchang cd780b456f DO NOT MERGE: 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
(cherry picked from commit 2239b9e4dd)
2019-04-16 19:26:44 +00:00
xunchang 388d253b9c DO NOT MERGE: 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
(cherry picked from commit 316e971746)
2019-04-16 19:26:31 +00: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 BaoandTianjie Xu 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 Xuandandroid-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 Xuandandroid-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 Baoandandroid-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 XuandGerrit Code Review 3aff98aee8 Merge "Move load & restore logs to logging.cpp" 2019-04-16 17:57:02 +00:00
Tao Baoandandroid-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 RobotandGerrit 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 Xuandandroid-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 Xuandandroid-build-merger 2148d317cd Merge "Move wipe cache|data to libinstall"
am: 9fc764f1f0

Change-Id: I6d3fc5b0fa75a25a96d8939e0f9c3b04de1f5245
2019-04-15 15:57:17 -07:00
Tianjie XuandGerrit 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 Yiandandroid-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 Yiandandroid-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 RobotandGerrit 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 Xuandandroid-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 Xuandandroid-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 XuandGerrit 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 Baoandandroid-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 Baoandandroid-build-merger a8cc70fbe1 Merge "Build libinstall as a static library."
am: 38d5e60874

Change-Id: Iafa5f28ec978dc1276a5b2bfdbb433e77e216dac
2019-04-08 15:05:28 -07:00
Tao BaoandGerrit 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 Baoandandroid-build-merger 98b49695d1 Merge "libotautil exports libfstab header." am: 8e0821e690
am: 416343e73a

Change-Id: I113d96d69978e9e6084e99481749c97b1a2d2928
2019-04-04 00:38:46 -07:00
Bill Rassieurandandroid-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 Baoandandroid-build-merger 416343e73a Merge "libotautil exports libfstab header."
am: 8e0821e690

Change-Id: I652370bda1e5523379c20612e20de1f16cc1201a
2019-04-03 17:06:38 -07:00
Tao BaoandGerrit Code Review 8e0821e690 Merge "libotautil exports libfstab header." 2019-04-03 23:48:21 +00:00
Bill Rassieurandandroid-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 Andersonandandroid-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 Andersonandandroid-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