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

3123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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 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 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
Tao Bao 495478e853 Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6 
am: 7294a8830b

Change-Id: I07bad38eb7c81a66c43be759bc13af85b00446c7
 2016-12-13 22:48:38 +00:00
Tao Bao 7294a8830b Merge "recovery: Clean up the log saving while wiping." 
am: 28bbe029b6

Change-Id: I0dfd2815874940624bbee2e02a506549fc68e070
 2016-12-13 22:42:06 +00:00
Tao Bao 28bbe029b6 Merge "recovery: Clean up the log saving while wiping." 2016-12-13 22:36:38 +00:00
Sen Jiang d530449e54 Add a stub recovery UI. 
This allows recovery to work on devices without screen.
The stub recovery UI does nothing except print to stdout.

Test: write 'recovery\n--wipe_data\n--reason=wipe_data_from_ota\n'
      to misc and boot to recovery on a device without screen.
Bug: 33175036

Change-Id: Icde698aa2e2e29f4b3d0532dfd3c6a939ac2bc63
 2016-12-13 13:29:33 -08:00
Tao Bao 3f5a3821be recovery: Clean up the log saving while wiping. 
Test: Wipe /cache and check the logs.
      Wipe /data and check the logs.
Change-Id: I1968e3a0a9ed80134811a91508c4473f1dcdf953
 2016-12-13 11:47:46 -08:00
Tao Bao 01afbb8f29 Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb 
am: 3541850a9a

Change-Id: Iae26e512af03094e6f38864241e79eeff32fbb6b
 2016-12-13 18:27:51 +00:00
Tao Bao 3541850a9a Merge "clang-format: Adjust short functions / if settings." 
am: d6a5005fcb

Change-Id: I2d8d58e4361207656e883cf21116eef9f35bf521
 2016-12-13 18:21:50 +00:00
Tao Bao d6a5005fcb Merge "clang-format: Adjust short functions / if settings." 2016-12-13 18:13:56 +00:00
Tao Bao 1b321e43e1 Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 
am: 09197c47e2

Change-Id: Ic9156da53b0f07ecd794e4a5c4f948387d76e701
 2016-12-13 01:38:56 +00:00
Tao Bao 09197c47e2 Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" 
am: c908f4f0e3

Change-Id: Ia24a7db9ee7dd655e1aa0eabfbe3cdf47b011d40
 2016-12-13 01:32:53 +00:00
Tao Bao c908f4f0e3 Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" 2016-12-13 01:24:04 +00:00
Tao Bao 26d5ae741e Revert "write_bootloader_message(<options>) should not reset stage field." 
This reverts commit 7e31f421a5.

Bug: 33534933
Change-Id: Ib173f6b1e36a79deafc3592785195693a6779471
 2016-12-13 01:06:24 +00:00
Tao Bao e65fa0a892 clang-format: Adjust short functions / if settings. 
http://clang.llvm.org/docs/ClangFormatStyleOptions.html

AllowShortFunctionsOnASingleLine: Empty
  Empty functions like "int f() {}" can be put on a single line.

AllowShortIfStatementsOnASingleLine: true
  If true, "if (a) return;" can be put on a single line.

Test: N/A
Change-Id: Ia4f411a958235ab18d16972f2c9d0f55b645b4ba
 2016-12-12 15:00:52 -08:00
Tao Bao ff77b42d66 Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5be 
am: cbb044239a

Change-Id: Ia6b73bac53888b399ca7c0696373b177e5726098
 2016-12-10 21:00:31 +00:00
Tao Bao cbb044239a Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." 
am: 594dc4f5be

Change-Id: I290bcbe38e8aea9f296ddd0e0263e6e02cf92885
 2016-12-10 20:54:31 +00:00
Tao Bao 594dc4f5be Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." 2016-12-10 20:50:16 +00:00
Tao Bao f038ca00f4 recovery: Remove obsolete code that supports "CACHE:foo" format. 
The passing of "--update_package=CACHE:foo" format has been removed
in Gingerbread, with commit 4baf641e7d96375eba3f9a3aff5400b9e3d28cd6
in frameworks/base (core/java/android/os/RecoverySystem.java).

Test: Recovery image with --update_package still works.
Change-Id: I37b56ccf98f62cadf2a3975bbc38b16fea6fe9a1
 2016-12-10 09:29:16 -08:00
Tao Bao d8ce8fa609 Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d 
am: f4fabe254c

Change-Id: I8cde0f335ff2c2a496f497d744ffc6a94ea832b7
 2016-12-09 22:43:47 +00:00
Tao Bao f4fabe254c Merge "write_bootloader_message(<options>) should not reset stage field." 
am: f28afc191d

Change-Id: I267a7130f70fef654e0cd5209d32ff4115250e45
 2016-12-09 22:39:18 +00:00
Tao Bao f28afc191d Merge "write_bootloader_message(<options>) should not reset stage field." 2016-12-09 22:33:49 +00:00
Tao Bao d4ceb1fb64 Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c 
am: 6be6680109

Change-Id: I3cd516e8bb86f685143847e11624df4791183437
 2016-12-09 19:59:09 +00:00