Tao Bao
7e61c6a862
tests: Construct two bad packages at runtime for VerifierTest.
...
For the BadPackage tests from VerifierTest: one alters the footer, and
the other alters the metadata. Move the two tests to be based on
otasigned_v3.zip (they're based on otasigned_v1.zip previously). Also
construct the testdata files dynamically (to save the space and for
better readability).
Test: recovery_component_test
Change-Id: I7604d563f8b4fa0c55fec8730c063384158e3abc
(cherry picked from commit 217d9f9859
)
2017-03-27 16:13:01 -07:00
Tao Bao
055703e26a
Merge "tests: Construct signature-boundary.zip at runtime."
2017-03-27 23:04:51 +00:00
Tao Bao
6ff8c6ac18
Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" am: 27c3e47853
am: b0e768e269
...
am: e65835d5ac
Change-Id: I518933a6b2f9bd03653924bda5511f7d4a3b15f1
2017-03-27 19:37:04 +00:00
Tao Bao
e65835d5ac
Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" am: 27c3e47853
...
am: b0e768e269
Change-Id: I87d8040917dcd2fc6e233458c8b14f4cdb15e457
2017-03-27 19:32:06 +00:00
Tao Bao
b0e768e269
Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot""
...
am: 27c3e47853
Change-Id: Ie55f8cbbcec911192d9fd3b92f32731721dba36f
2017-03-27 19:29:34 +00:00
Tao Bao
27c3e47853
Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot""
2017-03-27 19:23:12 +00:00
Bowgo Tsai
4508f23884
Revert "libbootloader_message: use different fstab paths for normal/recovery boot"
...
This reverts commit 37bd44174b
.
The logic here is better to be moved into fs_mgr, not fs_mgr clients.
Bug: 35811655
Bug: 36502022
Change-Id: Iae79bd8f7131516ad223f3323f1bc1d805206d51
Test: normal boot sailfish, go to Settings > System & tap
on "Factory Data reset"
Test: recovery boot sailfish
2017-03-27 17:47:21 +00:00
Tao Bao
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
Tianjie Xu
f5c40b2eaf
Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" am: df0619edea
-s ours am: a97b0712d8
-s ours
...
am: 334850c9fe
-s ours
Change-Id: I3a6ab2167920e16d29e9e90fa2726b2df97c6973
2017-03-27 05:42:26 +00:00
Tianjie Xu
6b083982f3
Skip logging the warning for uncrypt_status for devices w/o /cache am: 340e6762f8
...
am: 898fa718a9
Change-Id: I36a404a8b09ee22e1a113bfeb890baa3468727cb
2017-03-27 05:42:16 +00:00
Tianjie Xu
334850c9fe
Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" am: df0619edea
-s ours
...
am: a97b0712d8
-s ours
Change-Id: I94338224aa3f9b7b88518527f14dd51f7ce62b22
2017-03-27 05:40:27 +00:00
Tianjie Xu
898fa718a9
Skip logging the warning for uncrypt_status for devices w/o /cache
...
am: 340e6762f8
Change-Id: I05e9925238255de835b8a9317a74f9d199cef494
2017-03-27 05:40:15 +00:00
Tianjie Xu
a97b0712d8
Merge "Skip logging the warning for uncrypt_status for devices w/o /cache"
...
am: df0619edea
-s ours
Change-Id: I997f1ad6197e8a92530f50ed7fc002b972681407
2017-03-27 05:37:19 +00:00
Tianjie Xu
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
Tianjie Xu
df0619edea
Merge "Skip logging the warning for uncrypt_status for devices w/o /cache"
2017-03-27 05:15:40 +00:00
Tianjie Xu
e9d200fc3a
Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" into nyc-mr2-dev-plus-aosp
...
am: 49420e6c3d
Change-Id: Ice77b003eb914b615f7380b80e75fda998a903f5
2017-03-27 02:58:38 +00:00
Tianjie Xu
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
Tao Bao
e55215ffd5
Merge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494
am: 351f69e64a
...
am: dcbabd5932
Change-Id: Ia8ff537f0c503fec5602ae6ad6677c8b427d0806
2017-03-26 18:08:40 +00:00
Tao Bao
dcbabd5932
Merge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494
...
am: 351f69e64a
Change-Id: I83220c87347e6f4fe76b73924347b55a9c9e18ff
2017-03-26 18:06:09 +00:00
Tao Bao
351f69e64a
Merge "applypatch: Drop the support for patching non-EMMC targets."
...
am: b4c4f8c494
Change-Id: If2eadfe81c5a7942c2709a548dcd3957323e3436
2017-03-26 18:03:10 +00:00
Tao Bao
b4c4f8c494
Merge "applypatch: Drop the support for patching non-EMMC targets."
2017-03-26 18:00:20 +00:00
Tianjie Xu
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
Tianjie Xu
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
Tianjie Xu
5d1e7fbadd
Merge "Don't fail ReadArgs if length to parse is 0" am: f4c949a41e
am: e102ea13ee
...
am: 5f9617a51f
Change-Id: I674484fcdde5d9b7f847d6efef667638a8da6936
2017-03-26 00:02:08 +00:00
Tianjie Xu
5f9617a51f
Merge "Don't fail ReadArgs if length to parse is 0" am: f4c949a41e
...
am: e102ea13ee
Change-Id: I56740f678375ad00f3ae90125c610c8f5003290e
2017-03-25 23:59:37 +00:00
Tianjie Xu
e102ea13ee
Merge "Don't fail ReadArgs if length to parse is 0"
...
am: f4c949a41e
Change-Id: Ic6daca7eb24b121058c7e9075d5719fcdada37ae
2017-03-25 23:57:08 +00:00
Tianjie Xu
f4c949a41e
Merge "Don't fail ReadArgs if length to parse is 0"
2017-03-25 23:53:31 +00:00
Tao Bao
45f967a1ad
Merge "updater: Remove some redundant arguments." am: 5212a00588
am: 4ae56a3586
...
am: cf219a93c6
Change-Id: I7047eb4ce09d7aa69cd044ddce07cbb41e5ac246
2017-03-25 23:21:52 +00:00
Tao Bao
cf219a93c6
Merge "updater: Remove some redundant arguments." am: 5212a00588
...
am: 4ae56a3586
Change-Id: I2fd18158ad74770e4a372b6288e65ceabfc18297
2017-03-25 23:19:05 +00:00
Tao Bao
4ae56a3586
Merge "updater: Remove some redundant arguments."
...
am: 5212a00588
Change-Id: I74ae1b87579bec0f1008b38e5ca913ef7c355238
2017-03-25 23:16:35 +00:00
Tao Bao
5212a00588
Merge "updater: Remove some redundant arguments."
2017-03-25 23:11:37 +00:00
Bowgo Tsai
524d0da309
Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c1e
am: 85882b0779
...
am: ec96346b84
Change-Id: I7d1750e6031e42fb331974cc21b2a6f71e799584
2017-03-25 17:15:44 +00:00
Bowgo Tsai
ec96346b84
Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c1e
...
am: 85882b0779
Change-Id: Ie7f75589e4ec7a3da4bc8cb31f0630837cbea4f4
2017-03-25 17:13:13 +00:00
Bowgo Tsai
85882b0779
Merge "libbootloader_message: use different fstab paths for normal/recovery boot"
...
am: 5f98326c1e
Change-Id: Ie5061ac357ee86a2192e8e1c1ab9e49a00fc1df0
2017-03-25 17:11:15 +00:00
Treehugger Robot
5f98326c1e
Merge "libbootloader_message: use different fstab paths for normal/recovery boot"
2017-03-25 17:06:33 +00:00
Bowgo Tsai
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
Tao Bao
eb7c0dc6d0
Merge "updater: Drop the support for BBOTA v1 and v2." am: 5479506c9c
am: 7b82ad12f6
...
am: 0ec16d8831
Change-Id: Iaa368fdab1940c3b206e9c43396c364790f707b8
2017-03-24 23:17:09 +00:00
Tao Bao
0ec16d8831
Merge "updater: Drop the support for BBOTA v1 and v2." am: 5479506c9c
...
am: 7b82ad12f6
Change-Id: I7404ce4db28555a98a24fd5020712edda84b04d5
2017-03-24 23:14:39 +00:00
Tao Bao
7b82ad12f6
Merge "updater: Drop the support for BBOTA v1 and v2."
...
am: 5479506c9c
Change-Id: If0f6acf7120c6bc4b4644a12aa83939b52ad48c5
2017-03-24 23:12:39 +00:00
Tao Bao
5479506c9c
Merge "updater: Drop the support for BBOTA v1 and v2."
2017-03-24 23:06:56 +00:00
Tao Bao
91d12f9ef1
Merge "Const modifiers" am: 4efd353d8f
am: 92d8772c49
...
am: d51bd8770a
Change-Id: I7a8f14bde0359dcd3d1a29d8ba37f373b205c47a
2017-03-24 20:37:08 +00:00
Tao Bao
3bea64c9f3
Merge "Removed C-style casts" am: 110155a604
am: 6a831e02b6
...
am: 6b3df6486e
Change-Id: Ib917ebb9e4bd7a5cd7dcd785593f0a2f4ef0aefb
2017-03-24 20:36:58 +00:00
Tao Bao
d51bd8770a
Merge "Const modifiers" am: 4efd353d8f
...
am: 92d8772c49
Change-Id: I453dbfb45e3f70586e77cb28207c164fe9cb72fa
2017-03-24 20:34:37 +00:00
Tao Bao
6b3df6486e
Merge "Removed C-style casts" am: 110155a604
...
am: 6a831e02b6
Change-Id: If512cbe096ad18388fea2800d12182832d0ecda8
2017-03-24 20:34:27 +00:00
Tao Bao
92d8772c49
Merge "Const modifiers"
...
am: 4efd353d8f
Change-Id: I8ae993749d5f2c58cc5ef23f90845cf5a0bf756d
2017-03-24 20:32:39 +00:00
Tao Bao
6a831e02b6
Merge "Removed C-style casts"
...
am: 110155a604
Change-Id: I363e172a8f7f9e67dfc9474e0e10463690cdd833
2017-03-24 20:32:29 +00:00
Tao Bao
4efd353d8f
Merge "Const modifiers"
2017-03-24 20:28:09 +00:00
Tao Bao
110155a604
Merge "Removed C-style casts"
2017-03-24 20:28:00 +00:00
Tao Bao
4db650ca10
Merge "Fix the wrong parameter when calling read_metadata_from_package()." am: 6014db5da6
am: 5da7e41ec8
...
am: be4578f009
Change-Id: I46cf74bc32cd1d2666a1b14df62b9fe96445c971
2017-03-24 20:20:57 +00:00
Tao Bao
be4578f009
Merge "Fix the wrong parameter when calling read_metadata_from_package()." am: 6014db5da6
...
am: 5da7e41ec8
Change-Id: I56222c4a4bf245ca7c5a9506750125f23bed443f
2017-03-24 20:18:27 +00:00