PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,912 Commits 1 Branch 0 Tags
9d270b63adbb52bcdbdf178db3337f7e49afcf42
Commit Graph

4912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jin Qian 9d270b63ad Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1 am: 786177f7e6 am: 2b95e0d0aa 
am: 6e99b91fd0

Change-Id: Idee4f1765fc9569dcb479d3a558b52e712781488
 2017-07-25 19:35:42 +00:00
Jin Qian 6e99b91fd0 Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1 am: 786177f7e6 
am: 2b95e0d0aa

Change-Id: Ic0ba2478daddb56382b06e321ff11209b8702576
 2017-07-25 19:31:42 +00:00
Jin Qian 2b95e0d0aa Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1 
am: 786177f7e6

Change-Id: Ie10ad843cab2b7c12529a5f2ac361b4884890cf8
 2017-07-25 19:27:41 +00:00
Jin Qian 786177f7e6 Merge "recovery: handle security footer before passing size to mke2fs" 
am: 539ed9acb1

Change-Id: Iba9eab601be27fe68c6895ca09f4ff2ee3957501
 2017-07-25 19:23:40 +00:00
Tao Bao 33d4ec78dc Merge "updater: Remove dead make_parents()." am: f5396eb8b2 am: ac634e3c9d am: 28cf022931 
am: ed4abe576b

Change-Id: I43e0a869b8971941469c31f922723b320bf8bcce
 2017-07-25 19:20:10 +00:00
Treehugger Robot 539ed9acb1 Merge "recovery: handle security footer before passing size to mke2fs" 2017-07-25 19:16:01 +00:00
Tao Bao ed4abe576b Merge "updater: Remove dead make_parents()." am: f5396eb8b2 am: ac634e3c9d 
am: 28cf022931

Change-Id: Ib045e79f32ff46481ab3c4305a60581ad45d8404
 2017-07-25 19:15:40 +00:00
Tao Bao 28cf022931 Merge "updater: Remove dead make_parents()." am: f5396eb8b2 
am: ac634e3c9d

Change-Id: I0e230a00ffd077177562d71fa54f5f9bd7718f4f
 2017-07-25 19:12:40 +00:00
Tao Bao ac634e3c9d Merge "updater: Remove dead make_parents()." 
am: f5396eb8b2

Change-Id: Ief0557813324d49c5da64265dc49ab757ed3ae3f
 2017-07-25 19:09:40 +00:00
Tao Bao 62be269570 Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 am: 276ff4cc33 am: a40c15717d 
am: df9252faf7

Change-Id: I3db534430aec0791663de432fc9e8bf2026bae86
 2017-07-25 19:09:39 +00:00
Tao Bao df9252faf7 Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 am: 276ff4cc33 
am: a40c15717d

Change-Id: I2b6120ab9c2defddbb5a7a72ee6269c005a12b4b
 2017-07-25 19:05:09 +00:00
Treehugger Robot f5396eb8b2 Merge "updater: Remove dead make_parents()." 2017-07-25 19:02:44 +00:00
Tao Bao a40c15717d Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 
am: 276ff4cc33

Change-Id: I0ce7b6bdc85d17d38b9e2a1332556f90b80926a6
 2017-07-25 19:01:08 +00:00
Tao Bao 276ff4cc33 Merge "recovery: Fix the flickering when turning on text mode." 
am: 771dfb0016

Change-Id: Ic85356b782c6b83725d85f2104fb30fc81ad2ed1
 2017-07-25 18:57:38 +00:00
Treehugger Robot 771dfb0016 Merge "recovery: Fix the flickering when turning on text mode." 2017-07-25 18:51:33 +00:00
Tao Bao 7022f33ec8 recovery: Fix the flickering when turning on text mode. 
When there's no command specified when booting into debuggable builds
(such as using `adb reboot recovery`), we turn on the text mode (i.e.
recovery menu) directly. This CL fixes the issue to avoid showing the
background image in a flash while turning on the text mode.

Bug: 63985334
Test: `fastboot boot $OUT/recovery.img` and it shows the recovery menu
      directly without the no command image in a flash.
Change-Id: Id86bbe346ab76c8defc95e2b423e695a86774b09
 2017-07-25 09:59:31 -07:00
Jin Qian f3ccad58dd recovery: handle security footer before passing size to mke2fs 
mke2fs doesn't take negative size as reserved size. If footer is
specified, compute fs size to be
(max partition size - reserved footer size) / block_size

Bug: 23686092
Bug: 63968011
Change-Id: Iac4e143bd26a70cfc81eb52a399d687e19b1049c
 2017-07-25 09:11:09 -07:00
Tao Bao 5902691764 updater: Remove dead make_parents(). 
Its former callers in RenameFn() and SymlinkFn() have been removed in
commit 63d786cf22.

