Commit Graph

7712 Commits

Author SHA1 Message Date
Tao Bao 93f65f6df7 [automerger skipped] Parse BCB command to enter rescue mode.
am: 75321ade87 -s ours
am skip reason: change_id I5b7de9dfd898ed8e14bea0d4ad7385a9bae26e94 with SHA1 d9cb014d43 is in history

Change-Id: I5cf072d9b82c58e307c104257a12b3c45455d2f1
2019-04-29 14:26:37 -07:00
Tao Bao f51f548c63 [automerger skipped] minadbd: Support adb reboot under sideload/rescue modes.
am: 7b9b7db877 -s ours
am skip reason: change_id I84daf63e3360b7b4a0af5e055149a4f54e10ba90 with SHA1 10f441a9db is in history

Change-Id: I77fba90b8a5506ff4754bee0b6dd569efe015685
2019-04-29 14:26:27 -07:00
xunchang d2ec7c8f79 [automerger skipped] Add test for minadbd
am: 23f15fcfaf -s ours
am skip reason: change_id I2f073b701b25d7f1aafc59868a7a91a8cbefaf49 with SHA1 9c04eb46b7 is in history

Change-Id: I3500aab156ea8cde0ce18d277a06bf6550f1e677
2019-04-29 14:26:18 -07:00
Tao Bao 00dcd3fbc1 [automerger skipped] minadbd: Support rescue install and getprop commands.
am: e5c6446a10 -s ours
am skip reason: change_id Ibc25daf9fd13f7002e54789f67aaf85d06976bb8 with SHA1 ed717ca17d is in history

Change-Id: Icc2738f1cbc67ea9a1a23dcc7b96a3bab5c0c8eb
2019-04-29 14:26:08 -07:00
Tao Bao ff3f9c3d79 [automerger skipped] Remove the FD parameter from FuseDataProvider ctor.
am: 178cdd4f5c -s ours
am skip reason: change_id I106bbaad05201227bbc5fe28890bbbb06fdcb67e with SHA1 2be9737cf4 is in history

Change-Id: I70d9a3f1ad8b1defc3435a4c16820702524481f5
2019-04-29 14:25:59 -07:00
Tao Bao ee2b4024bf [automerger skipped] Allow entering rescue mode via recovery UI.
am: 378bfbfc5c -s ours
am skip reason: change_id I913dbdbcffd3179e6fa72ca862f74ca8f1364b02 with SHA1 c6dc325e88 is in history

Change-Id: I44775c08042bbc949966fe828a031965e989432f
2019-04-29 14:25:50 -07:00
Tao Bao 44e39cfd15 Merge "Add install/wipe_device.cpp." am: 40ccbe3324
am: a4993ce078

Change-Id: Iaf06e571a794ec8c07edc4c0acc5946735df23c9
2019-04-29 11:59:21 -07:00
Tao Bao a4993ce078 Merge "Add install/wipe_device.cpp."
am: 40ccbe3324

Change-Id: I0a7e05a6ca5d5ea8ea3e7b5bc3a83a61dc218440
2019-04-29 11:54:20 -07:00
Tao Bao 40ccbe3324 Merge "Add install/wipe_device.cpp." 2019-04-29 18:46:53 +00:00
Tianjie Xu 473532343c Merge "Support wipe command in rescue mode" am: 8fc8f39b62
am: 6c9f2acda0

Change-Id: I2b3502cf90f62d6c0c7d223d69cb9e403de4b814
2019-04-29 11:06:22 -07:00
Tianjie Xu 6c9f2acda0 Merge "Support wipe command in rescue mode"
am: 8fc8f39b62

Change-Id: I2c9776d877de6474362c0c67049f9bc5c5647f62
2019-04-29 11:00:29 -07:00
Tianjie Xu 8fc8f39b62 Merge "Support wipe command in rescue mode" 2019-04-29 17:47:20 +00:00
Tao Bao 75321ade87 Parse BCB command to enter rescue mode.
bootloader will set `boot-rescue` in BCB command field to indicate
booting into rescue mode. This CL adds the matching parsing code.

