Commit Graph

5859 Commits

Author SHA1 Message Date
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
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
Tao Bao
8206907cf0 Merge "update_verifier: Move to Soong." am: ed022fccdf
am: 9bc286dd71

Change-Id: I17da945eaa609f40d9601109c435110599ed88f6
2018-04-23 15:47:30 -07:00
Tao Bao
98de595c59 Merge "Make update_verifier generic across verified boot versions." am: ea63f59469
am: abcac8e1e7

Change-Id: I22eb8e48264862f763c31813697af46a55d1eba7
2018-04-23 15:47:00 -07:00
Tao Bao
9bc286dd71 Merge "update_verifier: Move to Soong."
am: ed022fccdf

Change-Id: Icfbef50b7fbfb2acfc0ba3ff47953b39c778356a
2018-04-23 15:42:30 -07:00
Tao Bao
abcac8e1e7 Merge "Make update_verifier generic across verified boot versions."
am: ea63f59469

Change-Id: Ieaad12e638eee94323703d0808b961a1e2efa5ab
2018-04-23 15:42:01 -07:00
Tao Bao
ed022fccdf Merge "update_verifier: Move to Soong." 2018-04-23 22:33:56 +00:00
Tao Bao
ea63f59469 Merge "Make update_verifier generic across verified boot versions." 2018-04-23 22:33:45 +00:00
Tao Bao
afb9fc29a2 update_verifier: Move to Soong.
Test: mmma -j bootable/recovery
Change-Id: I3a3574c89318304231c01f7633d32ece31df098c
2018-04-20 14:26:38 -07:00
Tao Bao
1cc0351915 Make update_verifier generic across verified boot versions.
This allows the update_verifier in a general system image to work across
devices that have different verified boot versions (i.e. not supported /
verified boot 1.0 / verified boot 2.0 / disabled).

Bug: 78283982
Test: Run recovery_component_test on both of marlin and walleye.
Test: Generate an OTA that has this CL. Install this OTA and check the
      update_verifier log during the post-reboot verification, on both
      of marlin (VB 1.0) and walleye (VB 2.0).
Test: Build and flash walleye image with verified boot disabled. Check
      that update_verifier marks the slot as successfully booted.
Change-Id: I828d87d59f911786531f774ffcf9b2ad7c2ca007
2018-04-20 14:26:38 -07:00
Tao Bao
0d6de12e68 Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch." am: bcb015239c
am: 4cf3bc1875

Change-Id: I211d0252ae33cc8fc203360de8d982c2a3b597ae
2018-04-20 11:15:26 -07:00
Tao Bao
4cf3bc1875 Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch."
am: bcb015239c

Change-Id: I63246ae23e5c57d9723d616c5db28e8265fa7c52
2018-04-20 11:11:02 -07:00
Treehugger Robot
bcb015239c Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch." 2018-04-20 18:03:42 +00:00
Tao Bao
8b0b0f1f02 applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch.
As they're accepting the SinkFn callback, it makes more sense to leave
the work to their callers.

Test: mmma -j bootable/recovery
Test: Run recovery_component_test on marlin.
Test: No other active user of the two functions.
Change-Id: I8d67b38ce037925442296f136b483e0c71983777
2018-04-20 09:27:50 -07:00
Tao Bao
84a978cbcf Merge "applypatch: Dump patch info on mismatching patching result." am: d2c32b281b
am: ea70fd7d1d

Change-Id: Ie9c674215caac891702d09d30f6858226ffe807c
2018-04-19 14:52:35 -07:00
Tao Bao
ea70fd7d1d Merge "applypatch: Dump patch info on mismatching patching result."
am: d2c32b281b

Change-Id: Ib43606f5fcd9e238b16b70b6dd519bb38a780dd3
2018-04-19 14:43:48 -07:00
Tao Bao
d2c32b281b Merge "applypatch: Dump patch info on mismatching patching result." 2018-04-19 21:33:30 +00:00
Tao Bao
4f83430471 applypatch: Dump patch info on mismatching patching result.
After splitting the previously flaky
ApplyPatchModesTest#PatchModeEmmcTarget tests,
PatchModeEmmcTargetWithMultiplePatches now becomes the sole victim. This
CL dumps additional info to narrow down the cause.

Bug: 67849209
Test: `recovery_component_test` on marlin.
Test: It dumps additional info after using corrupt bonus.file.
Change-Id: Ic5436de457cc882a51d03f49d5cee70077f7d3df
2018-04-19 12:46:22 -07:00
Zhomart Mukhamejanov
b21a990e75 Merge "Add sample_updater style check to PREUPLOAD.cfg" am: 73e6644777
am: 11e31203a6

Change-Id: Idcc2df9a84b6734c875da1f102eb7ba4ca6f9e62
2018-04-17 18:08:33 -07:00
Zhomart Mukhamejanov
11e31203a6 Merge "Add sample_updater style check to PREUPLOAD.cfg"
am: 73e6644777

Change-Id: I5acb461de5e0af89ffc903363711d9bb0dc05bc1
2018-04-17 18:02:30 -07:00
Zhomart Mukhamejanov
73e6644777 Merge "Add sample_updater style check to PREUPLOAD.cfg" 2018-04-18 00:52:20 +00:00
Zhomart Mukhamejanov
0e007e8edc Add sample_updater style check to PREUPLOAD.cfg
Test: N/A
Change-Id: I13f4295a85d50c0a63cac5680e7a3200b0e6c909
2018-04-17 16:09:31 -07:00
Tao Bao
3b8d2df76d Merge "tests: Move ResourcesTest into component test." am: 07d0032def
am: 9adbc572a3

Change-Id: Ia03cd4b6e5267cfd015190a840d3630648c832c1
2018-04-16 17:39:17 -07:00
Tao Bao
9adbc572a3 Merge "tests: Move ResourcesTest into component test."
am: 07d0032def

Change-Id: I1e6576ab1ae5eacc70b2cabba8d11b78fbdd88d5
2018-04-16 17:13:38 -07:00
Treehugger Robot
07d0032def Merge "tests: Move ResourcesTest into component test." 2018-04-17 00:00:00 +00:00
Chih-Hung Hsieh
4d92ca3f65 Merge "Disable lld where it fails." am: 0c8eea86f9
am: dd2277a9bd

Change-Id: Ic245166068d1c87a1fbcb2fa36a0141914e9cd34
2018-04-16 11:48:42 -07:00