Test: mmma -j bootable/recovery
Change-Id: I26ed126202554fc5840811ec7ae162da70593213
 2017-07-25 08:42:52 -07:00
Tao Bao e3134ff774 Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 am: 993cec5cc9 am: 633aeba594 
am: 9c62f67863

Change-Id: I14b40f1a0c5fd4c0dd1b6273440f185b5ec59349
 2017-07-25 14:38:52 +00:00
Tao Bao 9c62f67863 Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 am: 993cec5cc9 
am: 633aeba594

Change-Id: I9833741fe5d785298d7f99f6b2c9539723f8fcd1
 2017-07-25 14:35:50 +00:00
Tao Bao 633aeba594 Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 
am: 993cec5cc9

Change-Id: Iec927cd9ff2f85e898fa034239641e733e119a49
 2017-07-25 14:32:20 +00:00
Tao Bao 993cec5cc9 Merge "otautil: Delete dirUnlinkHierarchy()." 
am: 031661d4a9

Change-Id: I33a793646f6f11757afc20f16fd3a0f700dd09fb
 2017-07-25 14:28:52 +00:00
Tao Bao 031661d4a9 Merge "otautil: Delete dirUnlinkHierarchy()." 2017-07-25 14:11:28 +00:00
Tao Bao 844a4b6fad Merge "roots.cpp: Reformatting the file." am: ac70ffcc85 am: 922a310d36 am: bba1e66f74 
am: 11e6d8ee85

Change-Id: I011b232d6e65c9a5a244048391debae6158d348b
 2017-07-25 08:20:28 +00:00
Tao Bao 11e6d8ee85 Merge "roots.cpp: Reformatting the file." am: ac70ffcc85 am: 922a310d36 
am: bba1e66f74

Change-Id: Id965c1752f56b81d0d9e2e98bd3a9a4a393c73c1
 2017-07-25 08:16:57 +00:00
Tao Bao bba1e66f74 Merge "roots.cpp: Reformatting the file." am: ac70ffcc85 
am: 922a310d36

Change-Id: I120503c0e8a726abc044344a17bd9e0c584200c9
 2017-07-25 08:13:26 +00:00
Tao Bao 922a310d36 Merge "roots.cpp: Reformatting the file." 
am: ac70ffcc85

Change-Id: Ia658b14b12286a07c878f639763d9d83fa48fabf
 2017-07-25 08:09:13 +00:00
Tao Bao 7934985e0c otautil: Delete dirUnlinkHierarchy(). 
This function has become obsolete since we've removed file-based OTA
support (it was needed by 'delete_recursive' edify function earlier).

Test: mmma -j bootable/recovery
Test: Code search shows no active user of the function.
Change-Id: If6faaa759d4c849b79acba4e6adb82baadc89f7a
 2017-07-24 20:35:48 -07:00
Treehugger Robot ac70ffcc85 Merge "roots.cpp: Reformatting the file." 2017-07-25 03:19:39 +00:00
Tao Bao bb10e58eb1 roots.cpp: Reformatting the file. 
Mostly cosmetic changes. Removed the use of errno, and added constness
to a few pointers.

format_volume() and exec_cmd() will be cleaned up in a separate CL.

Test: mmma -j bootable/recovery
Change-Id: Ia12ce25a91c0bdd0e319f6da02ce1dc8377f265d
 2017-07-24 17:15:41 -07:00
Tao Bao ce51dfca9e tests: Add a test to cover legacy care_map.txt handling. 
am: 5cee24f4f1

Change-Id: I4d4583936ddfe3d53c2e78d3ceb20125ffcfef6c
 2017-07-24 23:11:20 +00:00
Tao Bao 25a05fc938 Merge "update_verifier: Handle legacy care_map.txt gracefully." into oc-mr1-dev 
am: 71b8103bf1

Change-Id: I2fd922b746db80fed5b4212c70b04de9d54eb0cc
 2017-07-24 19:53:35 +00:00
Tao Bao 5cee24f4f1 tests: Add a test to cover legacy care_map.txt handling. 
This is to cover the code added by commit
5a1dee01df, where an O update_verifier
should not reject N care_map.txt.

Bug: 63544345
Test: recovery_component_test passes on marlin.
Change-Id: Ia944e16cba3cc635098b3ffd92842d725b570fec
(cherry picked from commit c319613e06)
 2017-07-24 12:51:19 -07:00
TreeHugger Robot 71b8103bf1 Merge "update_verifier: Handle legacy care_map.txt gracefully." into oc-mr1-dev 2017-07-24 19:50:18 +00:00
Tianjie Xu d9c4ad1086 Merge "Fix a case when brotli writer fails to write last few blocks of data" into oc-mr1-dev 
am: 92aef7fa88