This CL changes the on-screen UI to display the default image while
waiting for each sideload / rescue command.

It also changes the minadbd reboot handlers to use REBOOT_ instead of
the previous ENTER_ actions. This ensures a reboot going through
bootloader, which may load a newly installed bootloader/recovery.

Bug: 128505466
Bug: 128415917
Test: Boot into rescue mode. Run `adb rescue getprop` and `adb rescue
      install`. Check the UI. Then run `adb reboot rescue`.
Change-Id: I5b7de9dfd898ed8e14bea0d4ad7385a9bae26e94
Merged-In: I5b7de9dfd898ed8e14bea0d4ad7385a9bae26e94
(cherry picked from commit d9cb014d43)
2019-04-28 12:14:16 -07:00
Tao Bao 7f19d100b5 Add install/wipe_device.cpp.
Prior to this CL, GetWipePartitionList was declared in install.h
(libinstall) but defined in recovery.cpp (librecovery). This CL
addresses the issue by refactoring wipe-device related functions into
install/wipe_device.cpp.

Test: atest recovery_component_test
Change-Id: I7ebe04ccfda3d793e085403560a0a202752d9ee3
2019-04-26 23:23:19 -07:00
Tao Bao 7027a5fb12 Merge "Add recovery_host_test to TEST_MAPPING." am: 42168c4ab2
am: a11bb6c2c0

Change-Id: I034aeecc1aa5ab439dd7e4cf24ae863a8f9b7a5a
2019-04-26 14:16:52 -07:00
Tao Bao a11bb6c2c0 Merge "Add recovery_host_test to TEST_MAPPING."
am: 42168c4ab2

Change-Id: I43301da565a7ab5e1509a5e14aa7d297f0855dac
2019-04-26 14:11:51 -07:00
Treehugger Robot 42168c4ab2 Merge "Add recovery_host_test to TEST_MAPPING." 2019-04-26 20:30:48 +00:00
Tao Bao 7b9b7db877 minadbd: Support adb reboot under sideload/rescue modes.
Bug: 128415917
Test: Run the following commands under sideload and rescue modes
      respectively.
$ adb reboot
$ adb reboot bootloader
$ adb reboot recovery
$ adb reboot rescue
$ adb reboot invalid
Change-Id: I84daf63e3360b7b4a0af5e055149a4f54e10ba90
Merged-In: I84daf63e3360b7b4a0af5e055149a4f54e10ba90
(cherry picked from commit 10f441a9db)
2019-04-26 12:25:02 -07:00
xunchang 23f15fcfaf Add test for minadbd
Ass some unit tests to check if the minadbd service exit correctly in
the failure case. Also start the fuse and verify the socket communication
between minadbd with adb host, and minadbd with recovery.

Bug: 131037235
Test: run unit tests repeatedly, injects some errors and test fails
without dangling process.
Change-Id: I2f073b701b25d7f1aafc59868a7a91a8cbefaf49
Merged-In: I2f073b701b25d7f1aafc59868a7a91a8cbefaf49
(cherry picked from commit 9c04eb46b7)
2019-04-26 12:24:40 -07:00
Tao Bao e5c6446a10 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
Merged-In: Ibc25daf9fd13f7002e54789f67aaf85d06976bb8
(cherry picked from commit ed717ca17d)
2019-04-26 12:21:55 -07:00
Tao Bao 178cdd4f5c 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
Merged-In: I106bbaad05201227bbc5fe28890bbbb06fdcb67e
(cherry picked from commit 2be9737cf4)
2019-04-26 12:21:38 -07:00
Tao Bao 378bfbfc5c 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
Merged-In: I913dbdbcffd3179e6fa72ca862f74ca8f1364b02
(cherry picked from commit c6dc325e88)
2019-04-26 12:20:03 -07:00
xunchang fedeef6f6d Support wipe command in rescue mode
Bug: 131037235
Test: unit tests pass, run `adb rescue wipe`
Change-Id: I22668f2c98fe2d9195d2561f961c28a7c08e712c
2019-04-26 10:36:48 -07:00
Tao Bao 83186dddb2 Add recovery_host_test to TEST_MAPPING.
Also remove the AndroidTest.xml file, which is no longer needed (the
`data` property in Android.bp takes care of that). The AndroidTest.xml
file would otherwise block `atest recovery_host_test` from running.

