Commit Graph

5883 Commits

Author SHA1 Message Date
Tao Bao
96156d1f31 Merge "recovery: Print the actually required battery level." into pi-dev-plus-aosp 2018-04-27 03:14:55 +00: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
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
Tianjie Xu
cc8587b508 Merge "Dump the uncompressed data's SHA1 to debug flaky tests" 2018-04-26 17:23:00 +00:00
android-build-prod (mdb)
7acf21c34a Merge "Rename CacheLocation to Paths." am: 49c7f1cec3
am: ce562bacfd

Change-Id: I5b084052f3f84a6e58e1267e58a125a7ed47080e
2018-04-26 09:43:25 -07:00
android-build-prod (mdb)
ce562bacfd Merge "Rename CacheLocation to Paths."
am: 49c7f1cec3

Change-Id: I335f1df6699d8316d41959c21a09cbf944d7554b
2018-04-26 09:38:23 -07:00
android-build-prod (mdb)
49c7f1cec3 Merge "Rename CacheLocation to Paths." 2018-04-26 16:24:41 +00:00
Tao Bao
641fa97def Rename CacheLocation to Paths.
We have a general need for overriding more paths (e.g. "/tmp"), mostly
for testing purpose. Rename CacheLocation to Paths, and use that to
manage TEMPORARY_{INSTALL,LOG}_FILE.

Test: mmma -j bootable/recovery
Test: recovery_component_test
Change-Id: Ia8ce8e5695df37ca434f13ac4d3206de1e8e9396
2018-04-25 21:46:00 -07:00
Tianjie Xu
9e1ccd47b4 Dump the uncompressed data's SHA1 to debug flaky tests
Dump the SHA1 of the uncompressed data in applypatch to confirm if we
are at least doing the bspatch part correctly. (I expect so since the actual
length of the uncompressed data matches the expected length).

Also try to decompress the deflate chunk inside the recovery image for
these two flacky tests. In theory, there shouldn't be randomness in
zlib; so we would know if we process the data wrongly if the deflate fails
to decompress.

Bug: 67849209
Test: recovery_component_test
Change-Id: Id947522153b1eeb0d10d161298a96fb045f92018
2018-04-25 20:00:56 -07:00
Zhomart Mukhamejanov
02e912c235 sample_updater: add tests resources
This resource files are used in tests. ota package zip file
contains only text files.
Config files are generated using tools/gen_update_config.py

Test: N/A

Change-Id: I9d3d0f81472dc20db18b32f4a9445a998b68b0e3
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-04-25 18:18:46 -07:00
Zhomart Mukhamejanov
e7248bef4e Merge "updater_sample: Use stubs libs for android.test.base / runner." am: d97b643de4
am: 23d17302b1

Change-Id: Ic155ecfd3dab5ba2738b87a68be06a19c9abda26
2018-04-25 17:57:03 -07:00
Zhomart Mukhamejanov
23d17302b1 Merge "updater_sample: Use stubs libs for android.test.base / runner."
am: d97b643de4

Change-Id: I65d85eea826232633919a2c91a66b80a1c37e6c6
2018-04-25 17:52:00 -07:00
Zhomart Mukhamejanov
d5a41822c2 sample_updater: create tools/gen_update_config.py
gen_update_config.py generates JSON config files
from given OTA image zip files.

README.md is updated.

Test: manually

Change-Id: Ifd09b49a73983a42752ee3842a566cecedb9cae0
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-04-25 17:43:26 -07:00
Zhomart Mukhamejanov
d97b643de4 Merge "updater_sample: Use stubs libs for android.test.base / runner." 2018-04-26 00:39:20 +00:00
android-build-prod (mdb)
cf277abb8f Merge "Rename the dir for SystemUpdaterSample." am: a544bfab2b
am: 4b52553cbb

Change-Id: If4113d931c95cb0e076035a384a9a5193e4a8369
2018-04-25 17:26:33 -07:00
android-build-prod (mdb)
4b52553cbb Merge "Rename the dir for SystemUpdaterSample."
am: a544bfab2b

Change-Id: If6329a0f9a7732b99d11f6233ed56f72db31ac96
2018-04-25 17:22:22 -07:00
android-build-prod (mdb)
a544bfab2b Merge "Rename the dir for SystemUpdaterSample." 2018-04-26 00:10:33 +00:00
Tao Bao
daa65aed99 updater_sample: Use stubs libs for android.test.base / runner.
To address the warning below (which will be disallowed):
bootable/recovery/updater_sample/tests/Android.mk: warning:
SystemUpdaterSampleTests (java:system) should not link to
android.test.runner (java:platform)

(See b/69899800 or the commit message in [1] for detailed discussions.)

[1]: https://android-review.googlesource.com/c/platform/frameworks/ml/+/666428

Test: `mmma -j bootable/recovery` gives no warning.
Test: Install and run SystemUpdaterSampleTests on device.
Change-Id: I12a1556d572d9f332fcf43dc84cbe8fd1b6df89b
2018-04-25 15:59:53 -07:00
Tao Bao
32118f6690 Rename the dir for SystemUpdaterSample.
Also replace the occurrence in README.md and PREUPLOAD.cfg.