Change-Id: Ib9b832f6474c0404167d46ec7cda7c9ef1507efd
 2017-07-24 18:37:31 +00:00
Tao Bao 4574ca1dff Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594c am: dbe9da5331 am: 0148a6f9ab 
am: 2357b0c745

Change-Id: Ic8dfcde80f8dff11c33fac6a911ed278810590aa
 2017-07-24 18:34:01 +00:00
Tao Bao 2357b0c745 Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594c am: dbe9da5331 
am: 0148a6f9ab

Change-Id: Id568b7cb5043c444f88032368be57a6f128a44c7
 2017-07-24 18:32:01 +00:00
Tianjie Xu 92aef7fa88 Merge "Fix a case when brotli writer fails to write last few blocks of data" into oc-mr1-dev 2017-07-24 18:31:54 +00:00
Tao Bao 0148a6f9ab Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594c 
am: dbe9da5331

Change-Id: I87bb6d92a00b97e05b35736e5b9f247101bbac11
 2017-07-24 18:29:30 +00:00
Tao Bao dbe9da5331 Merge "tests: Add a test to cover legacy care_map.txt handling." 
am: 6eb23c594c

Change-Id: Iaad43cb44f4c406e4c07c9399e70e96cbaa4db7b
 2017-07-24 18:27:00 +00:00
Tao Bao 6eb23c594c Merge "tests: Add a test to cover legacy care_map.txt handling." 2017-07-24 18:23:52 +00:00
Tao Bao 7b1d9ad4a9 Merge "update_verifier: Handle legacy care_map.txt gracefully." am: 15ae0f01c3 am: fdb5d1cd8c am: 1d923f5e54 
am: c580e491ca

Change-Id: I7c479ca76006f5402c4bfbedb8d4fc570b722754
 2017-07-24 16:39:01 +00:00
Tao Bao c319613e06 tests: Add a test to cover legacy care_map.txt handling. 
This is to cover the code added by commit
5a1dee01df, where an O update_verifier
should not reject N care_map.txt.

Bug: 63544345
Test: recovery_component_test passes on marlin.
Change-Id: Ia944e16cba3cc635098b3ffd92842d725b570fec
 2017-07-24 09:34:06 -07:00
Tao Bao c580e491ca Merge "update_verifier: Handle legacy care_map.txt gracefully." am: 15ae0f01c3 am: fdb5d1cd8c 
am: 1d923f5e54

Change-Id: I61ebcbb04c989342f48bd53927fafc5e634fdfa8
 2017-07-24 16:33:02 +00:00
Tao Bao 1d923f5e54 Merge "update_verifier: Handle legacy care_map.txt gracefully." am: 15ae0f01c3 
am: fdb5d1cd8c

Change-Id: Ia75dbbe4ebf2f4e595f5a50937d831d36c81fe2c
 2017-07-24 16:27:32 +00:00
Tao Bao fdb5d1cd8c Merge "update_verifier: Handle legacy care_map.txt gracefully." 
am: 15ae0f01c3

Change-Id: I7a175533cd3710d978b20245817a01a73a3f575d
 2017-07-24 16:22:32 +00:00
Tao Bao 5fb9f532f0 update_verifier: Handle legacy care_map.txt gracefully. 
update_verifier should be backward compatible to not reject legacy
care_map.txt from old releases, which could otherwise fail to boot into
the new release.

For example, we've changed the care_map format between N and O. An O
update_verifier would fail to work with an N care_map.txt - a) we have
switched update_verifier to read from device mapper in O; b) the last
few blocks that contain metadata can't be read via device mapper. This
could be a result of sideloading an O OTA while the device having a
pending N update.

Bug: 63544345
Test: As follows on sailfish:
 1. Flash the device with this CL;
 2. Put a copy of N care_map.txt at /data/ota_package/. Restore the
    permissions properly ('cache' group);
 3. `adb reboot bootloader`;
 4. `fastboot set_active <current_slot>`
 5. Device boots up into home screen, with a warning in logcat that says
    it has skipped legacy care_map.txt.
Change-Id: I6acc88c9e655a9245e6531f176fef7953953935f
(cherry picked from commit 5a1dee01df)
 2017-07-24 09:14:15 -07:00
Tao Bao 15ae0f01c3 Merge "update_verifier: Handle legacy care_map.txt gracefully." 2017-07-24 16:13:14 +00:00
Tao Bao 98e02adb75 Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be am: 248b4f9dca am: fd63239621 
am: 0be4c0e261

Change-Id: I854cd279927c60f7d8a726775788c75ef1b0b6b3
 2017-07-23 04:14:34 +00:00
Tao Bao 0be4c0e261 Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be am: 248b4f9dca 
am: fd63239621

Change-Id: Ie1721fb7264b3c7277770f5bb44781880ce32f12
 2017-07-23 04:11:05 +00:00