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

3501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 584d1f2422 Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c am: 6be6680109 am: d4ceb1fb64 
am: 3ab15c4dd8

Change-Id: Ia18dda35e4995596e9775a8a8ae65eeb20e74d6e
 2016-12-09 20:19:40 +00:00
Tao Bao 3ab15c4dd8 Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c am: 6be6680109 
am: d4ceb1fb64

Change-Id: I0be84193224de80faf8ca32b62bb75180fa03d1f
 2016-12-09 20:04:39 +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
Tao Bao 6be6680109 Merge "recovery: Fix the argument parsing from COMMAND_FILE." 
am: 332af25b7c

Change-Id: Ib7cdd050d4f20c61ac35c1fb1ad469c5b1c72262
 2016-12-09 19:54:08 +00:00
Tao Bao 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 Bao e90c0598f6 Merge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237 am: dd9c5674df 
am: 93c92baa8e

Change-Id: I866f5d48224d004928c39e6fd75486db90fa5e1c
 2016-12-05 23:45:47 +00:00
Tao Bao 93c92baa8e Merge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237 
am: dd9c5674df

Change-Id: I1e3c26c8179cf6039d8ac801a9a4d6f6be59bbca
 2016-12-05 23:42:15 +00:00
Tao Bao dd9c5674df Merge "recovery: Clean up get_args()." am: 3aadbbac39 
am: c3ab25c237

Change-Id: I29a01238bba2cd35e48a03275e3ada4d4fee2888
 2016-12-05 23:38:45 +00:00
Tao Bao 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 Bao 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
Bill Yi 0622e407eb Revert "Import translations. DO NOT MERGE" 
This reverts commit 6ecd63e459.

Change-Id: I66c34fc72c1e8f6a0c11e12fd7e21864f4437977
 2016-12-05 18:46:14 +00:00
Bill Yi 6ecd63e459 Import translations. DO NOT MERGE 
Change-Id: Ibe3698aabd36cca6e053ca099b87f09e8ad05c93
Auto-generated-cl: translation import
 2016-12-02 23:55:11 -08:00
Tao Bao 02557cd6de Merge "updater: Switch to libbase logging." am: d2c56629ab am: 1d9779b57b am: 997ccbc5a4 
am: dd570b59ad

Change-Id: Idd86b944b6ce8577f992435853259badd90d5101
 2016-12-02 06:00:25 +00:00
Tao Bao dd570b59ad Merge "updater: Switch to libbase logging." am: d2c56629ab am: 1d9779b57b 
am: 997ccbc5a4

Change-Id: Ic5a9d53af6e59c1e0ba16dd6275f941a21e4b98d
 2016-12-02 05:52:55 +00:00
Tao Bao 997ccbc5a4 Merge "updater: Switch to libbase logging." am: d2c56629ab 
am: 1d9779b57b

Change-Id: I92e782fc5b4df4a952f0759fb15f80754dce7802
 2016-12-02 05:45:25 +00:00
Tao Bao 1d9779b57b Merge "updater: Switch to libbase logging." 
am: d2c56629ab

Change-Id: Iadb27da225c4b0c7c6bc80d177d36bdf87296a5b
 2016-12-02 05:37:54 +00:00
Tao Bao d2c56629ab Merge "updater: Switch to libbase logging." 2016-12-02 05:27:04 +00:00
Tao Bao 24e83404af Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 am: 80cd188162 am: bd8f34190c 
am: 65383535a7

Change-Id: I792f9455b9ee89c3272b3cec52c1ca3146354280
 2016-12-01 17:41:37 +00:00