PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,159 Commits 1 Branch 0 Tags
cb9c4fc4fbc4e418c2a86c8ecea3e4a9cc3be331
Commit Graph

3159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao
cb9c4fc4fb Merge "updater: Refactor parse_range()." am: 466e1b396a 
am: 6502c50e4b

Change-Id: If5bbf6dfa0d23430ce54a9a127346427071e24cc
 2017-01-04 06:10:59 +00:00
Tao Bao
6502c50e4b Merge "updater: Refactor parse_range()." 
am: 466e1b396a

Change-Id: I2d9943062762fd3ac58ae8f5d6253c487e4a82d9
 2017-01-04 06:08:58 +00:00
Tao Bao
466e1b396a Merge "updater: Refactor parse_range()." 2017-01-04 06:06:22 +00:00
Tao Bao
c844c06faf updater: Refactor parse_range(). 
Returning the parsed RangeSet directly (as opposed to using some pointer
parameter) to make the code cleaner.

Test: Apply an incremental with the new updater.
Change-Id: I8c99e701f189eb6a3eacc0d647e5a3a85fbeb3eb
 2017-01-03 17:51:30 -08:00
Tao Bao
83317083c8 Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0 
am: 05e7db3000

Change-Id: I775376cd1850cd9d1f60d940afbcbbadf4ff8305
 2017-01-04 01:37:12 +00:00
Tao Bao
05e7db3000 Merge "Remove outdated reference to icon_installing.png" 
am: 71633ebfb0

Change-Id: I8e81d0c334e3fd015eda482e2a63dfb49c4f4ec3
 2017-01-04 01:34:42 +00:00
Tao Bao
71633ebfb0 Merge "Remove outdated reference to icon_installing.png" 2017-01-04 01:26:56 +00:00
Tim Kryger
825b6b0c0b Remove outdated reference to icon_installing.png 
The Wear recovery UI doesn't draw the installing icon but it was still
trying to open it.  Ever since these images were removed eight months
ago, this has resulted in an error printing to the screen at runtime.
Since the image wasn't really used, the lines to open it can simply be
removed.

Bug: 33203397
Change-Id: Id820f6d75e316c51d19b6095df407ecd61c0410e
(cherry picked from commit 48be23c8ed)
 2017-01-03 16:28:13 -08:00
Tao Bao
c025f145cb Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 
am: c58f5e73d5

Change-Id: I29f95f7e2117f3fbc7a9ffaa241e4c0f1710e268
 2017-01-03 23:50:06 +00:00
Tao Bao
c58f5e73d5 Merge "updater: Update the header name for bootloader.h." 
am: f9684c22c1

Change-Id: Ide8973e237c9142de4f51351a0db66bb0d157451
 2017-01-03 23:48:06 +00:00
Tao Bao
f9684c22c1 Merge "updater: Update the header name for bootloader.h." 2017-01-03 23:45:02 +00:00
Tao Bao
0d3f84f237 updater: Update the header name for bootloader.h. 
We should include "bootloader_message/bootloader_message.h" now.

Test: m updater
Change-Id: I65b22a8a0bcc5976ff1ba827bd30b46ee9d59c53
 2016-12-28 15:09:20 -08:00
Tao Bao
1b29658702 Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf 
am: 29e1b7b4b2

Change-Id: Ica4a7e02c1939065c404f9789941ee9206611643
 2016-12-28 22:24:27 +00:00
Tao Bao
29e1b7b4b2 Merge "applypatch: Don't expose FindMatchingPatch()." 
am: b8d6523acf

Change-Id: I4a1c4962ee9d78002898b678d88458f323ef5454
 2016-12-28 22:16:56 +00:00
Tao Bao
b8d6523acf Merge "applypatch: Don't expose FindMatchingPatch()." 2016-12-28 22:11:49 +00:00
Tao Bao
4e2471d6dd Merge "Add tests for imgdiff." am: 344c8eb453 
am: 4fe022c4ed

Change-Id: I80d978c69b389089b9b47aa8170ab5041099ad94
 2016-12-28 18:18:42 +00:00