Test: TreeHugger; check the test result.
Change-Id: If545878a1f3ae627986e19a94b42162f133b9098
2019-04-26 10:05:55 -07:00
Tao Bao a4c38d860a Merge "Parse BCB command to enter rescue mode." am: e645ba5aca
am: 2f5b6751d8

Change-Id: I9e12a6091c8513b766765d7e152072d4e665ea25
2019-04-25 16:40:01 -07:00
Tao Bao 2f5b6751d8 Merge "Parse BCB command to enter rescue mode."
am: e645ba5aca

Change-Id: I898b6cc59cbb03109e800ddaf6ee3f642a0078f5
2019-04-25 16:35:00 -07:00
Tao Bao e645ba5aca Merge "Parse BCB command to enter rescue mode." 2019-04-25 23:18:08 +00:00
Tao Bao d9cb014d43 Parse BCB command to enter rescue mode.
bootloader will set `boot-rescue` in BCB command field to indicate
booting into rescue mode. This CL adds the matching parsing code.

This CL changes the on-screen UI to display the default image while
waiting for each sideload / rescue command.

It also changes the minadbd reboot handlers to use REBOOT_ instead of
the previous ENTER_ actions. This ensures a reboot going through
bootloader, which may load a newly installed bootloader/recovery.

Bug: 128505466
Test: Boot into rescue mode. Run `adb rescue getprop` and `adb rescue
      install`. Check the UI. Then run `adb reboot rescue`.
Change-Id: I5b7de9dfd898ed8e14bea0d4ad7385a9bae26e94
2019-04-25 14:02:41 -07:00
Tao Bao 4507b9d0fb Merge "Add TEST_MAPPING." am: c6ebcaaad7
am: d8cecf4df9

Change-Id: Ia7377f8c4baebc4175855465befca024d87243bf
2019-04-24 17:39:28 -07:00
Tao Bao d8cecf4df9 Merge "Add TEST_MAPPING."
am: c6ebcaaad7

Change-Id: Ib9d892cf4657a6b4cce9c15c6f25f5a89b4dbdef
2019-04-24 17:36:26 -07:00
Treehugger Robot c6ebcaaad7 Merge "Add TEST_MAPPING." 2019-04-25 00:18:44 +00:00
Tao Bao a14e860190 Add TEST_MAPPING.
Currently it triggers minadbd_test, recovery_unit_test and
recovery_component_test during presubmit.

Test: TreeHugger
Change-Id: Ie0e2ddc9519a7e9b66d059cdf0b81dcbba631c25
2019-04-24 14:03:52 -07:00
Tao Bao 24eb4d1cdd Merge "minadbd: Support adb reboot under sideload/rescue modes." am: cf1f715d62
am: 0d6f57a90f

Change-Id: I4be98a85565ada3f1e97f038ff116174d7f03559
2019-04-24 13:56:24 -07:00
Tao Bao 0d6f57a90f Merge "minadbd: Support adb reboot under sideload/rescue modes."
am: cf1f715d62

Change-Id: Ie0037cbef2daa1e47f169ff353ca3ac4fd24c164
2019-04-24 13:52:22 -07:00
Tao Bao cf1f715d62 Merge "minadbd: Support adb reboot under sideload/rescue modes." 2019-04-24 20:33:18 +00:00
Tao Bao 10f441a9db minadbd: Support adb reboot under sideload/rescue modes.
Bug: 128415917
Test: Run the following commands under sideload and rescue modes
      respectively.
