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

3553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sen Jiang 2f8f6ec0fc Merge "Add a stub recovery UI." 
am: 8c1584feaf

Change-Id: I88c79576a1c700509bb844936dbd8ef3784b1b13
 2016-12-14 22:00:44 +00:00
Sen Jiang 8c1584feaf Merge "Add a stub recovery UI." 2016-12-14 21:50:49 +00:00
Tao Bao 27f68794eb Merge "updater: Fix the operator order." am: 2bb3a2270e am: f7f3f821a8 am: e97575e7ae 
am: 9c5655a4e4

Change-Id: I23a0d7d4028243e141f89adc9857349602a10b15
 2016-12-14 20:53:22 +00:00
Tao Bao 9c5655a4e4 Merge "updater: Fix the operator order." am: 2bb3a2270e am: f7f3f821a8 
am: e97575e7ae

Change-Id: Ibfdda0d1ff43a0143acd8fd60c911f18da9f00a7
 2016-12-14 20:46:52 +00:00
Tao Bao e97575e7ae Merge "updater: Fix the operator order." am: 2bb3a2270e 
am: f7f3f821a8

Change-Id: I346ad87013e6ebfb06b825ae541fabe7be87649e
 2016-12-14 20:40:52 +00:00
Tao Bao f7f3f821a8 Merge "updater: Fix the operator order." 
am: 2bb3a2270e

Change-Id: I3b558413b92062cfa6c8858f7083f68796a8da0a
 2016-12-14 20:34:22 +00:00
Treehugger Robot 2bb3a2270e Merge "updater: Fix the operator order." 2016-12-14 20:28:31 +00:00
Tao Bao 5354f60f2b updater: Fix the operator order. 
Shift operator ("<<") has a higher precedence level than ternary
operator ("?").

Test: BBOTA update log says "performing update" as opposed to
      "performing 0".

Change-Id: I0cf60cbfc11415e94f1f9f6effe75f14d13a1874
 2016-12-14 11:34:49 -08:00
Tao Bao 4a9fe8e1d2 Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2 am: 527f08ed0b am: 1871a2feeb 
am: 27f58282b1

Change-Id: I49c7aff726bdc5839e8b2a6e48d0926358a32b6d
 2016-12-14 19:01:43 +00:00
Tao Bao 27f58282b1 Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2 am: 527f08ed0b 
am: 1871a2feeb

Change-Id: I3ed12603ef1dfc3f72a1fe7e28840c6ba3f939b3
 2016-12-14 18:55:09 +00:00
Tao Bao 1871a2feeb Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2 
am: 527f08ed0b

Change-Id: I93716c3c455f118b0bac88d18c7c0e157031834b
 2016-12-14 18:48:07 +00:00
Tao Bao 527f08ed0b Merge "Remove the obsolete comments for firmware update." 
am: 833ecb03f2

Change-Id: I3a52452d5e3fb6df7f85c39f7ad5fbcc2f5949ee
 2016-12-14 18:42:00 +00:00
Tao Bao 833ecb03f2 Merge "Remove the obsolete comments for firmware update." 2016-12-14 18:34:26 +00:00
Tao Bao c0336399ae Remove the obsolete comments for firmware update. 
The corresponding code was removed in commit
e08991e02a in 2010 (Froyo).

Test: N/A
Change-Id: I2b296e1b07d54232bade79fda7501387d65a4c37
 2016-12-13 22:36:02 -08:00
Tao Bao 97b2fa2fbf Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1 am: af62097c08 am: b1e8150c44 
am: 51ccca4b8c

Change-Id: Ifa6579a34df60e48ff53689397bb53464a5d15ee
 2016-12-14 05:46:01 +00:00
Tao Bao 51ccca4b8c Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1 am: af62097c08 
am: b1e8150c44

Change-Id: Ie17b122852ad9b17bdeded2da3bca56caa5bf171
 2016-12-14 05:38:31 +00:00
Tao Bao b1e8150c44 Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1 
am: af62097c08

Change-Id: Ic892f6317de9c08082beeb508c825c459cbb59d2
 2016-12-14 05:32:00 +00:00
Tao Bao af62097c08 Merge "Add tests for setup-bcb and clear-bcb via uncrypt." 
am: 4e48a6c1a1

Change-Id: Iaec2a0a3edf3354a030fe921e23acbc97babbb16
 2016-12-14 05:25:00 +00:00
Tao Bao 4e48a6c1a1 Merge "Add tests for setup-bcb and clear-bcb via uncrypt." 2016-12-14 05:17:47 +00:00
Tao Bao 1033408801 Add tests for setup-bcb and clear-bcb via uncrypt. 
Bug: http://b/33534933
Test: recovery_component_test passes (and fails on buggy build due to
      the CL in [1]).

[1]: commit 7e31f421a5

Change-Id: I120498048ec1db8f9fcbb3cf135c05d3a48cfcdf
 2016-12-13 17:46:03 -08:00