ada3797c50
Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069d am: 21b5268fbd
...
am: 67801f2b3a
2017-03-28 08:28:29 +00:00
67801f2b3a
Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069d
...
am: 21b5268fbd
2017-03-28 08:05:13 +00:00
9531047a69
Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069d
...
am: 21b5268fbd
2017-03-28 05:59:12 +00:00
21b5268fbd
Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535
...
am: 51159a069d
2017-03-28 05:51:11 +00:00
51159a069d
Merge "updater: Clean up LoadSrcTgtVersion2()."
...
am: f037b7b535
2017-03-28 05:46:42 +00:00
f037b7b535
Merge "updater: Clean up LoadSrcTgtVersion2()."
2017-03-28 05:40:20 +00:00
d2aecd465b
updater: Clean up LoadSrcTgtVersion2().
...
Rename to LoadSourceBlocks() by moving the target blocks parsing part
into the caller. This allows detecting whether the target blocks have
already had the expected data before loading the source blocks. It
doesn't affect anything when applying an update package for the first
time, but it skips loading the unneeded source blocks when resuming an
update. It additionally avoids unnecessarily dumping the "corrupt"
source/stash blocks when resuming an update.
Bug: 33694730
Test: Apply an incremental update with the new updater.
Test: Resume an incremental update with the new updater.
Change-Id: I794fd0d1045be7b3b7f8619285dc0dade01398d0
2017-03-27 16:21:55 -07:00
055703e26a
Merge "tests: Construct signature-boundary.zip at runtime."
2017-03-27 23:04:51 +00:00
6ff8c6ac18
Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" am: 27c3e47853 am: b0e768e269
...
am: e65835d5ac
2017-03-27 19:37:04 +00:00
e65835d5ac
Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" am: 27c3e47853
...
am: b0e768e269
2017-03-27 19:32:06 +00:00
b0e768e269
Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot""
...
am: 27c3e47853
2017-03-27 19:29:34 +00:00
27c3e47853
Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot""
2017-03-27 19:23:12 +00:00
4508f23884
Revert "libbootloader_message: use different fstab paths for normal/recovery boot"
...
This reverts commit 37bd44174b
2017-03-27 17:47:21 +00:00
056e2da679
tests: Construct signature-boundary.zip at runtime.
...
Test: Observe the same failure with recovery_component_test ("signature
start: 65535 is larger than comment size: 0").
Change-Id: I98c357b5df2fa4caa9d8eed63af2e945ed99f18a
2017-03-26 23:34:13 -07:00
f5c40b2eaf
Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" am: df0619edea -s ours am: a97b0712d8 -s ours
...
am: 334850c9fe
2017-03-27 05:42:26 +00:00
6b083982f3
Skip logging the warning for uncrypt_status for devices w/o /cache am: 340e6762f8
...
am: 898fa718a9
2017-03-27 05:42:16 +00:00
334850c9fe
Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" am: df0619edea -s ours
...
am: a97b0712d8
2017-03-27 05:40:27 +00:00
898fa718a9
Skip logging the warning for uncrypt_status for devices w/o /cache
...
am: 340e6762f8
2017-03-27 05:40:15 +00:00
a97b0712d8
Merge "Skip logging the warning for uncrypt_status for devices w/o /cache"
...
am: df0619edea
2017-03-27 05:37:19 +00:00
340e6762f8
Skip logging the warning for uncrypt_status for devices w/o /cache
...
This warning may cause confusion for users.
Bug: 36590598
Test: Warning line no longer shows for sailfish.
Change-Id: I277c87a50a72fdb499be790ee25b97f815d980be
(cherry picked from commit bcb5b18630f518835a0768535b43ccfe91683fc9)
2017-03-27 05:36:48 +00:00
df0619edea
Merge "Skip logging the warning for uncrypt_status for devices w/o /cache"
2017-03-27 05:15:40 +00:00
e9d200fc3a
Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" into nyc-mr2-dev-plus-aosp
...
am: 49420e6c3d
2017-03-27 02:58:38 +00:00
49420e6c3d
Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" into nyc-mr2-dev-plus-aosp
2017-03-27 02:56:28 +00:00
e55215ffd5
Merge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494 am: 351f69e64a
...
am: dcbabd5932
2017-03-26 18:08:40 +00:00
dcbabd5932
Merge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494
...
am: 351f69e64a
2017-03-26 18:06:09 +00:00
351f69e64a
Merge "applypatch: Drop the support for patching non-EMMC targets."
...
am: b4c4f8c494
2017-03-26 18:03:10 +00:00
b4c4f8c494
Merge "applypatch: Drop the support for patching non-EMMC targets."
2017-03-26 18:00:20 +00:00
a286778762
Skip logging the warning for uncrypt_status for devices w/o /cache
...
This warning may cause confusion for users.
Bug: 36590598
Test: Warning line no longer shows for sailfish.
Change-Id: I277c87a50a72fdb499be790ee25b97f815d980be
Merged-In: I277c87a50a72fdb499be790ee25b97f815d980be
2017-03-26 05:24:57 +00:00
d08893c053
Skip logging the warning for uncrypt_status for devices w/o /cache
...
This warning may cause confusion for users.
Bug: 36590598
Test: Warning line no longer shows for sailfish.
Change-Id: I277c87a50a72fdb499be790ee25b97f815d980be
(cherry picked from commit bcb5b18630f518835a0768535b43ccfe91683fc9)
2017-03-26 05:20:22 +00:00
5d1e7fbadd
Merge "Don't fail ReadArgs if length to parse is 0" am: f4c949a41e am: e102ea13ee
...
am: 5f9617a51f
2017-03-26 00:02:08 +00:00
5f9617a51f
Merge "Don't fail ReadArgs if length to parse is 0" am: f4c949a41e
...
am: e102ea13ee
2017-03-25 23:59:37 +00:00
e102ea13ee
Merge "Don't fail ReadArgs if length to parse is 0"
...
am: f4c949a41e
2017-03-25 23:57:08 +00:00
f4c949a41e
Merge "Don't fail ReadArgs if length to parse is 0"
2017-03-25 23:53:31 +00:00
45f967a1ad
Merge "updater: Remove some redundant arguments." am: 5212a00588 am: 4ae56a3586
...
am: cf219a93c6
2017-03-25 23:21:52 +00:00
cf219a93c6
Merge "updater: Remove some redundant arguments." am: 5212a00588
...
am: 4ae56a3586
2017-03-25 23:19:05 +00:00
4ae56a3586
Merge "updater: Remove some redundant arguments."
...
am: 5212a00588
2017-03-25 23:16:35 +00:00
5212a00588
Merge "updater: Remove some redundant arguments."
2017-03-25 23:11:37 +00:00
524d0da309
Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c1e am: 85882b0779
...
am: ec96346b84
2017-03-25 17:15:44 +00:00
ec96346b84
Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c1e
...
am: 85882b0779
2017-03-25 17:13:13 +00:00
85882b0779
Merge "libbootloader_message: use different fstab paths for normal/recovery boot"
...
am: 5f98326c1e
2017-03-25 17:11:15 +00:00
5f98326c1e
Merge "libbootloader_message: use different fstab paths for normal/recovery boot"
2017-03-25 17:06:33 +00:00
37bd44174b
libbootloader_message: use different fstab paths for normal/recovery boot
...
libbootloader_message is used by both normal boot and recovery boot.
It needs to use different fstab paths, respectively. Otherwise, factory
reset will fail when we move /fstab.{ro.hardware} to /vendor/etc/.
Recovery boot: fs_mgr_read_fstab_with_dt("/etc/recovery.fstab")
Normal boot: fs_mgr_read_fstab_default()
Bug: 35811655
Bug: 36502022
Test: normal boot sailfish, go to Settings > System & tap on
"Factory Data reset"
Test: recovery boot sailfish
Change-Id: I253f5bdfb9be8a01f80856eb1194f85cdf992bbd
2017-03-25 19:25:43 +08:00
eb7c0dc6d0
Merge "updater: Drop the support for BBOTA v1 and v2." am: 5479506c9c am: 7b82ad12f6
...
am: 0ec16d8831
2017-03-24 23:17:09 +00:00
0ec16d8831
Merge "updater: Drop the support for BBOTA v1 and v2." am: 5479506c9c
...
am: 7b82ad12f6
2017-03-24 23:14:39 +00:00
7b82ad12f6
Merge "updater: Drop the support for BBOTA v1 and v2."
...
am: 5479506c9c
2017-03-24 23:12:39 +00:00
5479506c9c
Merge "updater: Drop the support for BBOTA v1 and v2."
2017-03-24 23:06:56 +00:00
91d12f9ef1
Merge "Const modifiers" am: 4efd353d8f am: 92d8772c49
...
am: d51bd8770a
2017-03-24 20:37:08 +00:00
3bea64c9f3
Merge "Removed C-style casts" am: 110155a604 am: 6a831e02b6
...
am: 6b3df6486e
2017-03-24 20:36:58 +00:00
d51bd8770a
Merge "Const modifiers" am: 4efd353d8f
...
am: 92d8772c49
2017-03-24 20:34:37 +00:00
6b3df6486e
Merge "Removed C-style casts" am: 110155a604
...
am: 6a831e02b6
2017-03-24 20:34:27 +00:00
Tao Bao
Bowgo Tsai
Tianjie Xu
Treehugger Robot