PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,659 Commits 1 Branch 0 Tags
177076fcd53e0db08fc13630e8be9ae3913dcbb5
Commit Graph

4659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianjie Xu 177076fcd5 Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af am: 0f8e67088a am: 4a2cfffd33 
am: d38aec8de6

Change-Id: Ibdb1b48633736802bff664973fcd4c08dc9ac93a
 2017-05-26 23:32:43 +00:00
Tianjie Xu d38aec8de6 Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af am: 0f8e67088a 
am: 4a2cfffd33

Change-Id: Ifd32f346adefb90d043bccc3d6f20060ae3ca45d
 2017-05-26 23:20:07 +00:00
Tianjie Xu 4a2cfffd33 Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af 
am: 0f8e67088a

Change-Id: I8e7499d97f6acb505e42b9935d3b21a41695dba7
 2017-05-26 23:15:36 +00:00
Tianjie Xu 0f8e67088a Merge "Implement a custom deflate sink function for bspatch" 
am: 764eb215af

Change-Id: Ifac391f38d692a5312b4b03ff5eaf701da6d7d41
 2017-05-26 23:13:36 +00:00
Tianjie Xu 764eb215af Merge "Implement a custom deflate sink function for bspatch" 2017-05-26 23:07:13 +00:00
Tianjie Xu a897f95bd5 Implement a custom deflate sink function for bspatch 
This new sink function works as a wrapper of the old sink. It deflates
the available patch data on the fly. Therefore, we don't need to store
the full uncompressed patch data in memory.

Test: recovery_component_test && apply an incremental update on angler
Change-Id: I2274ec50a1607089abcc9d0954a2a748f28c3122
 2017-05-26 14:05:20 -07:00
Tianjie Xu 75dee9b064 Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 am: 66f02b4e71 am: aef046255a 
am: da1fcf7ab2

Change-Id: Icad68a225061426e396541d0f67374a530f1dcb3
 2017-05-24 18:56:34 +00:00
Tianjie Xu da1fcf7ab2 Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 am: 66f02b4e71 
am: aef046255a

Change-Id: Ib9ce75418ca56c2bb9fa68719371628b1763aa03
 2017-05-24 18:54:04 +00:00
Tianjie Xu aef046255a Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 
am: 66f02b4e71

Change-Id: I6e745992d384b6d870b2549d16dc40100175493e
 2017-05-24 18:51:03 +00:00
Tianjie Xu 66f02b4e71 Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" 
am: 9c1a114789

Change-Id: I45afda69f82147ba02b3e4666c3a296d84a2db47
 2017-05-24 18:48:04 +00:00
Tianjie Xu 9c1a114789 Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" 2017-05-24 18:42:02 +00:00
Tianjie Xu 6957555e29 Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails 
We have seen one case when bspatch failed likely due to patch
corruption. Since the package has passed verification before, we want
to reboot and retry the patch command again since there's no
alternative for users.

We won't delete the stash before reboot, and the src has passed SHA1
check. If there's an error on the patch, it will fail the package
verification during retry.

Bug: 37855643
Test: angler reboots and retries the update when bspatch fails.
Change-Id: I2ebac9621bd1f0649bb301b9a28a0dd079ed4e1d
 2017-05-23 17:36:56 -07:00
Tianjie Xu f158a7d29e Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9d am: 1562f41348 
am: 0abe9860d8

Change-Id: Id8d4e4b369f30a33a37ca1895d5dd36eb2bf8aff
 2017-05-18 22:25:55 +00:00
Tianjie Xu 0abe9860d8 Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9d 
am: 1562f41348

Change-Id: I7b605673eb3cee6a615459ca9fe2fc00c532ed9d
 2017-05-18 22:20:55 +00:00
Tianjie Xu 1562f41348 Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 
am: 8f68accc9d

Change-Id: Ic81b2812030e8267a4d0d81d4909f84d284d1743
 2017-05-18 22:16:24 +00:00
Tianjie Xu 8f68accc9d Merge "Print SHA1 of the patch if bsdiff fails with data error" 
am: 1f9808bd48

Change-Id: I4900198d7c45c864e1a93bbd386b4ec36ed4cdec
 2017-05-18 22:11:54 +00:00
Tianjie Xu 1f9808bd48 Merge "Print SHA1 of the patch if bsdiff fails with data error" 2017-05-18 22:02:03 +00:00
Tom Cherry 05a30df508 Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 am: 8226fd8926 am: 01bcf118d5 
am: eefefc6c13

