summaryrefslogtreecommitdiffstats
path: root/updater/updater.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* resolve merge conflicts of 434697f to masterTianjie Xu2016-10-191-17/+29
|\ | | | | | | Change-Id: I0fea3d33b97065a3bf50f8e3669c2b50166a14ed
| * Replace minzip with libziparchiveTianjie Xu2016-10-181-20/+33
| | | | | | | | | | | | | | | | | | | | | | Clean up the duplicated codes that handle the zip files in bootable/recovery; and rename the library of the remaining utility functions to libotautil. Test: Update package installed successfully on angler. Bug: 19472796 Change-Id: Iea8962fcf3004473cb0322b6bb3a9ea3ca7f679e
* | Merge "Change StringValue to use std::string" am: 2b17b24ae5 am: 430b7ae469Tianjie Xu2016-10-181-4/+4
|\| | | | | | | | | | | am: 13d8ee8c72 Change-Id: Ib8730f1656dfea01cb8dcb5a3ee50a40d13179ac
| * Change StringValue to use std::stringTianjie Xu2016-10-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | Changing the field of 'Value' in edify to std::string from char*. Meanwhile cleaning up the users of 'Value' and switching them to cpp style. Test: compontent tests passed. Bug: 31713288 Change-Id: Iec5a7d601b1e4ca40935bf1c70d325dafecec235
* | Merge "edify: Some clean-ups to libedify." am: c5b4b71913 am: 039e9dc5ca am: bd16939bbfTao Bao2016-10-131-1/+0
|\| | | | | | | | | | | am: 1b1a4edb4b Change-Id: Idc74e9e549fe61c8b3bb566579821660ecf459c4
| * edify: Some clean-ups to libedify.Tao Bao2016-10-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | - Remove dead declarations in expr.h: SetError(), GetError(), ClearError(). - Remove the declaration of Build() out of expr.h. - Use std::unordered_map to implement RegisterFunction() and FindFunction(); kill FinishRegistration(). - Add a testcase for calling unknown functions. Test: mmma bootable/recovery; recovery_component_test passes. Change-Id: I9af6825ae677f92b22d716a4a5682f58522af03b
* | Refactor libupdater into a seperate module. am: 0c7839ac14 am: cf1dbfa854 am: 8ff7cd20baTao Bao2016-10-111-4/+4
|\| | | | | | | | | | | am: 3a01338332 Change-Id: I1d03d8107d354122edbb88a817b76c490e35210c
| * Refactor libupdater into a seperate module.Tao Bao2016-10-111-4/+4
| | | | | | | | | | | | | | | | | | So that we can write native tests for updater functions. This CL adds a testcase for getprop() function. Test: mmma bootable/recovery; Run recovery_component_test on device. Change-Id: Iff4c1ff63c5c71aded2f9686fed6b71cc298c228
| * edify: Move State.script and State.errmsg to std::string.Tao Bao2016-10-041-20/+17
| | | | | | | | | | | | | | | | | | | | | | This way we kill a few strdup() and free() calls. Test: 1. recovery_component_test still passes; 2. Applying an update with the new updater works; 3. The error code in a script with abort("E310: xyz") is recorded into last_install correctly. Change-Id: Ibda4da5937346e058a0d7cc81764d6f02920010a
| * resolve merge conflicts of 7ce287d to nyc-dev-plus-aospTianjie Xu2016-06-041-1/+9
| |\ | | | | | | | | | Change-Id: I2194d1170281f58eb508f2ef63b39c8729125f76
| * \ resolve merge conflicts of 50f6417 to nyc-dev-plus-aospTianjie Xu2016-05-231-0/+17
| |\ \ | | | | | | | | | | | | Change-Id: I42c127f7946e678acf6596f6352f090abc0ca019
* | | | edify: Move State.script and State.errmsg to std::string.Tao Bao2016-10-051-20/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we kill a few strdup() and free() calls. Test: 1. recovery_component_test still passes; 2. Applying an update with the new updater works; 3. The error code in a script with abort("E310: xyz") is recorded into last_install correctly. Change-Id: Ibda4da5937346e058a0d7cc81764d6f02920010a (cherry picked from commit 59dcb9cbea8fb70ab933fd10d35582b08cd13f37)
* | | | resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aospTianjie Xu2016-06-041-1/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 894176632c * commit '894176632c7295875d01cfdc273b706996c483a4': Call ioctl before each write on retry Change-Id: I814e7c9409d94aed8733a9e1fc562394f8da1e76
| * \ \ \ resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aospTianjie Xu2016-06-041-1/+9
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Change-Id: I98502950a0882050f5ed1acb0549b218b2cd06e4
| | * | | Call ioctl before each write on retryTianjie Xu2016-06-031-1/+9
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | If the update is a retry, ioctl(BLKDISCARD) the destination blocks before writing to these blocks. Bug: 28990135 Change-Id: I1e703808e68ebb1292cd66afd76be8fd6946ee59
* | | | resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aospTianjie Xu2016-05-231-0/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 549745cc87 * commit '549745cc8778f806e46809e472fbcf3c7f066b83': Allow recovery to return error codes Change-Id: I474bc0afb4e92ffafec9de60e1665e3aa3c2cf10
| * | | resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aospTianjie Xu2016-05-231-0/+17
| |\| | | | |/ | |/| | | | Change-Id: I834aba65cb29102055ff9e70969973a7870d0e60
| | * Allow recovery to return error codesTianjie Xu2016-05-201-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write error code, cause code, and retry count into last_install. So we can have more information about the reason of a failed OTA. Example of new last_install: @/cache/recovery/block.map package name 0 install result retry: 1 retry count (new) error: 30 error code (new) cause: 12 error cause (new) Details in: go/android-ota-errorcode Bug: 28471955 Change-Id: I00e7153c821e7355c1be81a86c7f228108f3dc37
* | | Merge "Move selinux dependencies out of header files." am: 8124750 am: dc91161Elliott Hughes2016-04-021-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 5c23b80 * commit '5c23b801e5f29ca85dde4a58fde4a69faacd7c6c': Move selinux dependencies out of header files. Change-Id: I191e0337501fc5520da1fa726911ffabd5d156c9
| * | Move selinux dependencies out of header files.Elliott Hughes2016-04-021-0/+3
| | | | | | | | | | | | | | | Bug: http://b/27764900 Change-Id: Ib62a59edcb13054f40f514c404d32b87b14ed5f1
* | | Control fault injection with config files instead of build flags am: ff6df89Jed Estep2016-03-211-0/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | am: 6f78768 * commit '6f7876816b2322169432658235ebf7882ced0564': Control fault injection with config files instead of build flags
| * | Control fault injection with config files instead of build flagsJed Estep2016-03-191-0/+2
| | | | | | | | | | | | | | | Bug: 27724259 Change-Id: I65bdefed10b3fb85fcb9e1147eaf0687d7d438f4
* | | resolve merge conflicts of ce58688 to nyc-dev-plus-aospTao Bao2016-03-171-2/+0
|\| | | | | | | | | | | | | | | | | | | | am: 6f44637 * commit '6f446373fdda9e084e7cce86c4694f365e75951b': Revert "DO NOT MERGE Control fault injection with config files instead of build flags"
| * | Revert "DO NOT MERGE Control fault injection with config files instead of build flags"Tao Bao2016-03-171-2/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit f73abf36bcfd433a3fdd1664a77e8e531346c1b1. Bug: 27724259 Change-Id: I1301fdad15650837d0b1febd0c3239134e2b94fb
| * | DO NOT MERGE Control fault injection with config files instead of build flagsJed Estep2016-03-161-0/+2
| | | | | | | | | | | | | | | Bug: 26570379 Change-Id: I76109d09276d6e3ed3a32b6fedafb2582f545c0c
| * | Reboot and retry on I/O errorsTianjie Xu2016-03-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | When I/O error happens, reboot and retry installation two times before we abort this OTA update. Bug: 25633753 Change-Id: Iba6d4203a343a725aa625a41d237606980d62f69 (cherry picked from commit 3c62b67faf8a25f1dd1c44dc19759c3997fdfd36)
* | | Merge "Reboot and retry on I/O errors" am: 94dc34148c am: 90f01a4203Tianjie Xu2016-03-081-0/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | am: 9a83ca02a3 * commit '9a83ca02a32a21f00c7328269ab2c05940928452': Reboot and retry on I/O errors
| * | Reboot and retry on I/O errorsTianjie Xu2016-03-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | When I/O error happens, reboot and retry installation two times before we abort this OTA update. Bug: 25633753 Change-Id: Iba6d4203a343a725aa625a41d237606980d62f69
| * | Control fault injection with config files instead of build flagsJed Estep2016-02-231-0/+2
| | | | | | | | | | | | | | | | | | Bug: 26570379 Change-Id: I76109d09276d6e3ed3a32b6fedafb2582f545c0c (cherry picked from commit d940887dde23597dc358b16d96ca48dd7480fee6)
| * | recovery: Switch applypatch/ and updater/ to cpp.Tao Bao2015-07-141-0/+169
| / | | | | | | | | | | Mostly trivial changes to make cpp compiler happy. Change-Id: I69bd1d96fcccf506007f6144faf37e11cfba1270
* | Merge "Control fault injection with config files instead of build flags"Jed Estep2016-02-231-0/+2
|\ \
| * | Control fault injection with config files instead of build flagsJed Estep2016-02-201-0/+2
| |/ | | | | | | | | Bug: 26570379 Change-Id: I76109d09276d6e3ed3a32b6fedafb2582f545c0c
* / Fix integer overflows in recovery procedure.Yabin Cui2016-02-181-7/+6
|/ | | | | Bug: 26960931 Change-Id: Ieae45caccfb4728fcf514f0d920976585d8e6caf
* recovery: Switch applypatch/ and updater/ to cpp.Tao Bao2015-07-141-0/+169
Mostly trivial changes to make cpp compiler happy. Change-Id: I1b0481465c67c3bbca35a839d0764190d84ff34e (cherry picked from commit ba9a42aa7e10686de186636fe9fecbf8c4cc7c19)