Commit Graph

5917 Commits

Author SHA1 Message Date
Tao Bao 9fa43507ef [automerger skipped] Merge "recovery: Split main() into recovery_main.cpp." am: 0204e88073
am: 17f6c1b041  -s ours

Change-Id: I86f2a84affaf0d03be0431d35d265767b1ba68c1
2018-05-01 11:09:47 -07:00
Tao Bao 17f6c1b041 Merge "recovery: Split main() into recovery_main.cpp."
am: 0204e88073

Change-Id: I474502fc51b28b3e69e9638c82534bfea62903a7
2018-05-01 11:04:46 -07:00
Tao Bao 0204e88073 Merge "recovery: Split main() into recovery_main.cpp." 2018-05-01 17:54:40 +00:00
Tao Bao 6d99d4b457 recovery: Split main() into recovery_main.cpp.
This prepares for moving more codes from recovery into librecovery, so
that they will become more easily testable. recovery_main.cpp will be
the source code for recovery module, with the rest moved into
librecovery. recovery_main.cpp mainly does the initializations, such as
setting up the logger.

Test: mmma -j bootable/recovery
Test: recovery_component_test
Test: Build and boot into recovery image on marlin.
Change-Id: I8e846524546b6f3f0e32ed869e851f62261eef23
Merged-In: I8e846524546b6f3f0e32ed869e851f62261eef23
2018-05-01 09:48:00 -07:00
Tao Bao 2ac56afc7b recovery: Split main() into recovery_main.cpp.
This prepares for moving more codes from recovery into librecovery, so
that they will become more easily testable. recovery_main.cpp will be
the source code for recovery module, with the rest moved into
librecovery. recovery_main.cpp mainly does the initializations, such as
setting up the logger.

Test: mmma -j bootable/recovery
Test: recovery_component_test
Test: Build and boot into recovery image on marlin.
Change-Id: I8e846524546b6f3f0e32ed869e851f62261eef23
(cherry picked from commit c241cb662440551eb0d2f42345f7ee08cf60a7dd)
2018-04-30 21:04:55 -07:00
Tao Bao 39caabc7e3 Merge "Drop '#include "ui.h"' from device.h." am: 2de12da142
am: 7e61191258

Change-Id: I1db9c680ccbaa877a2c730541133436c16f7d467
2018-04-30 19:09:47 -07:00
Tao Bao 7e61191258 Merge "Drop '#include "ui.h"' from device.h."
am: 2de12da142

Change-Id: I339621dbc9c8cebe78fa7bcf30e9c7e070e649af
2018-04-30 19:04:03 -07:00
Tao Bao 2de12da142 Merge "Drop '#include "ui.h"' from device.h." 2018-05-01 01:54:45 +00:00
Tao Bao c16fd8a931 Drop '#include "ui.h"' from device.h.
We don't need the dependency in the header.

Test: mmma -j bootable/recovery
Change-Id: I03741ae7911a7e8bf1284b2821cf986ca0ab434e
2018-04-30 17:15:17 -07:00
Tao Bao c3674ab1b2 Merge changes I78839ed4,I75ac0e26 am: e4d65b681a
am: 040674586b

Change-Id: I27548f7aa4871b50584a0c88d33e6383755f648e
2018-04-30 12:58:47 -07:00
Tao Bao 040674586b Merge changes I78839ed4,I75ac0e26
am: e4d65b681a

Change-Id: I303e20e6d7f36a355f6cca9798c3c598fe10777b
2018-04-30 12:53:55 -07:00
Tao Bao e4d65b681a Merge changes I78839ed4,I75ac0e26
* changes:
  recovery: Move a few constants closer to their uses.
  recovery: Fix the return value when failing to convert to FBE.
2018-04-30 19:39:42 +00:00
Tao Bao aac9d9fcf8 recovery: Move a few constants closer to their uses.
Test: mmma -j bootable/recovery
Change-Id: I78839ed487ef41b4eaa3787cb7b4bf33fb0d164a
2018-04-30 10:57:36 -07:00
Tao Bao 406a6ff5e6 recovery: Fix the return value when failing to convert to FBE.
Test: Build and flash aosp_angler-userdebug. Choose 'Convert to file
      encryption' from Developer Options. Converting to FBE still works.
Change-Id: I75ac0e266af2d00bfaff0664f8bcee74a5f16b41
2018-04-30 10:55:59 -07:00
android-build-prod (mdb) 1c1737b660 Merge "Merge libmounts into libotautil." am: 686353215f
am: cddf5dbf67

Change-Id: I57bcd1195084d2e60861aa5b410e2eb50c41c3c3
2018-04-28 09:55:49 -07:00
android-build-prod (mdb) cddf5dbf67 Merge "Merge libmounts into libotautil."
am: 686353215f