Test: mmma -j bootable/recovery
Change-Id: I04c0ef00dd64f49e008ad2a4a2c1e8eaed76bf8d
2018-04-25 15:34:37 -07:00
Zhomart Mukhamejanov
8e7cd817e3 Merge "sample_updater: add non-streaming demo" am: 4816fc1c46
am: a399c289bb

Change-Id: Ieb347d361af77e916b0948bbd0d8d2277fe67150
2018-04-25 12:13:54 -07:00
Zhomart Mukhamejanov
a399c289bb Merge "sample_updater: add non-streaming demo"
am: 4816fc1c46

Change-Id: Ide07a80e18a3935c07e020b51d730aa6f557077c
2018-04-25 12:10:50 -07:00
Zhomart Mukhamejanov
4816fc1c46 Merge "sample_updater: add non-streaming demo" 2018-04-25 18:56:26 +00:00
Zhomart Mukhamejanov
f4d280ce40 sample_updater: add non-streaming demo
SampleUpdater app was tested manually on a device.
There are unit tests for utility classes.

SampleUpdater app demonstrates how to use Android Update Engine to
apply A/B (seamless) update.
This CL contains demo of non-stream update using async update_engine,
which is accessed directly from an activity.
This app also shows logs from update_engine on the UI.
Instructions can be found in `README.md`.

- Create a UI with list of configs, current version, control buttons and a progress bar
- Add PayloadSpec and PayloadSpecs for working with update zip file
- Add UpdateConfig for working with json config files
- Add applying non-streaming update

Test: tested manually and unit tests for utilities
Change-Id: I05d4a46ad9cf8b334c9c60c7dd4da486dac0400a
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-04-25 18:55:25 +00:00
Paul Crowley
3e170e9afe [automerger skipped] Wipe the metadata partition when we wipe data.
am: 723056a83f  -s ours

Change-Id: I1f4aedc483aa2a0d1813f62870b9462dd58095ca
2018-04-25 11:39:11 -07:00
android-build-prod (mdb)
beeef60446 Merge "updater: Remove an unneeded strdup()." am: ab3c24bd51
am: 76f0edc05e

Change-Id: I0836af0b9ba9485c1908303b496fb86899aa4f43
2018-04-25 11:09:02 -07:00
android-build-prod (mdb)
76f0edc05e Merge "updater: Remove an unneeded strdup()."
am: ab3c24bd51

Change-Id: I9a5b88f8091a208bc62678711f4ca0564d49538d
2018-04-25 11:06:01 -07:00
android-build-prod (mdb)
ab3c24bd51 Merge "updater: Remove an unneeded strdup()." 2018-04-25 17:57:12 +00:00
Paul Crowley
723056a83f Wipe the metadata partition when we wipe data.
Bug: 78469201
Test: Wipe from recovery menu, check that wipe is logged correctly
    and boot works as expected.
Merged-In: I5bc8ef1b83d78de8b5edba6cc17882edcc744356
Change-Id: I5bc8ef1b83d78de8b5edba6cc17882edcc744356
2018-04-25 09:31:04 -07:00
Tao Bao
188f3a5bf8 updater: Remove an unneeded strdup().
StringValue() makes a copy of the arg.

Test: mmma bootable/recovery
Change-Id: I1002994e7496c840aa05c785019bdeca281f467e
2018-04-25 07:16:00 -07:00
Paul Crowley
bd56ab163a Merge "Wipe the metadata partition when we wipe data." am: 897385bfe2
am: 62fd21b9bb

Change-Id: I338d7882e63abe9e78c2566b32c0fe28e2272614
2018-04-24 19:54:43 -07:00
Paul Crowley
62fd21b9bb Merge "Wipe the metadata partition when we wipe data."
am: 897385bfe2

Change-Id: I29a83ac2792e5564f83ea7dac13740f5a6052bd0
2018-04-24 19:48:41 -07:00
Treehugger Robot
897385bfe2 Merge "Wipe the metadata partition when we wipe data." 2018-04-25 02:38:11 +00:00
Paul Crowley
3b4d516151 Wipe the metadata partition when we wipe data.
Bug: 78469201
Test: Wipe from recovery menu, check that wipe is logged correctly
    and boot works as expected.
Change-Id: I5bc8ef1b83d78de8b5edba6cc17882edcc744356
2018-04-24 17:08:22 -07:00
Tianjie Xu
4388c79242 Merge "Dump debug information for apply_patch unit tests" am: fe527cced4
am: 943c2057ad

Change-Id: If76814a3e45b6f199f2cfe5d8da7a176d37a573f
2018-04-24 11:42:37 -07:00
Tianjie Xu
943c2057ad Merge "Dump debug information for apply_patch unit tests"
am: fe527cced4

Change-Id: Ife392c1a6a99e8ae0b8d4a46330596f5c742f099
2018-04-24 11:39:05 -07:00
Tianjie Xu
fe527cced4 Merge "Dump debug information for apply_patch unit tests" 2018-04-24 18:30:29 +00:00
Tianjie Xu
ffed57a7a3 Dump debug information for apply_patch unit tests
The apply patch test should have a deterministic way to append patch
data. Add debug logs to dump the length and SHA1 of each step to further
track down the flakiness.

Also redirect the debug logging to stdout in case the logcat becomes too
chatty.

Bug: 67849209
Test: Run recovery_component_test
Change-Id: I42bafef2d9dee599719ae57840b3d8c00d243ebd
2018-04-24 09:56:55 -07:00