Commit Graph

4836 Commits

Author SHA1 Message Date
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 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
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 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 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 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
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 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 15ae0f01c3 Merge "update_verifier: Handle legacy care_map.txt gracefully." 2017-07-24 16:13:14 +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
Tao Bao fd63239621 Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be
am: 248b4f9dca

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

Change-Id: I2b26ced9ffeb278ce01ff2ca7be4057b0ab6c61c
2017-07-23 04:03:34 +00:00
Treehugger Robot 6b09b895be Merge "Remove the obsolete reference to /file_contexts." 2017-07-23 03:56:42 +00:00
Tao Bao 338be53ed3 Remove the obsolete reference to /file_contexts.
This file no longer exists:
- /file_contexts has been split into plat_file_contexts and
  nonplat_file_contexts since commit
  b236eb6ca204cefcb926e19bd5682f9dcad4021d (system/sepolicy).
- It was named /file_contexts.bin prior to the split.

'-S file_contexts' is also no longer required by e2fsdroid, since commit
2fff6fb036cbbb6dedd7da3d208b312a9038a5ce (external/e2fsprogs). It will
load the file contexts via libselinux.

Test: Trigger the path by performing a data wipe for converting to FBE.
Change-Id: I179939da409e5c0415ae0ea0bf5ddb23f9e6331e
(cherry picked from commit 7af933b6a6)
2017-07-22 16:16:21 -07:00
Tao Bao 5a1dee01df 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
2017-07-21 17:17:03 -07:00
Tao Bao 7d03b8d495 Merge "Avoid crashing recovery with unwritable /cache." am: 9187f1cc51 am: 4fb2825dc2
am: e62f06246a

Change-Id: Ifb7776e0a6946833bd46e00206412082ce053eba
2017-07-21 23:29:45 +00:00
Tao Bao e62f06246a Merge "Avoid crashing recovery with unwritable /cache." am: 9187f1cc51
am: 4fb2825dc2

Change-Id: I7ad113d2e73b9944b999a7c2a53ce1e7c9670c8c
2017-07-21 23:25:21 +00:00
Tao Bao 4fb2825dc2 Merge "Avoid crashing recovery with unwritable /cache."
am: 9187f1cc51

Change-Id: Ie5708c2f703aefbfcad85ad0d2d24ae36b725c78
2017-07-21 23:22:31 +00:00
Treehugger Robot 9187f1cc51 Merge "Avoid crashing recovery with unwritable /cache." 2017-07-21 23:14:08 +00:00
Tianjie Xu 512283a751 Merge "Fix a case when brotli writer fails to write last few blocks of data" am: e45c8f0057 am: 80acaab52f
am: 75ff0107c8

Change-Id: Ieab5e6e412704599e873c7497d1c0de42453e642
2017-07-21 22:46:00 +00:00
Jin Qian 6fc893ebca Merge "recovery: replace make_ext4 with e2fsprogs" am: f7c00ddaf6 am: 9203641742
am: 7cdc58497b

Change-Id: Ib2e1ffa2f8620d51c7693130e0d51ed2da9b207f
2017-07-21 22:44:41 +00:00
Tianjie Xu 75ff0107c8 Merge "Fix a case when brotli writer fails to write last few blocks of data" am: e45c8f0057
am: 80acaab52f

Change-Id: Id429b2c2f31951897961525609fa12c3657216b7
2017-07-21 21:06:52 +00:00
Tianjie Xu 80acaab52f Merge "Fix a case when brotli writer fails to write last few blocks of data"
am: e45c8f0057

Change-Id: I337e8ec26f59a5245ab299080d7251331823e2da
2017-07-21 21:04:17 +00:00
Tianjie Xu e45c8f0057 Merge "Fix a case when brotli writer fails to write last few blocks of data" 2017-07-21 20:59:24 +00:00
Tao Bao ec57903a7e Avoid crashing recovery with unwritable /cache.
When /cache is unwritable, recovery hits a crash loop. Because it
passes nullptr to fileno(3) when writing back the locale file. This
prevents user from recovering a device - it cannot boot far enough to
recovery menu which allows wiping /cache.

Bug: 63927337
Test: Corrupt /cache and boot into recovery on bullhead:
 1. m -j recoveryimage
 2. fastboot erase cache
 3. fastboot boot $OUT/recovery.img
 4. recovery menu shows up.
Change-Id: I1407743f802049eb48add56a36298b665cb86139
2017-07-21 13:40:56 -07:00
Jin Qian 7cdc58497b Merge "recovery: replace make_ext4 with e2fsprogs" am: f7c00ddaf6
am: 9203641742

Change-Id: I8e23f2622021e8bae61a3dc4954c665c7fc85ccf
2017-07-21 19:10:22 +00:00
Jin Qian 9203641742 Merge "recovery: replace make_ext4 with e2fsprogs"
am: f7c00ddaf6

Change-Id: I17167b59242c709b18d09fccb52058b0bc25bf09
2017-07-21 19:06:06 +00:00
Treehugger Robot f7c00ddaf6 Merge "recovery: replace make_ext4 with e2fsprogs" 2017-07-21 19:00:46 +00:00
Tianjie Xu 6ed175d541 Fix a case when brotli writer fails to write last few blocks of data
receive_new_data may exit too early if the zip processor has sent all
the raw data. As a result, the last few 'new' commands will fail even
though the brotli decoder has more output in its buffer.

Restruct the code so that 'NewThreadInfo' owns the decoder state solely;
and receive_brotli_new_data is responsible for the decompression.

Also reduce the test data size to 100 blocks to avoid the test timeout.

Bug: 63802629
Test: recovery_component_test. on bullhead, apply full updates with and
w/o brotli compressed entries, apply an incremental update.

Change-Id: I9442f2536b74e48dbf7eeb062a8539c82c6dab47
2017-07-21 11:44:00 -07:00
Jin Qian ded2dac082 recovery: replace make_ext4 with e2fsprogs
Execute mke2fs to create empty ext4 filesystem.
Execute e2fsdroid to add files to filesystem.

Test: enter recovery mode and wipe data
Bug: 35219933
Change-Id: I10a9f4c1f4754ad864b2df45b1f879180ab33876
(cherry picked from commit ac31808cd3)
2017-07-20 11:42:17 -07:00