Change-Id: Id8592b7ac8fe83406928c92f24dbcc88fdaf8ca9
2018-04-28 09:52:14 -07:00
android-build-prod (mdb) 686353215f Merge "Merge libmounts into libotautil." 2018-04-28 16:46:19 +00:00
Tao Bao 9a319f01f8 Merge libmounts into libotautil.
Export its header (mounts.h) from there, and drop the dot dot dependency
from libupdater / updater.

Test: mmma bootable/recovery
Test: recovery_component_test
Change-Id: Ic26a6b9b78a34dbe1f178b138f3abaafffbec44c
2018-04-27 21:13:57 -07:00
Tao Bao 5d096631ac Merge "recovery: Revoke (most of) short options." am: 3de3756081
am: 29c9690864

Change-Id: I25522cc339a561129e3a933c1c1c8a13e2caf44a
2018-04-27 16:20:02 -07:00
Tao Bao 29c9690864 Merge "recovery: Revoke (most of) short options."
am: 3de3756081

Change-Id: I5be31e78b5531412405a457ed6bd042160f7e014
2018-04-27 16:15:44 -07:00
Tao Bao 3de3756081 Merge "recovery: Revoke (most of) short options." 2018-04-27 23:09:31 +00:00
Tao Bao f9f17347c8 recovery: Revoke (most of) short options.
`recovery` is not a command line tool, and these short options don't
have the common meanings that are used elsewhere.

In the platform code, we're not actively using the short forms.
 - bootable/recovery/uncrypt/uncrypt.cpp
 - bootable/recovery/updater/install.cpp
 - frameworks/base/core/java/android/os/RecoverySystem.java
 - system/core/adb/services.cpp
 - system/core/init/builtins.cpp
 - system/update_engine/hardware_android.cc
 - system/vold/cryptfs.cpp
(Callers must have used libbootloader_message.)

'--show_text' and '--just_exit' are not that obvious from the initial
commit messages. They appear to be used by vendor code (e.g.
'--show_text' is optionally used by bootloader, as in the noted bug). So
this CL keeps them as is for now.

Test: `mmma -j bootable/recovery`
Test: Check the code search for possible callers to recovery.
Change-Id: I8a87f5fb50131d647dfc8290381ca47a60f543fa
2018-04-27 12:34:14 -07:00
Tianjie Xu 52635f5259 Merge "Save the target file when applypatch tests fail" am: 957c1abfba
am: 7ad3e673ba

Change-Id: Ic3786f79e280ada93c19201f19e55aa2b67c14ad
2018-04-27 09:58:19 -07:00
Tianjie Xu 7ad3e673ba Merge "Save the target file when applypatch tests fail"
am: 957c1abfba

Change-Id: I100dd5ba4fb2c3bd4a29bd8759dcd65f03afbe50
2018-04-27 09:53:47 -07:00
Tianjie Xu 957c1abfba Merge "Save the target file when applypatch tests fail" 2018-04-27 16:45:25 +00:00
Zhomart Mukhamejanov d4270924f0 Merge "updater_sample: fix gen_update_config.py" am: 2573b6fa1c
am: 811baa37d3

Change-Id: Ib27fa8dbb7679ee0762923d1449ddded88403333
2018-04-26 21:53:28 -07:00
Zhomart Mukhamejanov 811baa37d3 Merge "updater_sample: fix gen_update_config.py"
am: 2573b6fa1c

Change-Id: I4e21d34a1cfe6181e0db3d49296db54e21b70805
2018-04-26 21:47:25 -07:00
Zhomart Mukhamejanov 2573b6fa1c Merge "updater_sample: fix gen_update_config.py" 2018-04-27 04:25:23 +00:00
android-build-prod (mdb) 91dd4feefc [automerger skipped] Merge "recovery: Print the actually required battery level." am: ca456f3964
am: b73e921a27  -s ours

Change-Id: I2f2b7830adb57bb638bd6058177132f2d860889a
2018-04-26 21:22:02 -07:00
android-build-prod (mdb) b73e921a27 Merge "recovery: Print the actually required battery level."
am: ca456f3964

Change-Id: I2d417474c3e37add42cd7a9f1055402f5c1b8a26
2018-04-26 21:15:21 -07:00
android-build-prod (mdb) ca456f3964 Merge "recovery: Print the actually required battery level." 2018-04-27 04:03:13 +00:00
Tao Bao 96156d1f31 Merge "recovery: Print the actually required battery level." into pi-dev-plus-aosp 2018-04-27 03:14:55 +00:00
Tianjie Xu 3f638ee834 Save the target file when applypatch tests fail
Save the target file to tempfile upon unittest failures so that we can
try to decompress the deflate chunks in the flaky unittests. And print
the zlib version in case that gets changed.

Also the SHA1 of the uncompressed data seems correct; so only keep the
final SHA1 to double confirm.

Bug: 67849209
Test: recovery_component_test
Change-Id: Ic6447c2b75c29379d6844cd23a0ff1c4305694a0
2018-04-26 19:46:39 -07:00
Zhomart Mukhamejanov 72a4d465bf updater_sample: fix gen_update_config.py
Fix gen_update_config.py.
And add tests for gen_update_config.py.

