PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,032 Commits 1 Branch 0 Tags
bc344ba7b9e11675f2cf0210039bdd47e4ddcb9b
Commit Graph
3032 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Crowleyandandroid-build-merger bc344ba7b9 Merge "Support a "ask before wiping" boot flag." 
am: 7ec4e6f5a3

Change-Id: I593eeaabf0f3c44c83d1a516dc05518dbfdd3660
 2016-12-22 15:57:51 +00:00
Treehugger RobotandGerrit Code Review 7ec4e6f5a3 Merge "Support a "ask before wiping" boot flag." 2016-12-22 15:52:43 +00: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 Baoandandroid-build-merger 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 BaoandGerrit Code Review 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
Tao Baoandandroid-build-merger 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 BaoandGerrit Code Review 26d972c9d2 Merge "Add update_bootloader_message() to fix two-step OTAs." 2016-12-15 22:32:37 +00:00
Tao Baoandandroid-build-merger 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 BaoandGerrit Code Review 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 Jiangandandroid-build-merger 2f8f6ec0fc Merge "Add a stub recovery UI." 
am: 8c1584feaf

Change-Id: I88c79576a1c700509bb844936dbd8ef3784b1b13
 2016-12-14 22:00:44 +00:00
Sen JiangandGerrit Code Review 8c1584feaf Merge "Add a stub recovery UI." 2016-12-14 21:50:49 +00:00
Tao Baoandandroid-build-merger f7f3f821a8 Merge "updater: Fix the operator order." 
am: 2bb3a2270e

Change-Id: I3b558413b92062cfa6c8858f7083f68796a8da0a
 2016-12-14 20:34:22 +00:00
Treehugger RobotandGerrit Code Review 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 Baoandandroid-build-merger 527f08ed0b Merge "Remove the obsolete comments for firmware update." 
am: 833ecb03f2

Change-Id: I3a52452d5e3fb6df7f85c39f7ad5fbcc2f5949ee
 2016-12-14 18:42:00 +00:00
Tao BaoandGerrit Code Review 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 Baoandandroid-build-merger 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 BaoandGerrit Code Review 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 Baoandandroid-build-merger 7294a8830b Merge "recovery: Clean up the log saving while wiping." 
am: 28bbe029b6

Change-Id: I0dfd2815874940624bbee2e02a506549fc68e070
 2016-12-13 22:42:06 +00:00
Tao BaoandGerrit Code Review 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 Baoandandroid-build-merger 3541850a9a Merge "clang-format: Adjust short functions / if settings." 
am: d6a5005fcb

Change-Id: I2d8d58e4361207656e883cf21116eef9f35bf521
 2016-12-13 18:21:50 +00:00
Tao BaoandGerrit Code Review d6a5005fcb Merge "clang-format: Adjust short functions / if settings." 2016-12-13 18:13:56 +00:00
Tao Baoandandroid-build-merger 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 BaoandGerrit Code Review 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 Baoandandroid-build-merger 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 BaoandGerrit Code Review 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 Baoandandroid-build-merger 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 BaoandGerrit Code Review f28afc191d Merge "write_bootloader_message(<options>) should not reset stage field." 2016-12-09 22:33:49 +00:00
Tao Baoandandroid-build-merger 6be6680109 Merge "recovery: Fix the argument parsing from COMMAND_FILE." 
am: 332af25b7c

Change-Id: Ib7cdd050d4f20c61ac35c1fb1ad469c5b1c72262
 2016-12-09 19:54:08 +00:00
Tao BaoandGerrit Code Review 332af25b7c Merge "recovery: Fix the argument parsing from COMMAND_FILE." 2016-12-09 19:48:58 +00:00
Tao Bao 7d34fa17ab recovery: Fix the argument parsing from COMMAND_FILE. 
Commit f0ed159f48 didn't ensure mounting
COMMAND_FILE (i.e. /cache) prior to reading. Also the first argument in
COMMAND_FILE should not be dropped (unlike the first "recovery" argument
in BCB message).

Bug: 33431888
Test: Push /cache/recovery/command and recovery imag parses the
      arguments successfully.

Change-Id: Ica3157a0bb03a2355315123354617eaf3fff15a4
 2016-12-08 18:15:29 -08:00
Tao Baoandandroid-build-merger c3ab25c237 Merge "recovery: Clean up get_args()." 
am: 3aadbbac39

Change-Id: I8dd8003433ae2a33da51d69c25fe1b51628c8f97
 2016-12-05 23:35:16 +00:00
Tao Bao 7e31f421a5 write_bootloader_message(<options>) should not reset stage field. 
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 changes write_bootloader_message(<options>) to only set the
command field (to "boot-recovery") and the recovery field (with the
specified options).

Test: Apply a two-step package.
Change-Id: I6905918812c7d3402cc1524688079066a4d22d29
 2016-12-05 15:31:52 -08:00
Tao BaoandGerrit Code Review 3aadbbac39 Merge "recovery: Clean up get_args()." 2016-12-05 23:28:36 +00:00
Tao Bao f0ed159f48 recovery: Clean up get_args(). 
Test: Boot into new recovery image, verify the parsed parameters.
Change-Id: Ieefafb26cc4147ce4cb9ced4297cdb3b5d1d3789
 2016-12-05 11:39:46 -08:00
Tao Baoandandroid-build-merger 1d9779b57b Merge "updater: Switch to libbase logging." 
am: d2c56629ab

Change-Id: Iadb27da225c4b0c7c6bc80d177d36bdf87296a5b
 2016-12-02 05:37:54 +00:00
Tao BaoandGerrit Code Review d2c56629ab Merge "updater: Switch to libbase logging." 2016-12-02 05:27:04 +00:00
Tao Baoandandroid-build-merger 80cd188162 Merge "bootable/recovery: cleanup compiler warnings (unused value)" 
am: ef3bea15b8

Change-Id: I401597b9d7bad8a13c98093019cd6ad915d325f3
 2016-12-01 17:25:37 +00:00
Tao BaoandGerrit Code Review ef3bea15b8 Merge "bootable/recovery: cleanup compiler warnings (unused value)" 2016-12-01 17:03:13 +00:00
Tao Bao 039f2da3e4 updater: Switch to libbase logging. 
Test: Build an updater into a package and apply it on device.
Change-Id: I289b5768e9b1e44ef78e0479c64dbaa36fb1a685
 2016-11-30 23:44:41 -08:00