Alex Deymo
a6adbefa2c
Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb am: f8f1a25850
...
am: a1e336d548
Change-Id: Ic444b595aba05ccbd4eee3f92c4739fbd7c277fa
2017-01-12 21:40:10 +00:00
Alex Deymo
3cbb199e24
Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1a
...
am: 9e93a79f4c
Change-Id: Ic1f49f4d225086fa7d7a810a6ba4c736ff319e3e
2017-01-12 21:37:38 +00:00
Alex Deymo
68b7f08b96
Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899
...
am: 9edd655f94
Change-Id: I6191d76d293d4b14e34eaafa227429999707e460
2017-01-12 21:37:36 +00:00
Alex Deymo
a1e336d548
Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb
...
am: f8f1a25850
Change-Id: I8b112d02b4a718ff258585e84fa4dfb3ba62dddc
2017-01-12 21:35:11 +00:00
Alex Deymo
9e93a79f4c
Remove "_static" suffix from libsparse am: 67f3aa8804
...
am: 204369ef1a
Change-Id: I614ac38fae44e6cee4a9c2abc35574e6041dc303
2017-01-12 21:32:38 +00:00
Alex Deymo
9edd655f94
Remove "_static" suffix from libext4_utils. am: 31653660ad
...
am: 4b54093899
Change-Id: Iec132548bf78f7c076217bda4e7f24b7acf35f33
2017-01-12 21:32:36 +00:00
Alex Deymo
f8f1a25850
Merge changes from topic 'host_suffix_cleanup'
...
am: 8031c2d2bb
Change-Id: Ifcbf0829692fcac31c5246a07994be1ce0f6ba59
2017-01-12 21:32:34 +00:00
Alex Deymo
204369ef1a
Remove "_static" suffix from libsparse
...
am: 67f3aa8804
Change-Id: Id40f2a7335fed5b0669a98eaa0815b129e35432d
2017-01-12 21:27:38 +00:00
Alex Deymo
4b54093899
Remove "_static" suffix from libext4_utils.
...
am: 31653660ad
Change-Id: Iae744743d29b3669dd57403a2eb90153e5efbe46
2017-01-12 21:27:37 +00:00
Alex Deymo
8031c2d2bb
Merge changes from topic 'host_suffix_cleanup'
...
* changes:
Remove "_static" suffix from libsparse
Remove "_static" suffix from libext4_utils.
2017-01-12 21:23:10 +00:00
Alex Deymo
67f3aa8804
Remove "_static" suffix from libsparse
...
Bug: 34220783
Change-Id: I358f931f0b29f5bd526e1475180e477e2e90b936
2017-01-11 14:38:30 -08:00
Alex Deymo
31653660ad
Remove "_static" suffix from libext4_utils.
...
Bug: 34220783
Change-Id: I34ccc3b11da0d1b48805967ad75b9ddade569930
2017-01-11 14:02:13 -08:00
Tianjie Xu
4ab40a064d
Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1
...
am: 7d345f27e7
Change-Id: I9ae05b6590af22e98c7cd31a480b4e4c73b67226
2017-01-10 19:17:55 +00:00
Tianjie Xu
7d345f27e7
Merge "Do not inject I/O fault on a retry" am: 37d74f3e20
...
am: 854ef3b9d1
Change-Id: Ic3939632a16b54c2b77732c48c1ace8105298e2f
2017-01-10 19:12:24 +00:00
Tianjie Xu
854ef3b9d1
Merge "Do not inject I/O fault on a retry"
...
am: 37d74f3e20
Change-Id: Ie34000f89b027b79f4161edc7b53b3dd14e51d6a
2017-01-10 19:07:23 +00:00
Tianjie Xu
37d74f3e20
Merge "Do not inject I/O fault on a retry"
2017-01-10 19:00:15 +00:00
Elliott Hughes
d481352f05
Merge "Address review comment." am: 77ec0071cf am: 3e003ceeda
...
am: ac431948d3
Change-Id: Ide8ad96300b13f8cc32717c61fdddfebbf2dd04e
2017-01-10 01:13:21 +00:00
Elliott Hughes
ac431948d3
Merge "Address review comment." am: 77ec0071cf
...
am: 3e003ceeda
Change-Id: I3f984543d2724c26f8720a4eaeea177b94cf0068
2017-01-10 01:08:22 +00:00
Elliott Hughes
3e003ceeda
Merge "Address review comment."
...
am: 77ec0071cf
Change-Id: I0b40813d4c40e104ee111c45e13d6f278e6d705c
2017-01-10 01:03:21 +00:00
Elliott Hughes
77ec0071cf
Merge "Address review comment."
2017-01-10 00:55:53 +00:00
Tianjie Xu
4728242070
Do not inject I/O fault on a retry
...
We could inject I/O faults during an OTA update for test purpose. But we
should skip the injection if the update is an retry. Otherwise the
update test will simply keeps failing.
Bug: 34159970
Test: Apply the same package on angler and the update succeeds on the 2nd try.
Change-Id: Id274e5475e3bc8d25d50a8cf61a77d2e32c569d6
2017-01-09 14:51:15 -08:00
Elliott Hughes
f6d4b1ec09
Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 am: 61728ff4d8
...
am: 6ac5db29db
Change-Id: Iad647704a2fc7d7fcfe7ca4c07eec7c1df7e0e02
2017-01-09 22:43:30 +00:00
Elliott Hughes
6ac5db29db
Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32
...
am: 61728ff4d8
Change-Id: I24746abcc64ed7fe89cf82fa844c719912a77d21
2017-01-09 22:38:29 +00:00
Elliott Hughes
61728ff4d8
Merge "Move to .md files for even trivial documentation."
...
am: 2fc1ff3b32
Change-Id: Idb55c0fcfa99fef4a584d48e39b63e45bd598bf3
2017-01-09 22:33:31 +00:00
Elliott Hughes
ff8fdc955a
Address review comment.
...
Bug: N/A
Test: N/A
Change-Id: I9467286e57522c6ed640a3599cb678ac10d9e2a4
2017-01-09 14:28:42 -08:00
Elliott Hughes
2fc1ff3b32
Merge "Move to .md files for even trivial documentation."
2017-01-09 22:25:53 +00:00
Tao Bao
931bc0c3d1
Merge "recovery: Fix the argument parsing." am: 33808f16c5 am: fe0a80184c
...
am: b7ce9c5e00
Change-Id: Ia85d957754774a4aa9825754339e8745e4d55663
2017-01-09 21:45:39 +00:00
Tao Bao
b7ce9c5e00
Merge "recovery: Fix the argument parsing." am: 33808f16c5
...
am: fe0a80184c
Change-Id: Id077e40e0fa27fb94fee942e95430eb02c369333
2017-01-09 21:40:39 +00:00
Tao Bao
fe0a80184c
Merge "recovery: Fix the argument parsing."
...
am: 33808f16c5
Change-Id: I9ae6633598262f21cca63f90cd51f6b84e5fead2
2017-01-09 21:35:39 +00:00
Tao Bao
33808f16c5
Merge "recovery: Fix the argument parsing."
2017-01-09 21:28:19 +00:00
Tao Bao
570af9dca3
recovery: Fix the argument parsing.
...
Commit f0ed159f48 unintentionally changed
the behavior when parsing the arguments from BCB and command file. It
should only parse the command file for arguments if BCB doesn't supply
any.
As a result, it shows the following from the log:
I:Got 2 arguments from boot message
I:Got 3 arguments from /cache/recovery/command
Test: Set arguments in BCB and command file both. It should only use the
arguments from BCB.
Change-Id: Idf371137aa9177f1b2dfdfecf0c9f46959d2ee76
2017-01-09 10:35:42 -08:00
Elliott Hughes
7a890e5cf5
Move to .md files for even trivial documentation.
...
So it's automatically displayed for folks browsing the source.
Bug: N/A
Test: N/A
Change-Id: Ie9b190072ebdf0faf06cc1fd7b3467c031056753
2017-01-07 12:49:32 -08:00
Tianjie Xu
4536c470f8
Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 am: 06b4254a70
...
am: 5ec75851a7
Change-Id: I8fc9a1e148b4b8088a2cd38ef04817c8c5ad99aa
2017-01-07 01:24:03 +00:00
Tianjie Xu
5ec75851a7
Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8
...
am: 06b4254a70
Change-Id: I09e0b59a433533c84f251a8c32c663a1ca8a8d3b
2017-01-07 01:20:05 +00:00
Tianjie Xu
06b4254a70
Merge "Retry ioctl in uncrypt if it returns block# 0"
...
am: ceafe69fb8
Change-Id: I5fa4c97672520c2ec47e2bbb55b55c5f54417dc7
2017-01-07 01:16:02 +00:00
Tianjie Xu
ceafe69fb8
Merge "Retry ioctl in uncrypt if it returns block# 0"
2017-01-07 01:11:13 +00:00
Tao Bao
31f4bb5a2c
Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb am: 1bbd9c68af
...
am: af53db6ba0
Change-Id: I2b069e20650758513687a90c4341d2168016b331
2017-01-06 19:21:36 +00:00
Tao Bao
af53db6ba0
Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb
...
am: 1bbd9c68af
Change-Id: Ia502cd3e40fb02ed01e3e91fd0892f952083b1fa
2017-01-06 19:17:37 +00:00
Tao Bao
1bbd9c68af
Merge "recovery: Clean up try_update_binary() in install.cpp."
...
am: 095675a3eb
Change-Id: I2fd17d43068359095746c885c0f3c0605eac232e
2017-01-06 19:13:37 +00:00
Treehugger Robot
095675a3eb
Merge "recovery: Clean up try_update_binary() in install.cpp."
2017-01-06 19:07:59 +00:00
Tao Bao
485b94f14d
Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 am: 179fc8a82b
...
am: ba0dad8828
Change-Id: If96d9335809c57629a58411429ff58c720c45ae2
2017-01-06 17:55:01 +00:00
Tao Bao
ba0dad8828
Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7
...
am: 179fc8a82b
Change-Id: I83bea4e1670fe7437e01f3dd232070807c28d77c
2017-01-06 17:51:31 +00:00
Tao Bao
179fc8a82b
Merge "tests: Add testcase for show_progress() and set_progress()."
...
am: 478a5ec9c7
Change-Id: I06ba1a53e13b1e9cbeaffad63d7b418782527166
2017-01-06 17:48:00 +00:00
Tao Bao
478a5ec9c7
Merge "tests: Add testcase for show_progress() and set_progress()."
2017-01-06 17:42:29 +00:00
Tao Bao
20c581e35d
recovery: Clean up try_update_binary() in install.cpp.
...
Move functions over to android::base versions.
- strtok(3) => android::base::Split()
- strtol(3) => android::base::ParseInt()
- strtof(3) => android::base::ParseDouble()
Test: Build recovery image and apply a package that calls ui_print /
progress / set_progress commands.
Change-Id: I953b4985e0bd9e277362ae53e233d755cf27d80c
2017-01-06 09:25:32 -08:00
Tao Bao
9aa7ab5b10
tests: Add testcase for show_progress() and set_progress().
...
Test: recovery_component_test passes.
Change-Id: I4f00d0171cf86699e9ce747d07d7d44a01906e81
2017-01-05 17:50:10 -08:00
Tao Bao
36c895d8ae
Merge "updater: Clean up CreateStash()." am: 91f74c82cd am: 719a15b187
...
am: fbb5dbb471
Change-Id: If1b1b5c2a52abde1cc6b860413efe935f326a63d
2017-01-05 21:43:37 +00:00
Tao Bao
fbb5dbb471
Merge "updater: Clean up CreateStash()." am: 91f74c82cd
...
am: 719a15b187
Change-Id: I927826ffeb42053881bf35e5051ca3599205f3ee
2017-01-05 21:40:06 +00:00
Tao Bao
719a15b187
Merge "updater: Clean up CreateStash()."
...
am: 91f74c82cd
Change-Id: Ie7b92df12edf5bf8dc87806b22daf7ab1683d055
2017-01-05 21:37:05 +00:00
Tao Bao
91f74c82cd
Merge "updater: Clean up CreateStash()."
2017-01-05 21:14:43 +00:00