Tao Bao
c8e79340e4 applypatch: Don't expose FindMatchingPatch(). 
Test: make
Change-Id: Ic77c4669574b6129e06aa6051804f419bcc8196c
 2016-12-28 10:11:22 -08:00
Tao Bao
4fe022c4ed Merge "Add tests for imgdiff." 
am: 344c8eb453

Change-Id: Iad8cb5e7ef3e3a09c305913a1367af8585d59529
 2016-12-28 18:11:11 +00:00
Tao Bao
344c8eb453 Merge "Add tests for imgdiff." 2016-12-28 18:05:45 +00:00
Tao Bao
7f0f49dd2b Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 
am: 1b83e7e28d

Change-Id: I630381834ee21d5495859b82707c2c7b4560d97e
 2016-12-23 17:36:12 +00:00
Tao Bao
1b83e7e28d Merge "tests: Add test coverage for DirUtil." 
am: f24d2a6b39

Change-Id: I624cb64464427d06d2711f3b88ec94cd93ac06d3
 2016-12-23 17:30:12 +00:00
Tao Bao
f24d2a6b39 Merge "tests: Add test coverage for DirUtil." 2016-12-23 17:22:51 +00:00
Tao Bao
f19295c5dc tests: Add test coverage for DirUtil. 
Test: recovery_unit_test passes.
Change-Id: I764c56404c7ccdd57ae5486c946fbc9ac6ae7bc9
 2016-12-22 09:57:49 -08:00
Tao Bao
ef801f9a62 Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e 
am: baf422229d

Change-Id: I444696a344f8b37b852469e36b7cc6a925c9fc80
 2016-12-22 17:28:33 +00:00
Tao Bao
830ab1c482 Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 
am: 6df1c4579e

Change-Id: I7bcce5428e32bbae889e999bce18c091f552136d
 2016-12-22 17:28:23 +00:00
Tao Bao
baf422229d Merge "tests: Replace the O_RDONLY in access(2)." 
am: 3b9645288e

Change-Id: Ib06f7298797ccd3f945542ecdd5366fb8e8eba6c
 2016-12-22 17:23:04 +00:00
Tao Bao
6df1c4579e Merge "tests: Add testcase for ZipUtil." 
am: aa305e9ce8

Change-Id: Id12e27ac3db4bcee6aa9de86867f05942cee3645
 2016-12-22 17:22:53 +00:00
Tao Bao
3b9645288e Merge "tests: Replace the O_RDONLY in access(2)." 2016-12-22 17:13:44 +00:00
Tao Bao
aa305e9ce8 Merge "tests: Add testcase for ZipUtil." 2016-12-22 17:13:30 +00:00
Paul Crowley
11e9af909d Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 
am: bc344ba7b9

Change-Id: I8f10c9fc59dce2954b8473b6eb648abe8d55612a
 2016-12-22 16:03:20 +00:00
Paul Crowley
bc344ba7b9 Merge "Support a "ask before wiping" boot flag." 
am: 7ec4e6f5a3

Change-Id: I593eeaabf0f3c44c83d1a516dc05518dbfdd3660
 2016-12-22 15:57:51 +00:00
Treehugger Robot
7ec4e6f5a3 Merge "Support a "ask before wiping" boot flag." 2016-12-22 15:52:43 +00:00
Tao Bao
e7e7b46666 tests: Add testcase for ZipUtil. 
Test: recovery_unit_test passes.
Change-Id: I8ad364e88aaee31579ed7206aad8e5620518d797
 2016-12-21 20:39:58 -08:00
Tao Bao
a3ece96f9f tests: Replace the O_RDONLY in access(2). 
Although O_RDONLY gives the same value as F_OK (0), it's not the right
friend of access(2).

Also clean up the temporary files from ZipTest (TemporaryDir doesn't
like non-empty directory).

Test: recovery_unit_test passes and has no leftover.
Change-Id: I66b90e43c0954c89ce08b36b9e2b4e84183b28f5
 2016-12-21 18:56:53 -08:00
Paul Crowley
08404b48f7 Support a "ask before wiping" boot flag. 
In the event of a catastrophic data error which should never happen,
ask the user before wiping the device.

