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
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
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
882895a610
Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 am: 09197c47e2 am: 1b321e43e1
...
am: 29dbb70e6a
Change-Id: I07235ae26d9e4d894c47cefd6e652a1f6202c34d
2016-12-13 01:50:56 +00:00
Tao Bao
29dbb70e6a
Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 am: 09197c47e2
...
am: 1b321e43e1
Change-Id: I8fc5e4d8a55bd67625bc679bc59c323a35f0a4a1
2016-12-13 01:45:25 +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
1d699e3c4e
Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5be am: cbb044239a am: ff77b42d66
...
am: be2a9bfe45
Change-Id: I01edd15f6b68b6a3520a78d904239fe8d0d36eb1
2016-12-10 21:13:02 +00:00
Tao Bao
be2a9bfe45
Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5be am: cbb044239a
...
am: ff77b42d66
Change-Id: I0b071ffabf1456c84d7438cb1c6e13d53d012bf7
2016-12-10 21:06:32 +00: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
e743ce76f6
Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d am: f4fabe254c am: d8ce8fa609
...
am: d0ecbfb729
Change-Id: Ib79be43f638a5389181bce5d983b2e406ed36511
2016-12-09 22:54:19 +00:00
Tao Bao
d0ecbfb729
Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d am: f4fabe254c
...
am: d8ce8fa609
Change-Id: Ia16ca3c82b3b7c5d88419a7719fce5355227958c
2016-12-09 22:48:48 +00:00