Change-Id: I3bf255d47848e773b9d0e70224abb96ae15f6110
 2017-05-18 20:42:50 +00:00
Tom Cherry eefefc6c13 Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 am: 8226fd8926 
am: 01bcf118d5

Change-Id: Ie9103aedc7c0b61d505023238e0cb0ab327f7e84
 2017-05-18 20:34:48 +00:00
Tom Cherry 01bcf118d5 Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 
am: 8226fd8926

Change-Id: I6a2b8df36703936560b84ec84555c3b5bb95cb0f
 2017-05-18 20:31:18 +00:00
Tom Cherry 8226fd8926 Merge "libbootloader_message: convert to Android.bp" 
am: bec0d4cb94

Change-Id: I0da04f8103a48f746801fdf9381571e4a812e8c3
 2017-05-18 20:26:24 +00:00
Tom Cherry bec0d4cb94 Merge "libbootloader_message: convert to Android.bp" 2017-05-18 20:18:00 +00:00
Tianjie Xu 398092834b Fix the input parameter for "set_retry_bootloader_message" am: 539b08cfcf 
am: 1c120067c2

Change-Id: I45e25f7309f90ca3317d94d3f66e055fc02543b3
 2017-05-18 18:13:46 +00:00
Tianjie Xu 1c120067c2 Fix the input parameter for "set_retry_bootloader_message" 
am: 539b08cfcf

Change-Id: Idd730e8e9ae3dbf27bc20b4ff2c5a3e73e28ce5d
 2017-05-18 17:58:02 +00:00
Tianjie Xu 6b2aaf1a49 Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76 am: 1d6f88675b am: f1546892e1 
am: 1941f61fb6

Change-Id: I1148a20467db687dac5de9150936d0bb3516f8dc
 2017-05-17 20:35:15 +00:00
Tianjie Xu 1941f61fb6 Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76 am: 1d6f88675b 
am: f1546892e1

Change-Id: If5d97891ffae307ada2948b771f113e82235fd73
 2017-05-17 20:20:00 +00:00
Tianjie Xu f1546892e1 Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76 
am: 1d6f88675b

Change-Id: I280282a1b2676e3030a0327239781f50fb7a64d8
 2017-05-17 20:17:29 +00:00
Tianjie Xu 1d6f88675b Merge "Fix the input parameter for "set_retry_bootloader_message"" 
am: 0e60ccdc76

Change-Id: I881182909805359cb1042a25bb7d942586fbbaab
 2017-05-17 20:13:31 +00:00
Tianjie Xu 0e60ccdc76 Merge "Fix the input parameter for "set_retry_bootloader_message"" 2017-05-17 20:02:12 +00:00
Tianjie Xu 539b08cfcf Fix the input parameter for "set_retry_bootloader_message" 
We're not updating argc & argv during get_args(), so some boot
arguments missed when we set the boot message for retry.

Bug: 38383406
Test: boot command sets correctly during retry attempt.
Change-Id: Ie8583a22fad5e0084245e3431d4018518d508dfd
(cherry picked from commit 72449c9f99)
 2017-05-17 11:52:17 -07:00
Tom Cherry 600e806384 libbootloader_message: convert to Android.bp 
Test: build
Change-Id: Ia0c2e141673e37eea29306817d2f4b2c944213b0
 2017-05-17 11:43:29 -07:00
Tianjie Xu 72449c9f99 Fix the input parameter for "set_retry_bootloader_message" 
We're not updating argc & argv during get_args(), so some boot
arguments missed when we set the boot message for retry.

Bug: 38383406
Test: boot command sets correctly during retry attempt.
Change-Id: Ie8583a22fad5e0084245e3431d4018518d508dfd
 2017-05-17 18:09:35 +00:00
Tianjie Xu ce5fa5e538 Print SHA1 of the patch if bsdiff fails with data error 
This will help us to identify the patch corruption.

Meanwhile fix a wrong size parameter passed to bspatch.
(patch->data.size() into patch->data.size() - patch_offset).

Also remove the only usage of "ApplyBSDiffPatchMem()" and inline its
Sink function for simplicity.

Bug: 37855643
Test: Prints SHA1 for corrupted patch in imgdiff_test.
Change-Id: Ibf2db8c08b0ded1409bb7c91a3547a6bf99c601d
 2017-05-16 12:39:14 -07:00
Tao Bao 647b1e9c25 Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b am: 843ca31c4c am: 9539cdb3c0 
am: 763b52dd45