Test: Cause an init builtin to fail and generate this error, observe.
Bug: 28693324
Change-Id: I38a2b815157d816cba1f30ad37eb4cdcc01db582
 2016-12-21 13:38:48 -08:00
Tao Bao
97555da4a6 Add tests for imgdiff. 
Factor out libimgdiff static library for testing purpose.

This CL adds the imgdiff tests on host and on target both (similar to
libimgpatch). In practice, we only need imgdiff binary on host, and
libimgpatch on target. But they should build and pass tests on both
platforms.

Test: recovery_host_test passes; recovery_component_test passes.
Change-Id: I0eafb7faf727cdf70066310e845af6ee245d4f60
 2016-12-19 16:53:03 -08:00
Tao Bao
88bd5d59de Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 
am: b0337774b2

Change-Id: I8a874f491f6a6ee452a3a18ae53920903ec11a44
 2016-12-19 19:26:39 +00:00
Tao Bao
b0337774b2 Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." 
am: e81719dde3

Change-Id: I1a833b07b4baa45f23930b4231c35fba2c2ac6ef
 2016-12-19 19:24:06 +00:00
Tao Bao
e81719dde3 Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." 2016-12-19 19:19:41 +00:00
katao
9a6f520419 Bugfix:updater always retry apply patch failed,when memcpy failed. 
https://code.google.com/p/android/issues/detail?id=230602
On the second attempt， open the file with O_RDONLY，
which causing a write failure。

Change-Id: If89165b8c7619fe25722073a46b3cc7c61530a71
Signed-off-by: katao <ustckato@gmail.com>
 2016-12-19 08:51:07 +00:00
TreeHugger Robot
910c83b915 Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 2016-12-16 00:37:04 +00:00
Tao Bao
cb15594696 Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 
am: 9a707b08ef

Change-Id: Ia42e91fd952b99bd5631ee419cbc402902a867f4
 2016-12-15 23:15:59 +00:00
Tao Bao
870b87dfc8 Merge "tests: Add tests for bootloader_message." am: 07d985b75b 
am: 7f3ada54ec

Change-Id: Ib421ff42e543ee97b0db4b5ca478e21f13825cd1
 2016-12-15 23:15:47 +00:00
Tim Kryger
a5876e43f7 resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp 
Change-Id: Ia6c502d22d7fc42b5fc13b625f14643f3d7ddf44
 2016-12-15 14:54:31 -08:00
Tao Bao
9a707b08ef Merge "Add update_bootloader_message() to fix two-step OTAs." 
am: 26d972c9d2

Change-Id: I9e06f70030f0226549c07a24fc088c0804bfd3a1
 2016-12-15 22:43:32 +00:00
Tao Bao
26d972c9d2 Merge "Add update_bootloader_message() to fix two-step OTAs." 2016-12-15 22:32:37 +00:00
Tao Bao
7f3ada54ec Merge "tests: Add tests for bootloader_message." 
am: 07d985b75b

Change-Id: I9ef1def5d3f2a3d28151dfefb9accf677795b535
 2016-12-15 20:46:24 +00:00
Tao Bao
2292db819b Add update_bootloader_message() to fix two-step OTAs. 
This is a retry of commit 7e31f421a5.

Commit bd56f1590c switches to calling
write_bootloader_message(<options>) in get_args(), which
unintentionally resets the stage field thus breaks two-step OTAs.

This CL adds update_bootloader_message(<options>), which only sets
the command field (to "boot-recovery") and the recovery field (with
the specified options).

Bug: 33534933
Test: Apply a two-step package.
Test: recovery_component_test passes.
Change-Id: Ie0b1ed4053d2d3c97d9cb84310d616b28fcfc72e
 2016-12-15 12:36:26 -08:00
Tao Bao
07d985b75b Merge "tests: Add tests for bootloader_message." 2016-12-15 20:28:22 +00:00
Tao Bao
8b7301b711 tests: Add tests for bootloader_message. 
Test: recovery_component_test passes.
Change-Id: Ib9aa2ffd6b018546223c76b7424f4ba355f5b088
 2016-12-14 15:59:32 -08:00