Tianjie Xu
6ccd0b780f
Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc
...
am: 556ca4e301
Change-Id: Ib75bdbee801b1caa2ff7b94b174feae1f7d85688
2017-03-28 21:39:08 +00:00
Tianjie Xu
556ca4e301
Merge "Log temperature during OTA update" am: bc2c51a97f
...
am: 1d7e500bfc
Change-Id: I44a64b7cf0054fcc4cea9b6124c3f6a089f268e1
2017-03-28 21:34:07 +00:00
Tianjie Xu
1d7e500bfc
Merge "Log temperature during OTA update"
...
am: bc2c51a97f
Change-Id: I7feda067a7e343868a7a1fef3a561afa9d14e77c
2017-03-28 21:28:37 +00:00
Tianjie Xu
bc2c51a97f
Merge "Log temperature during OTA update"
2017-03-28 21:16:45 +00:00
Tianjie Xu
9166f66eee
Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9
...
am: 5ec12126f0
Change-Id: Ia6b861c91958d3be23a4a7456d6d5d8e4a1607c8
2017-03-28 20:11:15 +00:00
Tianjie Xu
5ec12126f0
Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636
...
am: dc235b5ab9
Change-Id: I8683d9c8d6d2dfe1ef6085b48f6edc2cb8b1834d
2017-03-28 20:02:45 +00:00
Tianjie Xu
dc235b5ab9
Merge "Add the missing sr-Latn into png files and rename the png locale header"
...
am: 713d915636
Change-Id: I23a8ac215d4a549cda347b86a91df1bb97e089c5
2017-03-28 19:52:47 +00:00
Tianjie Xu
713d915636
Merge "Add the missing sr-Latn into png files and rename the png locale header"
2017-03-28 19:42:54 +00:00
Tao Bao
e003a97668
Merge changes from topic 'sinkfn' am: 34df98ee6d am: 862b7e8523
...
am: a2015e0d86
Change-Id: I55bd4c762033cbfd68b019c3fad861ff9b954450
2017-03-28 19:21:34 +00:00
Tao Bao
b5f84ef1c3
applypatch: Change the ssize_t length parameters to size_t. am: f7eb760fe7 am: d4d9ef3941
...
am: 52569ce2ed
Change-Id: Ifeeb537d59d93acac445a0c748e4180a9704fcfb
2017-03-28 19:21:31 +00:00
Tao Bao
a2015e0d86
Merge changes from topic 'sinkfn' am: 34df98ee6d
...
am: 862b7e8523
Change-Id: I859296b62fcd7b43775885f4d2ece3272a9bff11
2017-03-28 19:16:34 +00:00
Tao Bao
52569ce2ed
applypatch: Change the ssize_t length parameters to size_t. am: f7eb760fe7
...
am: d4d9ef3941
Change-Id: Ifd231403d2d5960faf35859d445de73a78b6a371
2017-03-28 19:16:31 +00:00
Tao Bao
862b7e8523
Merge changes from topic 'sinkfn'
...
am: 34df98ee6d
Change-Id: I05710606fac5b4b8746416799635691f4083aef4
2017-03-28 19:11:11 +00:00
Tao Bao
d4d9ef3941
applypatch: Change the ssize_t length parameters to size_t.
...
am: f7eb760fe7
Change-Id: I4661186d7bd696e4fa5318217b383cbe0a2902c3
2017-03-28 19:11:06 +00:00
Treehugger Robot
34df98ee6d
Merge changes from topic 'sinkfn'
...
* changes:
applypatch: Let Apply{BSDiff,Image}Patch accept std::function.
applypatch: Change the ssize_t length parameters to size_t.
2017-03-28 19:01:32 +00:00
Tianjie Xu
3ee2b9db5a
Log temperature during OTA update
...
Log the maximum temperature as well as the start/end temperature of an
update to last_install. Check the temperature at the end of each
block_image_update(verify). To get the maximum temp, we iterate through
/sys/class/thermal/thermal_zone*/temp and find the maximum value
present.
Bug: 32518487
Test: temperature logs in last_install
Change-Id: Iaf22a9fbc5b18611bbc5320ffea995417872e514
2017-03-28 11:28:47 -07:00
Tao Bao
c0e1c46a70
applypatch: Let Apply{BSDiff,Image}Patch accept std::function.
...
Test: mmma bootable/recovery system/update_engine
Test: recovery_component_test
Change-Id: I93c2caa87bf94a53509bb37f98f2c02bcadb6f5c
2017-03-28 10:14:53 -07:00
Tao Bao
f7eb760fe7
applypatch: Change the ssize_t length parameters to size_t.
...
Mostly for applypatch family APIs like ApplyBSDiffPatch() and
ApplyImagePatch(). Changing to size_t doesn't indicate they would
necessarily work with very large size_t (e.g. > ssize_t), just
similar to write(2). But otherwise accepting negative length doesn't
make much sense.
Also change the return type of SinkFn from ssize_t to size_t. Callers
tell a successful sink by comparing the number of written bytes against
the desired value. Negative return values like -1 are not needed. This
also makes it consistent with bsdiff::bspatch interface.
Test: recovery_component_test
Test: Apply an incremental with the new updater.
Change-Id: I7ff1615203a5c9854134f75d019e266f4ea6e714
2017-03-28 10:13:38 -07:00
Tao Bao
67801f2b3a
Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069d
...
am: 21b5268fbd
Change-Id: I7f0051f628907b8a1c6c35a96c136fa624bd623d
2017-03-28 08:05:13 +00:00
Tao Bao
21b5268fbd
Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535
...
am: 51159a069d
Change-Id: Ia542c58abd931af5f2b0bc089ff2b67886c91070
2017-03-28 05:51:11 +00:00
Tao Bao
51159a069d
Merge "updater: Clean up LoadSrcTgtVersion2()."
...
am: f037b7b535
Change-Id: I6e2488d12fadebb5b17949b5fbecbaee335700af
2017-03-28 05:46:42 +00:00
Tao Bao
f037b7b535
Merge "updater: Clean up LoadSrcTgtVersion2()."
2017-03-28 05:40:20 +00:00
Tao Bao
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
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