Test: python3 updater_sample/tools/gen_update_config_test.py

Change-Id: I0d270f1d5d7635855ee9acb0dd094e083cd33e3a
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-04-26 19:40:48 -07:00
Tao Bao 63503282a1 [automerger skipped] Merge "Mark ui_print with __printflike." am: 220b531e3d
am: a742fb0994  -s ours

Change-Id: I3f1a53e1c20e2a43fa42a104263bd528219a69b7
2018-04-26 15:37:34 -07:00
Tao Bao 3eb0a4705f Merge "Mark ui_print with __printflike." into pi-dev-plus-aosp 2018-04-26 22:36:20 +00:00
Tao Bao 6d90a9d4a0 recovery: Print the actually required battery level.
It should be one of BATTERY_OK_PERCENTAGE (20) and
BATTERY_WITH_CHARGER_OK_PERCENTAGE (15), depending on the charger state.

Also move the battery level related constants next to their users.

Test: mmma -j bootable/recovery
Test: Build and boot into recovery with a pending OTA. Check the log.
Change-Id: I7513f59c4718ec8e2db16c5266928470c2308648
(cherry picked from commit f2ea6d7999)
2018-04-26 15:30:14 -07:00
Tao Bao a742fb0994 Merge "Mark ui_print with __printflike."
am: 220b531e3d

Change-Id: Ia13734618844f2ca82f83da897823183d8c9e443
2018-04-26 15:26:25 -07:00
Tao Bao f2ea6d7999 recovery: Print the actually required battery level.
It should be one of BATTERY_OK_PERCENTAGE (20) and
BATTERY_WITH_CHARGER_OK_PERCENTAGE (15), depending on the charger state.

Also move the battery level related constants next to their users.

Test: mmma -j bootable/recovery
Test: Build and boot into recovery with a pending OTA. Check the log.
Change-Id: I7513f59c4718ec8e2db16c5266928470c2308648
Merged-In: I7513f59c4718ec8e2db16c5266928470c2308648
2018-04-26 15:21:34 -07:00
Tao Bao 220b531e3d Merge "Mark ui_print with __printflike." 2018-04-26 22:18:17 +00:00
Tao Bao aae7efd7a2 Mark ui_print with __printflike.
And fix an issue as a result of the change.

Test: mmma -j bootable/recovery
Change-Id: I94e6384a1f39e9c37a8ed029d235142738d6e5d3
Merged-In: I94e6384a1f39e9c37a8ed029d235142738d6e5d3
2018-04-26 13:42:42 -07:00
Zhomart Mukhamejanov b83de268c6 Merge "sample_updater: create tools/gen_update_config.py" am: 6bd1d9b8d9
am: 9882160d8d

Change-Id: I79b31a904c2c60e33272e532d061da896c769e96
2018-04-26 12:45:55 -07:00
Zhomart Mukhamejanov f3cb640f1b Merge "sample_updater: add tests resources" am: 7d064166ce
am: 6131d00348

Change-Id: Ice6103cd297e321a4d3d51b7c6c091aa1906b005
2018-04-26 12:45:23 -07:00
Zhomart Mukhamejanov 9882160d8d Merge "sample_updater: create tools/gen_update_config.py"
am: 6bd1d9b8d9

Change-Id: I40f5c3650517bcdc20194fbc7abf0cadaccd9d4f
2018-04-26 12:36:04 -07:00
Zhomart Mukhamejanov 6131d00348 Merge "sample_updater: add tests resources"
am: 7d064166ce

Change-Id: I96ecdfef2f05798c4f072ee21718dbb4c0c640f2
2018-04-26 12:35:44 -07:00
Tao Bao 370d600877 Mark ui_print with __printflike.
And fix an issue as a result of the change.

Test: mmma -j bootable/recovery
Change-Id: I94e6384a1f39e9c37a8ed029d235142738d6e5d3
(cherry picked from commit 8af89c3a02c1bf358fc3c3b4e0a7cedc8f48631e)
2018-04-26 19:23:04 +00:00
Zhomart Mukhamejanov 6bd1d9b8d9 Merge "sample_updater: create tools/gen_update_config.py" 2018-04-26 19:21:08 +00:00
Zhomart Mukhamejanov 7d064166ce Merge "sample_updater: add tests resources" 2018-04-26 19:20:56 +00:00
Tianjie Xu 0aa1a3b941 Merge "Dump the uncompressed data's SHA1 to debug flaky tests" am: cc8587b508
am: 247821648f

Change-Id: Id7b098becfc35b4c94213582f274e3c08c19583b
2018-04-26 10:41:39 -07:00
Tianjie Xu 247821648f Merge "Dump the uncompressed data's SHA1 to debug flaky tests"
am: cc8587b508

Change-Id: Iaca05198698844f1058e625647e545e55ae47ab8
2018-04-26 10:36:43 -07:00