Commit Graph

4211 Commits

Author SHA1 Message Date
Tao Bao dcf94dd14c Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37 am: c6df7d2937 am: 62a4e5ca98
am: 20e4e73caa

Change-Id: Ib58d2e7843c6cbe75695b83651e3dcd2f9d94f9a
2017-03-28 22:39:39 +00:00
Tao Bao 20e4e73caa Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37 am: c6df7d2937
am: 62a4e5ca98

Change-Id: I87b66da50364c0effdfdd5dbe8a7d0496152e68b
2017-03-28 22:34:39 +00:00
Tao Bao 62a4e5ca98 Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37
am: c6df7d2937

Change-Id: Iea518cbea5e64bd06475c472f88c6cc8c75602d6
2017-03-28 22:27:41 +00:00
Tao Bao c6df7d2937 Merge "tests: Add a test for --wipe_ab into UncryptTest."
am: 7b0cda5b37

Change-Id: Iadc316dd0503240b3d8bbdf30334c9da92ac238f
2017-03-28 22:22:12 +00:00
Tao Bao 7b0cda5b37 Merge "tests: Add a test for --wipe_ab into UncryptTest." 2017-03-28 22:12:35 +00:00
Tianjie Xu 6e770e4f94 Merge "Suppress the unused variable warning in parser.yy" am: b9b03a282b am: 05c111b90b am: 6835d52c7e
am: 0868447714

Change-Id: Icdd7a149a5666866720266343095665fc5830229
2017-03-28 21:44:33 +00:00
Tianjie Xu aa39b3c623 Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc am: 556ca4e301
am: 6ccd0b780f

Change-Id: I506216f819950295d50a7d0d0310f7d537d59b60
2017-03-28 21:44:24 +00:00
Tianjie Xu 0868447714 Merge "Suppress the unused variable warning in parser.yy" am: b9b03a282b am: 05c111b90b
am: 6835d52c7e

Change-Id: Ibb0bc1ccb3abf0a9ad82eea38b28e882a89e2f06
2017-03-28 21:39:18 +00:00
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 6835d52c7e Merge "Suppress the unused variable warning in parser.yy" am: b9b03a282b
am: 05c111b90b

Change-Id: I111bdd2b72dd4ae04e7c6bcb020621fdc77915b7
2017-03-28 21:34:15 +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 05c111b90b Merge "Suppress the unused variable warning in parser.yy"
am: b9b03a282b

Change-Id: I722683e1a474180dc7bfd85d249e05aab66c8712
2017-03-28 21:28:50 +00:00
Tianjie Xu 1d7e500bfc Merge "Log temperature during OTA update"
am: bc2c51a97f

Change-Id: I7feda067a7e343868a7a1fef3a561afa9d14e77c
2017-03-28 21:28:37 +00:00
Treehugger Robot b9b03a282b Merge "Suppress the unused variable warning in parser.yy" 2017-03-28 21:21:06 +00:00
Tao Bao 2eb5d10846 Merge "tests: Construct two bad packages at runtime for VerifierTest." 2017-03-28 21:18:13 +00:00
Tianjie Xu bc2c51a97f Merge "Log temperature during OTA update" 2017-03-28 21:16:45 +00:00
Tianjie Xu de78df3bd7 Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9 am: 5ec12126f0
am: 9166f66eee

Change-Id: Ia899f1e60074f1ecfa9759f6aecfbc6ce9c3ec9b
2017-03-28 20:17:52 +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 c3c3496ab2 Suppress the unused variable warning in parser.yy
The warning says: bootable/recovery/edify/parser.yy:123.3-9: warning:
unused value: $1

Bug: 36678950
Test: mma
Change-Id: Ic734c416a5a8f62fb5e516669102c1d2b4ad5083
2017-03-28 12:44:10 -07: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 92ca82ec3e Merge changes from topic 'sinkfn' am: 34df98ee6d am: 862b7e8523 am: a2015e0d86
am: e003a97668

Change-Id: I04d941f9df9b83df53e8f564e4abcd83d61c279a
2017-03-28 19:31:34 +00:00
Tao Bao c1966bd6b9 applypatch: Change the ssize_t length parameters to size_t. am: f7eb760fe7 am: d4d9ef3941 am: 52569ce2ed
am: b5f84ef1c3

Change-Id: Ic78e33f6b5cc364b6b1280b6dbd51dc4641c56ca
2017-03-28 19:31:31 +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 bdc8c1a264 tests: Add a test for --wipe_ab into UncryptTest.
Also factor out the common parts in {setup,clear}_bcb into a separate
function.

Test: recovery_component_test
Change-Id: I7b95cced925c8135e020dcb791ca2425d4f28449
2017-03-28 10:55:02 -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 ada3797c50 Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069d am: 21b5268fbd
am: 67801f2b3a

Change-Id: I94a98c9df68e0bba19aa5a7901a4ce5bb45cfca1
2017-03-28 08:28:29 +00: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 9531047a69 Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069d
am: 21b5268fbd

Change-Id: Ic8c8d1192aeaf6a16fb0b5fe496a320074792421
2017-03-28 05:59:12 +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 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