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

3573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao fe3993f315 Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e am: baf422229d am: ef801f9a62 
am: 5a108b6e00

Change-Id: Ieae405488b3426364626be481ad2f5a5de5e4618
 2016-12-22 17:38:34 +00:00
Tao Bao a2f71cc4b0 Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579e am: 830ab1c482 
am: 7720e1ab48

Change-Id: Ia09ba6d6b82a088142a964b8223bb2576d78604c
 2016-12-22 17:38:24 +00:00
Tao Bao 5a108b6e00 Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e am: baf422229d 
am: ef801f9a62

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

Change-Id: I253e34414b8fb4be173307ec0dabedb9c7f35380
 2016-12-22 17:33:23 +00: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 1dc4b0932e Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 am: bc344ba7b9 am: 11e9af909d 
am: 98631a39ca

Change-Id: I71acc0d5e3311cdb2782e9d5979ac75a9a79fe0a
 2016-12-22 16:14:21 +00:00
Paul Crowley 98631a39ca Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 am: bc344ba7b9 
am: 11e9af909d

Change-Id: Ib07bb356ac6fac309716e76b2d9d4b1581518cdf
 2016-12-22 16:08:51 +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
Tianjie Xu 71a67b3354 Merge "Add a checker for signature boundary in verifier" 2016-12-19 20:44:37 +00:00
Tao Bao c46af77cfc Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 am: b0337774b2 am: 88bd5d59de 
am: 794075c575

Change-Id: Ic26d6041fb77e1969ad37a691b7d7cd422e9e9e9
 2016-12-19 19:33:37 +00:00
Tao Bao 794075c575 Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 am: b0337774b2 
am: 88bd5d59de

Change-Id: Ia1127521eb2d1730f82be920886337c8d73635ff
 2016-12-19 19:30:08 +00: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
Tianjie Xu f69e6a9475 Add a checker for signature boundary in verifier 
The 'signature_start' variable marks the location of the signature
from the end of a zip archive. And a boundary check is missing where
'signature_start' should be within the EOCD comment field. This causes
problems when sideloading a malicious package. Also add a corresponding
test.

Bug: 31914369
Test: Verification fails correctly when sideloading recovery_test.zip on
angler.

Change-Id: I6ea96bf04dac5d8d4d6719e678d504f957b4d5c1
 2016-12-16 16:01:42 -08:00
Tim Kryger cc1ecf792f Remove outdated reference to icon_installing.png am: 48be23c8ed am: 14bdbb6c77 -s ours 
am: fe98435fa9

Change-Id: I23742456b33d6b41bed0efcd521bbc747ea46be0
 2016-12-16 01:20:49 +00:00
Tim Kryger 814e854965 Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: 910c83b915 
am: 5ade8ae26c

Change-Id: I217cc8a412abe2fe8e3714b816096cd62d5bdb13
 2016-12-16 01:20:37 +00:00
Tim Kryger 5c38124f8f resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp am: a5876e43f7 
am: a3e2f0b082

Change-Id: Ief76f7544f942f88e058fd9784c152583bc73290
 2016-12-16 01:20:26 +00:00
Tao Bao 6ac321a00d Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 am: 9a707b08ef am: cb15594696 
am: 5c13ade64c

Change-Id: I8dc01cc4a2b8d0585eacbec1a1fc0235951ebea6
 2016-12-16 01:20:14 +00:00
Tao Bao 79b9fe0885 Merge "tests: Add tests for bootloader_message." am: 07d985b75b am: 7f3ada54ec am: 870b87dfc8 
am: 280c863eb9

Change-Id: Ibd2039547facfc8ab1f0cf4ed39987f5193aca2c
 2016-12-16 01:20:02 +00:00
Tim Kryger fe98435fa9 Remove outdated reference to icon_installing.png am: 48be23c8ed 
am: 14bdbb6c77  -s ours

Change-Id: I9c0a42e3d13b33edcd01de3cee7ad5ca1dfc947f
 2016-12-16 01:02:38 +00:00
Tim Kryger 5ade8ae26c Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 
am: 910c83b915

Change-Id: I3ddcf068bea9ae723e6609e4c599fb34b0e7090b
 2016-12-16 00:54:41 +00:00
Tim Kryger a3e2f0b082 resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp 
am: a5876e43f7

Change-Id: I16d8e6bdfa1401b534a2ac53b2fb3c2a41d0ef58
 2016-12-16 00:54:38 +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 5c13ade64c Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 am: 9a707b08ef 
am: cb15594696

Change-Id: I75415b9fef5209f0b55859c4ca921544c4a338c1
 2016-12-15 23:32:24 +00:00
Tao Bao 280c863eb9 Merge "tests: Add tests for bootloader_message." am: 07d985b75b am: 7f3ada54ec 
am: 870b87dfc8

Change-Id: I01b841a436df45f845e1ec4cde903ec0e102f5ec
 2016-12-15 23:32:14 +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
Tim Kryger 14bdbb6c77 Remove outdated reference to icon_installing.png 
am: 48be23c8ed

Change-Id: I84d5539f61694a5ae9299775f2ede0a7310512a0
 2016-12-15 20:39:36 +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
Sen Jiang 8c179f8bd4 Merge "Add a stub recovery UI." am: 8c1584feaf am: 2f8f6ec0fc am: ef45a88680 
am: b29f25888a

Change-Id: I32cdf7fb4a467b16a9d1c746d6c90539740cd211
 2016-12-14 22:40:46 +00:00
Sen Jiang b29f25888a Merge "Add a stub recovery UI." am: 8c1584feaf am: 2f8f6ec0fc 
am: ef45a88680

Change-Id: I22e054d7fa4ca9986d6b9b3e625a2cbd8449aaa1
 2016-12-14 22:21:48 +00:00
Sen Jiang ef45a88680 Merge "Add a stub recovery UI." am: 8c1584feaf 
am: 2f8f6ec0fc

Change-Id: I8acb01933efe7d8d69a608cc9801bf717fae4486
 2016-12-14 22:07:46 +00:00