Commit Graph

9577 Commits

Author SHA1 Message Date
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
gitbuildkicker 8e07762c9b merge in oc-release history after reset to master 2016-12-15 00:06:55 -08:00
Miroslav Brzychcy 9b1b818eb8 TWRP Language Update
Update slovak language on behalf of translator.

Change-Id: I90f289dd082aef1780d63b4880092f57c48ad9ac
2016-12-14 19:41:18 -05: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
gitbuildkicker a3f5df6341 merge in oc-release history after reset to master 2016-12-14 00:06:47 -08: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
Tao Bao ac0eccfdb5 Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6 am: 7294a8830b am: 495478e853
am: b851fd3907

Change-Id: Iac4b8ea08171fdf7cf5a70cd07e998a81c478ab8
2016-12-13 23:01:38 +00:00
Tao Bao b851fd3907 Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6 am: 7294a8830b
am: 495478e853

Change-Id: I6d64980838979f65a6240e5e95d54ea733e8cc58
2016-12-13 22:55:08 +00: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
Ethan Yonker ff2b7881c9 Change handling of /cache due to AB devices not having cache
Change-Id: Ia9b97ed19eb3d400d9d399255108cac79361bca4
2016-12-13 21:26:57 +01:00
Ethan Yonker 79f88bdf8d Support backup/restore of FBE policies
Change-Id: Iba8ef20f57b0fb57bb9406c53148a806441d0b59
2016-12-13 14:25:04 -06:00
Ethan Yonker bd7492de28 Support File Based Encryption
Change-Id: Ib688ddd0c32d3999590cacd86b6d9b18eac336e9
2016-12-13 21:16:42 +01:00
Ethan Yonker 1b190166eb Add boot slot support
Change-Id: I7eaf80e327985f53791f90fbdebad022a9650d31
2016-12-13 14:04:48 -06: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 882f567a6e Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9a am: 01afbb8f29
am: 59c917aa02

Change-Id: Ie85a2315272e009ad43b29728b080d890348a0b8
2016-12-13 18:39:52 +00:00
Tao Bao 59c917aa02 Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9a
am: 01afbb8f29

Change-Id: I60bd86901647ada3debee5ec4314c2b8287afefb
2016-12-13 18:33:51 +00: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 75672d5ee9 Revert "write_bootloader_message(<options>) should not reset stage field."
This reverts commit 7e31f421a5.

Bug: 33534933
Change-Id: Ib173f6b1e36a79deafc3592785195693a6779471
(cherry picked from commit 26d5ae741e)
2016-12-12 18:08:24 -08:00