Change-Id: I7dfc08a29beac241366533d9a1296ea10c25dd73
 2017-05-12 22:02:48 +00:00
Tao Bao 763b52dd45 Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b am: 843ca31c4c 
am: 9539cdb3c0

Change-Id: Id6209c2f0e75a3b24bf50f64896cf8a5d1f080a5
 2017-05-12 21:56:48 +00:00
Tao Bao 9539cdb3c0 Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b 
am: 843ca31c4c

Change-Id: I3f7c6b2d4b4d7b56866f98e146cb3bf691a7a3f3
 2017-05-12 21:51:17 +00:00
Tao Bao 843ca31c4c Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." 
am: 494d97fe6b

Change-Id: I48bf4260c586bdbcc12e615ff5b0ce6459f88c98
 2017-05-12 21:45:47 +00:00
Tao Bao 494d97fe6b Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." 2017-05-12 21:26:36 +00:00
Tao Bao 397a8137a0 updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0. 
Commit adeb41a8c0 has switched the
argument for recovery. This CL handles the case for updater.

Note that there's a chance the updater may run against the old
recovery (and f2fs 1.4.1 binary). Not sending a 0-sector argument to
f2fs 1.4.1 also works.

Bug: 37758867
Test: Make an OTA package that calls format f2fs, with mkfs.f2fs 1.8.0
      and 1.4.1 binaries respectively.
Change-Id: I4d4bbe8c57544d1c514b7aa37fbf22a0aab14e2c
 2017-05-12 12:09:16 -07:00
Tao Bao 33154a6735 Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." am: 7cb1b79673 am: 7ca2e734fc am: e89cbd675c 
am: 7890e6e689

Change-Id: I5e5f62a2449f52f2ab506daf7d2e27b6ea0211d9
 2017-05-12 01:59:40 +00:00
Tao Bao 7890e6e689 Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." am: 7cb1b79673 am: 7ca2e734fc 
am: e89cbd675c

Change-Id: I569d0f186ab36176f8bd4edcfff14ec53af747bc
 2017-05-12 01:55:03 +00:00
Tao Bao e89cbd675c Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." am: 7cb1b79673 
am: 7ca2e734fc

Change-Id: I983747440b9c7c7e0a58406ee13155f5f2c90525
 2017-05-12 01:39:02 +00:00
Tao Bao 7ca2e734fc Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." 
am: 7cb1b79673

Change-Id: Id8d5e0ce3c5c31df534dc82fc8a7b743cb8649fa
 2017-05-12 01:35:55 +00:00
Tao Bao 7cb1b79673 Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." 2017-05-12 01:18:52 +00:00
Tao Bao 0167d4c382 Don't write to /sys/class/android_usb/android0/enable with configfs. 
USB configfs doesn't use /s/c/a/a/enable. Trying to set that gives
confusing message on screen when sideloading.

Bug: 37713851
Test: adb sideload on device using with configfs.
Test: adb sideload on marlin.
Change-Id: Ifa55f90c2a5fe6bf9e7cee95882de9f6de686d73
 2017-05-11 14:50:20 -07:00
Tao Bao 9ab8194974 Merge "recovery: Skip "/" in setup_install_mounts()." am: d7446c8eed am: b0626221a1 am: 8c7c38ca7f 
am: 2d7c9797c6

Change-Id: I00148c23b353352f47bd6824022e0594122be025
 2017-05-11 05:22:15 +00:00
Tao Bao 2d7c9797c6 Merge "recovery: Skip "/" in setup_install_mounts()." am: d7446c8eed am: b0626221a1 
am: 8c7c38ca7f

Change-Id: Ic7ee2fb3f542f9b1d9176c174c1ecb717be9390b
 2017-05-11 04:44:46 +00:00
Tao Bao 8c7c38ca7f Merge "recovery: Skip "/" in setup_install_mounts()." am: d7446c8eed 
am: b0626221a1

Change-Id: I45e1f564cbb36ea1f61351701bdc7a2ace7b8798
 2017-05-11 04:39:12 +00:00
Tao Bao b0626221a1 Merge "recovery: Skip "/" in setup_install_mounts()." 
am: d7446c8eed

Change-Id: I93411025025393abe819ff109ce7e00565281d88
 2017-05-11 04:37:13 +00:00
Tao Bao d7446c8eed Merge "recovery: Skip "/" in setup_install_mounts()." 2017-05-11 04:31:22 +00:00