$ adb reboot
$ adb reboot bootloader
$ adb reboot recovery
$ adb reboot rescue
$ adb reboot invalid
Change-Id: I84daf63e3360b7b4a0af5e055149a4f54e10ba90
2019-04-23 23:50:12 -07:00
Tianjie Xu ba4f02398f Merge "Add test for minadbd" am: c92f412b8d
am: b63e6963ec

Change-Id: I8a1e67369687b2382d822d174570413e143b6bbc
2019-04-23 15:51:19 -07:00
Tianjie Xu b63e6963ec Merge "Add test for minadbd"
am: c92f412b8d

Change-Id: Ie742f6993faa062737ee41cd308a3d249023af97
2019-04-23 15:43:54 -07:00
Tianjie Xu c92f412b8d Merge "Add test for minadbd" 2019-04-23 22:26:54 +00:00
xunchang 9c04eb46b7 Add test for minadbd
Ass some unit tests to check if the minadbd service exit correctly in
the failure case. Also start the fuse and verify the socket communication
between minadbd with adb host, and minadbd with recovery.

Bug: 131037235
Test: run unit tests repeatedly, injects some errors and test fails
without dangling process.
Change-Id: I2f073b701b25d7f1aafc59868a7a91a8cbefaf49
2019-04-23 11:33:57 -07:00
Tianjie Xu 3e165c8607 Merge changes Ibdb7dd0b,Iafd3e846 am: 72e6e55e34
am: 05e295b755

Change-Id: Ie71d74670d017e275329dd5e3b59ca45e9c6524a
2019-04-23 11:26:08 -07:00
Tianjie Xu 05e295b755 Merge changes Ibdb7dd0b,Iafd3e846
am: 72e6e55e34

Change-Id: I2cf9f6e8c489b6c48056687d0405ba3585df5b9a
2019-04-23 11:04:48 -07:00
Tianjie Xu 72e6e55e34 Merge changes Ibdb7dd0b,Iafd3e846
* changes:
  matches_locale no longer accept empty locales in the png file
  Fall back to en-US if localized bitmap is missing for a locale
2019-04-23 17:31:23 +00:00
Tao Bao 2050b0efb9 Merge "minadbd: Support rescue install and getprop commands." am: f365574a60
am: 8c7085878c

Change-Id: Ie21b5177cccdc2e65d7ceedac89b8402a44ced27
2019-04-22 15:45:47 -07:00
xunchang 34723087fe matches_locale no longer accept empty locales in the png file
The legacy png files have an empty line in the end. And the recovery
used to match any missing locale, e.g. "he" with that line and gets an
empty image.

Since the empty image is barely useful, we should just error out and
fall back to the default locale.

This reversed the unit test check added in d17a688525

Bug: 128934634
Test: run locale test with "he" and legacy images, recovery reports
error and doesn't crash even without default locale fall back

Change-Id: Ibdb7dd0b42348de5e392c834cce67ff02be85c24
2019-04-22 15:32:17 -07:00
Tao Bao 8c7085878c Merge "minadbd: Support rescue install and getprop commands."
am: f365574a60

Change-Id: I380d0ae30f1ea9e03bfdb880be1107acd2fb28d8
2019-04-22 15:23:45 -07:00
Tao Bao f365574a60 Merge "minadbd: Support rescue install and getprop commands." 2019-04-22 22:08:52 +00:00
xunchang 9d05c8a357 Fall back to en-US if localized bitmap is missing for a locale
We used to show the image for the last locale or an empty image, if
the localized image is missing for a specific locale. As the default
english one is more meaningful to users, we should just error out and
fall back to use the default locale when the image loading fails.

Bug: 128934634
Test: run graphic test, locale test
Change-Id: Iafd3e8466aec63b4952d1959b2a3d37e358677d4
2019-04-22 14:39:51 -07: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 Bao df739f4835 Merge "Allow entering rescue mode via recovery UI." am: b951138ebe
am: bca2ceb7a7

Change-Id: I0551d7fa0cfd8fa7c8d1ce6e4447e99a584e4c1e
2019-04-18 15:10:24 -07:00