summaryrefslogtreecommitdiffstats
path: root/tests (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge "updater: Move libupdater to Soong."Tao Bao2018-08-141-5/+5
|\
| * updater: Move libupdater to Soong.Tao Bao2018-08-131-5/+5
* | Merge "Add the hash_tree_info class in Command"Tianjie Xu2018-08-141-0/+20
|\ \
| * | Add the hash_tree_info class in CommandTianjie Xu2018-08-141-0/+20
* | | Reland "Build and use minadbd as a shared library."Tao Bao2018-08-131-2/+0
| |/ |/|
* | tests: Create res-testdata for testdata pickup.Tao Bao2018-08-137-5/+11
* | Revert "Build and use minadbd as a shared library."Tao Bao2018-08-081-1/+1
* | Merge "Build and use minadbd as a shared library."Tao Bao2018-08-071-1/+1
|\ \
| * | Build and use minadbd as a shared library.Tao Bao2018-08-071-1/+1
* | | Merge "Add an updater function to compute hash tree"Tianjie Xu2018-08-073-0/+83
|\ \ \ | | |/ | |/|
| * | Merge "Add an updater function to compute hash tree"Tianjie Xu2018-08-073-0/+83
| |\ \ | | |/ | |/|
| | * Add an updater function to compute hash treeTianjie Xu2018-08-063-0/+83
* | | Merge "Dynamically load device-specific recovery UI lib."Tao Bao2018-08-071-1/+1
|\| |
| * | Dynamically load device-specific recovery UI lib.Tao Bao2018-08-061-1/+1
* | | Merge "recovery: Add ability to interrupt UI"Jerry Zhang2018-07-311-1/+38
|\| |
| * | recovery: Add ability to interrupt UIJerry Zhang2018-07-301-1/+38
| |/
* | Merge "Add proto3 support for care_map"Tianjie Xu2018-07-262-20/+96
|\|
| * Add proto3 support for care_mapTianjie Xu2018-07-252-20/+96
* | Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-masterTreeHugger Robot2018-07-231-7/+0
|\ \
| * | Revert "Make recovery libraries shared / recovery_available"Hridya Valsaraju2018-07-231-7/+0
* | | Merge "applypatch: Change applypatch command-line arguments."Tao Bao2018-07-211-191/+107
|\ \ \ | |/ / |/| / | |/
| * applypatch: Change applypatch command-line arguments.Tao Bao2018-07-201-191/+107
* | Make recovery libraries shared / recovery_availableJerry Zhang2018-07-201-0/+7
* | Merge "Fix the arguments passed to getopt_long(3)."Tao Bao2018-07-171-0/+10
|\|
| * Fix the arguments passed to getopt_long(3).Tao Bao2018-07-171-0/+10
* | Merge "tests: Clean up the temporary dirs post-run."Tao Bao2018-07-132-21/+22
|\|
| * tests: Clean up the temporary dirs post-run.Tao Bao2018-07-122-21/+22
* | Merge "applypatch: Fix the return type of FreeSpaceForFile()."Tao Bao2018-07-131-6/+18
|\|
| * applypatch: Fix the return type of FreeSpaceForFile().Tao Bao2018-07-121-6/+18
* | Merge "Remove the debug code for bspatch flakiness"Tao Bao2018-07-121-66/+2
|\|
| * Remove the debug code for bspatch flakinessTianjie Xu2018-07-111-66/+2
* | Merge "updater: Let read_file() return Value::Type::STRING."Tao Bao2018-07-101-0/+23
|\|
| * updater: Let read_file() return Value::Type::STRING.Tao Bao2018-07-101-0/+23
* | Merge "edify: Rename parse_string to ParseString and let it take std::string."Tao Bao2018-07-102-69/+66
|\|
| * Merge "edify: Rename parse_string to ParseString and let it take std::string."Tao Bao2018-07-102-69/+66
| |\
| | * edify: Rename parse_string to ParseString and let it take std::string.Tao Bao2018-07-102-69/+66
* | | Merge "edify: Remove VAL_INVALID and move ValueType into Value class."Tao Bao2018-07-101-2/+2
|\| |
| * | edify: Remove VAL_INVALID and move ValueType into Value class.Tao Bao2018-07-101-2/+2
| |/
* | Merge "applypatch: Restrict applypatch_check to eMMC targets."Tao Bao2018-07-102-86/+50
|\|
| * applypatch: Restrict applypatch_check to eMMC targets.Tao Bao2018-07-102-86/+50
* | Merge "updater: Remove the support for sha1_check()."Tao Bao2018-07-101-33/+28
|\|
| * updater: Remove the support for sha1_check().Tao Bao2018-07-091-33/+28
* | Merge "updater: Add ABORT command."Tao Bao2018-07-092-3/+34
|\|
| * updater: Add ABORT command.Tao Bao2018-07-072-3/+34
* | Merge "tests: Split unit tests out of component/applypatch_test.cpp."Tao Bao2018-07-063-289/+331
|\|
| * tests: Split unit tests out of component/applypatch_test.cpp.Tao Bao2018-07-063-289/+331
* | Merge "updater: Check the number of args in Command::Parse."Tao Bao2018-06-261-0/+25
|\|
| * updater: Check the number of args in Command::Parse.Tao Bao2018-06-251-0/+25
* | Merge "updater: Add Command parsing codes."Tao Bao2018-06-262-0/+277
|\|
| * updater: Add Command parsing codes.Tao Bao2018-06-252-0/+277
* | Merge "Drop the dependency on AB_OTA_UPDATER flag."Tao Bao2018-06-192-93/+85
|\|
| * Drop the dependency on AB_OTA_UPDATER flag.Tao Bao2018-06-192-93/+85
* | Merge "tests: Skip ScreenRecoveryUITest on gr_init failure."Tao Bao2018-06-141-1/+38
|\|
| * tests: Skip ScreenRecoveryUITest on gr_init failure.Tao Bao2018-06-141-1/+38
* | Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-masterXin Li2018-06-091-1/+13
|\ \ | |/ |/|
| * Merge "ui: join only if joinable." am: 2454b2493aTao Bao2018-06-061-0/+5
| |\
| * \ Merge "tests: Specify the death test style to avoid flakiness." am: 878d5a77f0Tao Bao2018-06-062-0/+5
| |\ \
| * \ \ Merge "tests: Add ResumableUpdaterTest." am: a21a63bf56Tao Bao2018-06-051-0/+227
| |\ \ \
| * \ \ \ Merge "ui: Use std::thread to create input/progress threads." am: b8634ca793Tao Bao2018-05-291-2/+10
| |\ \ \ \
| * \ \ \ \ Merge "updater: Add Commmand class to manage BBOTA commands." am: a488bd992fTao Bao2018-05-292-0/+38
| |\ \ \ \ \
| * \ \ \ \ \ Merge "tests: Setup last_command_file for UpdaterTest." am: d1e0cda4d6Tao Bao2018-05-251-13/+15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge "tests: Refactor the common lines in UpdaterTest." am: faa47854f4Tao Bao2018-05-251-286/+182
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "Convert deflate image chunks to raw if the raw data is smaller" am: fc0f04cba7Tianjie Xu2018-05-253-32/+75
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Move stuff from recovery into librecovery.Tao Bao2018-05-171-2/+14
* | | | | | | | | | updater: Remove the redundant check on line count.Tao Bao2018-06-071-2/+21
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | ui: join only if joinable.Tao Bao2018-06-061-0/+5
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | tests: Specify the death test style to avoid flakiness.Tao Bao2018-06-052-0/+5
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | tests: Add ResumableUpdaterTest.Tao Bao2018-06-041-0/+227
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge "ui: Use std::thread to create input/progress threads."Tao Bao2018-05-291-2/+10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | ui: Use std::thread to create input/progress threads.Tao Bao2018-05-221-2/+10
* | | | | | updater: Add Commmand class to manage BBOTA commands.Tao Bao2018-05-262-0/+38
| |_|_|_|/ |/| | | |
* | | | | tests: Setup last_command_file for UpdaterTest.Tao Bao2018-05-251-13/+15
| |_|_|/ |/| | |
* | | | Merge "tests: Refactor the common lines in UpdaterTest."Tao Bao2018-05-251-286/+182
|\ \ \ \ | |_|_|/ |/| | |
| * | | tests: Refactor the common lines in UpdaterTest.Tao Bao2018-05-241-286/+182
| |/ /
* | | Merge "Convert deflate image chunks to raw if the raw data is smaller"Tianjie Xu2018-05-253-32/+75
|\ \ \ | |/ / |/| |
| * | Convert deflate image chunks to raw if the raw data is smallerTianjie Xu2018-05-243-32/+75
| |/
* / Move stuff from recovery into librecovery.Tao Bao2018-05-171-1/+1
|/
* wear_ui: Address a TODO regarding {intro,loop}_frames.Tao Bao2018-05-141-3/+53
* Clean up the Makefile for recovery and tests.Tao Bao2018-05-121-28/+71
* screen_ui: Fix an issue in RTL locale detection.Tao Bao2018-05-091-1/+1
* tests: Add tests for ScreenRecoveryUI.Tao Bao2018-05-094-0/+168
* otautil: Rename dir/sys/thermal utils.Tao Bao2018-05-045-8/+8
* Move menu headers/items to std::vector<std::string>.Tao Bao2018-05-031-12/+15
* screen_ui: Merge Menu::Start() into its ctor.Tao Bao2018-05-031-21/+7
* Merge libmounts into libotautil.Tao Bao2018-04-281-1/+0
* Merge "Dump the uncompressed data's SHA1 to debug flaky tests"Tianjie Xu2018-04-261-2/+52
|\
| * Dump the uncompressed data's SHA1 to debug flaky testsTianjie Xu2018-04-261-2/+52
* | Rename CacheLocation to Paths.Tao Bao2018-04-262-13/+12
|/
* Dump debug information for apply_patch unit testsTianjie Xu2018-04-241-1/+12
* Make update_verifier generic across verified boot versions.Tao Bao2018-04-202-13/+4
* applypatch: Dump patch info on mismatching patching result.Tao Bao2018-04-191-0/+5
* tests: Move ResourcesTest into component test.Tao Bao2018-04-163-101/+126
* Expose PngHandler via resources.h.Tao Bao2018-04-141-95/+55
* Remove the old log files if cache space is insufficient for OTATianjie Xu2018-04-131-0/+129
* tests: Pick up testdata with LOCAL_TEST_DATA.Tao Bao2018-04-024-62/+25
* Factor out a menu class for screen uiTianjie Xu2018-03-242-1/+201
* update_verifier: Support verifying product partition.Tao Bao2018-03-231-2/+1
* tests: Split ApplyPatchModesTest.PatchModeEmmcTarget.Tao Bao2018-03-201-45/+74
* Merge "tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test."Treehugger Robot2018-03-131-0/+51
|\
| * tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test.Tao Bao2018-03-131-0/+51
* | recovery: add libhidl-gen-utils depedencyYifan Hong2018-03-081-0/+1
|/
* Add a singleton CacheLocation to replace the hard coded locationsTianjie Xu2018-02-282-9/+17
* Remove the assumption of target chunk size in imgdiffTianjie Xu2018-02-231-0/+101
* Log the last command to cacheTianjie Xu2018-02-071-0/+217
* StartsWith allows a std::string prefix now.Elliott Hughes2017-12-201-1/+1
* Load-balancing update_verifier worker threads.Tao Bao2017-11-091-0/+80
* Merge "otautil: Remove the aborts in RangeSet::Parse()."Tao Bao2017-11-081-14/+64
|\
| * otautil: Remove the aborts in RangeSet::Parse().Tao Bao2017-11-071-14/+64
* | Merge "Switch to bionic gtest in bootable/recovery"Tianjie Xu2017-11-064-238/+142
|\ \ | |/ |/|
| * Switch to bionic gtest in bootable/recoveryTianjie Xu2017-11-034-238/+142
* | Clean up fuse_sideload and add a testcase.Tao Bao2017-11-041-4/+66
* | Merge "tests: Clean up the files in TemporaryDir."Treehugger Robot2017-11-031-5/+9
|\ \ | |/ |/|
| * tests: Clean up the files in TemporaryDir.Tao Bao2017-11-021-5/+9
* | Merge "Add libbrotli as a dependency for libbsdiff"Tianjie Xu2017-11-021-0/+1
|\ \ | |/ |/|
| * Add libbrotli as a dependency for libbsdiffTianjie Xu2017-11-011-0/+1
* | Fix the size mismatch in imgdiffTianjie Xu2017-11-014-53/+36
|/
* tests: Take the ownership of the FD when calling fdopen.Tao Bao2017-10-262-29/+29
* Merge "Use SuffixArrayIndexInterface opaque type instead of the underlying data pointer."Alex Deymo2017-10-241-1/+1
|\
| * Merge "Use SuffixArrayIndexInterface opaque type instead of the underlying data pointer."Treehugger Robot2017-10-241-1/+1
| |\
| | * Use SuffixArrayIndexInterface opaque type instead of the underlying data pointer.Alex Deymo2017-10-241-1/+1
* | | Merge "Finish the new data receiver when update fails"Tianjie Xu2017-10-201-87/+133
|\| |
| * | Finish the new data receiver when update failsTianjie Xu2017-10-201-87/+133
* | | Merge "otautil: Move RangeSet implementation into rangeset.cpp."Tao Bao2017-10-171-0/+1
|\| |
| * | otautil: Move RangeSet implementation into rangeset.cpp.Tao Bao2017-10-161-0/+1
* | | Merge "Move rangeset.h and print_sha1.h into otautil."Tao Bao2017-10-114-4/+5
|\| |
| * | Move rangeset.h and print_sha1.h into otautil.Tao Bao2017-10-114-4/+5
* | | Merge changes from topic "libedify-header"Tao Bao2017-10-101-1/+1
|\| |
| * | Revert "Revert "Move error_code.h into otautil.""Tao Bao2017-10-091-1/+1
| |/
* | Merge "Revert "Move error_code.h into otautil.""Tao Bao2017-10-051-1/+1
|\|
| * Revert "Move error_code.h into otautil."Tao Bao2017-10-051-1/+1
* | Merge "Move error_code.h into otautil."Tao Bao2017-10-051-1/+1
|\|
| * Move error_code.h into otautil.Tao Bao2017-10-041-1/+1
* | Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES."Tao Bao2017-09-291-1/+1
|\|
| * otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES.Tao Bao2017-09-291-1/+1
* | Merge "Output split information for imgdiff when handling large apks"Tianjie Xu2017-09-271-8/+40
|\|
| * Output split information for imgdiff when handling large apksTianjie Xu2017-09-211-8/+40
* | Merge "Fix the dangling pointer when setting up arguments of imgdiff"Tianjie Xu2017-09-171-6/+9
|\|
| * Fix the dangling pointer when setting up arguments of imgdiffTianjie Xu2017-09-131-6/+9
* | Merge "Close cmd_pipe properly after updater test finishes"Tianjie Xu2017-09-121-8/+14
|\|
| * Close cmd_pipe properly after updater test finishesTianjie Xu2017-09-111-8/+14
* | Merge "Improve imgdiff for large zip files"Tianjie Xu2017-09-081-5/+334
|\|
| * Improve imgdiff for large zip filesTianjie Xu2017-09-061-5/+334
* | Merge "Turn on -Wall for recovery modules"Tianjie Xu2017-08-292-11/+4
|\|
| * Turn on -Wall for recovery modulesTianjie Xu2017-08-292-11/+4
* | Merge "Allow comparison against multi serial nums for A/B package" am: 3810046a55 am: e8b02d68e5Tianjie Xu2017-08-231-13/+58
|\|
| * Merge "Allow comparison against multi serial nums for A/B package"Tianjie Xu2017-08-231-13/+58
| |\
| | * Allow comparison against multi serial nums for A/B packageTianjie Xu2017-08-221-13/+58
* | | Merge "Move Image/ImageChunk/PatchChunk declaration into header files" am: b4bc57ed39 am: b127fddf09Tianjie Xu2017-08-191-1/+1
|\| |
| * | Merge "Move Image/ImageChunk/PatchChunk declaration into header files"Tianjie Xu2017-08-191-1/+1
| |\|
| | * Move Image/ImageChunk/PatchChunk declaration into header filesTianjie Xu2017-08-191-1/+1
* | | Merge "tests: Add the missing dependency on libhidlbase." am: 05b2e982ad am: 43df6cfeeeTao Bao2017-08-101-1/+2
|\| |
| * | Merge "tests: Add the missing dependency on libhidlbase."Tao Bao2017-08-101-1/+2
| |\|
| | * tests: Add the missing dependency on libhidlbase.Tao Bao2017-08-101-1/+2
* | | Merge "Add implemention of SortedRangeSet" am: 64cba55fbc am: fbd4b10310Tianjie Xu2017-08-011-0/+47
|\| |
| * | Merge "Add implemention of SortedRangeSet"Tianjie Xu2017-08-011-0/+47
| |\|
| | * Merge "Add implemention of SortedRangeSet"Tianjie Xu2017-08-011-0/+47
| | |\
| | | * Add implemention of SortedRangeSetTianjie Xu2017-08-011-0/+47
* | | | Merge "otautil: Clean up dirCreateHierarchy()." am: 610712101b am: 5507c3d63cTao Bao2017-07-311-21/+11
|\| | |
| * | | Merge "otautil: Clean up dirCreateHierarchy()."Tao Bao2017-07-311-21/+11
| |\| |
| | * | otautil: Clean up dirCreateHierarchy().Tao Bao2017-07-271-21/+11
| | |/
* | | Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 am: 993cec5cc9Tao Bao2017-07-251-32/+0
|\| |
| * | Merge "otautil: Delete dirUnlinkHierarchy()."Tao Bao2017-07-251-32/+0
| |\|
| | * otautil: Delete dirUnlinkHierarchy().Tao Bao2017-07-251-32/+0
* | | Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594c am: dbe9da5331Tao Bao2017-07-241-0/+13
|\| |
| * | Merge "tests: Add a test to cover legacy care_map.txt handling."Tao Bao2017-07-241-0/+13
| |\|
| | * tests: Add a test to cover legacy care_map.txt handling.Tao Bao2017-07-241-0/+13
* | | Merge "Fix a case when brotli writer fails to write last few blocks of data" am: e45c8f0057 am: 80acaab52fTianjie Xu2017-07-221-4/+15
|\| |
| * | Merge "Fix a case when brotli writer fails to write last few blocks of data"Tianjie Xu2017-07-211-4/+15
| |\|
| | * Merge "Fix a case when brotli writer fails to write last few blocks of data"Tianjie Xu2017-07-211-4/+15
| | |\
| | | * Fix a case when brotli writer fails to write last few blocks of dataTianjie Xu2017-07-211-4/+15
* | | | Merge "Fix the android-cloexec-* warnings in bootable/recovery" am: 94a8ea1797 am: 6d8827e0d3Tianjie Xu2017-07-202-3/+3
|\| | |
| * | | Merge "Fix the android-cloexec-* warnings in bootable/recovery"Tianjie Xu2017-07-202-3/+3
| |\| |
| | * | Fix the android-cloexec-* warnings in bootable/recoveryTianjie Xu2017-07-192-3/+3
| | |/
* | | Merge "Add support to decompress brotli compressed new data" am: 918e6ea1b2 am: 43bdf6cad6Tianjie Xu2017-07-112-0/+68
|\| |
| * | Merge "Add support to decompress brotli compressed new data"Tianjie Xu2017-07-112-0/+68
| |\|
| | * Add support to decompress brotli compressed new dataTianjie Xu2017-07-082-0/+68
* | | Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16 am: 8542502f1fTianjie Xu2017-07-071-0/+33
|\| |
| * | Merge "Fix a rare failure for imgdiff when random data equals gzip header"Tianjie Xu2017-07-071-0/+33
| |\|
| | * Fix a rare failure for imgdiff when random data equals gzip headerTianjie Xu2017-07-071-0/+33
* | | Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9 am: af913974a5Tianjie Xu2017-06-231-96/+0
|\| |
| * | Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9Tianjie Xu2017-06-231-96/+0
| |\|
| | * Merge "Remove the obsolete package_extract_dir() test"Tianjie Xu2017-06-231-96/+0
| | |\
| | | * Remove the obsolete package_extract_dir() testTianjie Xu2017-06-231-96/+0
* | | | Merge "update_verifier: Support AVB." am: e248e434ea am: 1f108dae49David Zeuthen2017-06-222-1/+5
|\| | |
| * | | Merge "update_verifier: Support AVB." am: e248e434eaDavid Zeuthen2017-06-222-1/+5
| |\| |
| | * | Merge "update_verifier: Support AVB."Treehugger Robot2017-06-222-1/+5
| | |\ \ | | | |/ | | |/|
| | | * update_verifier: Support AVB.David Zeuthen2017-05-242-1/+5
* | | | Merge "kill package_extract_dir" am: 99e7216907 am: 49f9c969eb am: 66e53f59b9Tianjie Xu2017-06-013-229/+0
|\| | |
| * | | Merge "kill package_extract_dir" am: 99e7216907 am: 49f9c969ebTianjie Xu2017-05-313-229/+0
| |\| |
| | * | kill package_extract_dirTianjie Xu2017-05-243-229/+0
| | |/
* | | Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9d am: 1562f41348Tianjie Xu2017-05-191-0/+39
|\| |
| * | Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9dTianjie Xu2017-05-191-0/+39
| |\|
| | * Print SHA1 of the patch if bsdiff fails with data errorTianjie Xu2017-05-161-0/+39
* | | Merge "Add a binary path param to update_binary_command()." am: 197304aada am: f648b5c9fc am: f49c57643dTao Bao2017-05-091-10/+74
|\| |
| * | Merge "Add a binary path param to update_binary_command()." am: 197304aada am: f648b5c9fcTao Bao2017-05-091-10/+74
| |\|
| | * Add a binary path param to update_binary_command().Tao Bao2017-05-081-10/+74
* | | Merge "fuse_sideload: Change the minimal block size to 4096." am: 4e8e56eaea am: 53b98de866 am: 6bea344d7eTao Bao2017-05-042-2/+18
|\| |
| * | Merge "fuse_sideload: Change the minimal block size to 4096." am: 4e8e56eaea am: 53b98de866Tao Bao2017-05-042-2/+18
| |\|
| | * Merge "fuse_sideload: Change the minimal block size to 4096."Tao Bao2017-05-042-2/+18
| | |\
| | | * fuse_sideload: Change the minimal block size to 4096.Tao Bao2017-05-032-2/+18
* | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c am: 08d9ede8f2 am: b3eeb817abTao Bao2017-05-034-41/+30
|\| | |
| * | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c am: 08d9ede8f2Tao Bao2017-05-034-41/+30
| |\| |
| | * | Move sysMapFile and sysReleaseMap into MemMapping class.Tao Bao2017-05-024-41/+30
| | |/
* | | Merge "Separate libupdate_verifier module and add testcases." am: c99bb23955 am: d8c078d2c6 am: c7410924a3Tao Bao2017-04-272-0/+89
|\| |
| * | Merge "Separate libupdate_verifier module and add testcases." am: c99bb23955 am: d8c078d2c6Tao Bao2017-04-272-0/+89
| |\|
| | * Separate libupdate_verifier module and add testcases.Tao Bao2017-04-272-0/+89
* | | Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1 am: 22b1fa7d61 am: 7ee4b7dd84Tao Bao2017-04-261-14/+0
|\| |
| * | Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1 am: 22b1fa7d61Tao Bao2017-04-261-14/+0
| |\|
| | * applypatch: Remove the obsolete support for "applypatch -s".Tao Bao2017-04-261-14/+0
* | | Merge "Add more tests for verify_package_compatibility()." am: a9dd77fa84 am: 5f85d07e87 am: 54f8988cfeTao Bao2017-04-241-0/+84
|\| |
| * | Merge "Add more tests for verify_package_compatibility()." am: a9dd77fa84 am: 5f85d07e87Tao Bao2017-04-241-0/+84
| |\|
| | * Merge "Add more tests for verify_package_compatibility()."Tao Bao2017-04-241-0/+84
| | |\
| | | * Add more tests for verify_package_compatibility().Tao Bao2017-04-201-0/+84
* | | | Merge "tests: Remove obsolete classes in applypatch_test." am: f17aa960db am: 8a3325dc8a am: f4a8d0bba6Tao Bao2017-04-241-49/+2
|\| | |
| * | | Merge "tests: Remove obsolete classes in applypatch_test." am: f17aa960db am: 8a3325dc8aTao Bao2017-04-241-49/+2
| |\| |
| | * | tests: Remove obsolete classes in applypatch_test.Tao Bao2017-04-211-49/+2
| | |/
| | * Merge "Call libvintf to verify package compatibility."Tao Bao2017-04-201-0/+3
| | |\
| | | * Call libvintf to verify package compatibility.Tao Bao2017-04-201-0/+3
* | | | Call libvintf to verify package compatibility. am: da320ac6abTao Bao2017-04-201-0/+3
|\| | |
| * | | Call libvintf to verify package compatibility.Tao Bao2017-04-201-0/+3
| |\ \ \
| | * | | Call libvintf to verify package compatibility.Tao Bao2017-04-191-0/+3
| | * | | Add tests for update_binary_command().Tao Bao2017-04-192-0/+92
* | | | | Merge "Add tests for read_metadata_from_package()." am: e888d45950 am: c08c055ce0 am: 7b9b77f445Tao Bao2017-04-191-0/+50
|\| | | |
| * | | | Merge "Add tests for read_metadata_from_package()." am: e888d45950 am: c08c055ce0Tao Bao2017-04-191-0/+50
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add tests for read_metadata_from_package().Tao Bao2017-04-191-0/+50
| | | |/ | | |/|
* | | | Merge "Add tests for update_binary_command()." am: 44f61b4ce5 am: 1fc109bdc7 am: d218dca8f9Tao Bao2017-04-192-0/+91
|\| | |
| * | | Merge "Add tests for update_binary_command()." am: 44f61b4ce5 am: 1fc109bdc7Tao Bao2017-04-192-0/+91
| |\| |
| | * | Add tests for update_binary_command().Tao Bao2017-04-182-0/+91
| | * | Verify the package compatibility with libvintf.Tao Bao2017-04-132-1/+59
* | | | Verify the package compatibility with libvintf. am: 62e0bc7586Tao Bao2017-04-132-1/+59
|\| | |
| * | | Verify the package compatibility with libvintf.Tao Bao2017-04-132-1/+59
| |\ \ \ | | | |/ | | |/|
| | * | Verify the package compatibility with libvintf.Tao Bao2017-04-122-1/+59
| | * | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9Tianjie Xu2017-03-291-10/+11
* | | | Merge "Abort the update if there's not enough new data" am: b4b0c49c48 am: bc66528cb9 am: 955c5ebeceTianjie Xu2017-04-101-0/+66
|\| | |
| * | | Merge "Abort the update if there's not enough new data" am: b4b0c49c48 am: bc66528cb9Tianjie Xu2017-04-101-0/+66
| |\ \ \ | | | |/ | | |/|
| | * | Abort the update if there's not enough new dataTianjie Xu2017-04-081-0/+66
* | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8 am: cc630bdde1 am: f25cd871ccTao Bao2017-04-053-49/+4
|\| | |
| * | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8 am: cc630bdde1Tao Bao2017-04-053-49/+4
| |\| |
| | * | tests: Use get_bootloader_message_blk_device() to find /misc.Tao Bao2017-04-053-49/+4
* | | | Merge "Change the internal representation in RangeSet." am: 7ffa8be41d am: 2e12242b7a am: 7f4e5d55f4Tao Bao2017-04-051-6/+34
|\| | |
| * | | Merge "Change the internal representation in RangeSet." am: 7ffa8be41d am: 2e12242b7aTao Bao2017-04-041-6/+34
| |\| |
| | * | Change the internal representation in RangeSet.Tao Bao2017-04-031-6/+34
* | | | Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7 am: 74c4da4c01 am: 3cf1113021Tao Bao2017-03-312-0/+86
|\| | |
| * | | Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7 am: 74c4da4c01Tao Bao2017-03-312-0/+86
| |\| |
| | * | Move parse_range() and range_overlaps() into RangeSet.Tao Bao2017-03-312-0/+86
* | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d am: b648a8781f am: 4d6f904a88Tao Bao2017-03-301-4/+0
|\| | |
| * | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d am: b648a8781fTao Bao2017-03-301-4/+0
| |\| |
| | * | tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES.Tao Bao2017-03-301-4/+0
* | | | Merge "Add test config to minadbd_test" am: df1a585504 am: b8f33fdf5f am: 57bb313b1eDan Shi2017-03-302-0/+33
|\| | |
| * | | Merge "Add test config to minadbd_test" am: df1a585504 am: b8f33fdf5fDan Shi2017-03-302-0/+33
| |\| |
| | * | Merge "Add test config to minadbd_test"Treehugger Robot2017-03-302-0/+33
| | |\ \
| | | * | Add test config to minadbd_testDan Shi2017-03-292-0/+33
* | | | | Fix the bad merge (duplicate tests).Tao Bao2017-03-291-45/+0
* | | | | resolve merge conflicts of 39ef2d7f to oc-dev-plus-aospTao Bao2017-03-291-0/+45
|\| | | |
| * | | | resolve merge conflicts of 39ef2d7f to oc-dev-plus-aospTao Bao2017-03-293-3/+46
| |\| | |
| | * | | Merge "tests: Construct two bad packages at runtime for VerifierTest."Tao Bao2017-03-293-3/+46
| | |\ \ \
| | | * | | tests: Construct two bad packages at runtime for VerifierTest.Tao Bao2017-03-283-3/+46
| | | |/ /
* | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37 am: c6df7d2937 am: 62a4e5ca98Tao Bao2017-03-291-103/+82
|\| | | |
| * | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37 am: c6df7d2937Tao Bao2017-03-291-103/+82
| |\| | |
| | * | | Merge "tests: Add a test for --wipe_ab into UncryptTest."Tao Bao2017-03-291-103/+82
| | |\ \ \
| | | * | | tests: Add a test for --wipe_ab into UncryptTest.Tao Bao2017-03-281-103/+82
| | | |/ /
* | | | | Merge "tests: Construct two bad packages at runtime for VerifierTest."Tao Bao2017-03-283-3/+46
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | tests: Construct two bad packages at runtime for VerifierTest.Tao Bao2017-03-283-3/+46
| | |_|/ | |/| |
* | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9Tianjie Xu2017-03-281-10/+11
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Add the missing sr-Latn into png files and rename the png locale header"Tianjie Xu2017-03-281-10/+11
| |\ \ \
| | * | | Add the missing sr-Latn into png files and rename the png locale headerTianjie Xu2017-03-251-10/+11
* | | | | Merge changes from topic 'sinkfn' am: 34df98ee6d am: 862b7e8523Tao Bao2017-03-281-56/+24
|\| | | |
| * | | | applypatch: Let Apply{BSDiff,Image}Patch accept std::function.Tao Bao2017-03-281-56/+24
* | | | | applypatch: Change the ssize_t length parameters to size_t. am: f7eb760fe7 am: d4d9ef3941Tao Bao2017-03-281-1/+1
|\| | | | | |_|/ / |/| | |
| * | | applypatch: Change the ssize_t length parameters to size_t.Tao Bao2017-03-281-1/+1
| | |/ | |/|
* | | tests: Construct signature-boundary.zip at runtime.Tao Bao2017-03-272-2/+18
* | | Merge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494 am: 351f69e64aTao Bao2017-03-261-124/+0
|\| |
| * | Merge "applypatch: Drop the support for patching non-EMMC targets."Tao Bao2017-03-261-124/+0
| |\ \ | | |/ | |/|
| | * applypatch: Drop the support for patching non-EMMC targets.Tao Bao2017-03-161-124/+0
* | | Merge "updater: Fix the broken case for apply_patch_check()." am: 9f2062657d am: 923d41ccd5Tao Bao2017-03-231-0/+49
|\| |
| * | updater: Fix the broken case for apply_patch_check().Tao Bao2017-03-231-0/+49
* | | Merge "Remove malloc in edify functions" am: 1ea869b0c6 am: 137d85333eTianjie Xu2017-03-232-3/+5
|\| |
| * | Remove malloc in edify functionsTianjie Xu2017-03-222-3/+5
* | | Merge "Refactor asn1_decoder functions into a class." am: ea3d0b923d am: d7846b7303Tao Bao2017-03-221-217/+180
|\| |
| * | Refactor asn1_decoder functions into a class.Tao Bao2017-03-211-217/+180
* | | Merge "verify_file: Add constness to a few addresses." am: 5b2bf90e13 am: 43bd2c8414Tao Bao2017-03-211-14/+14
|\| |
| * | verify_file: Add constness to a few addresses.Tao Bao2017-03-211-14/+14
* | | Merge "Add testcases for load_keys()." am: 110102f37e am: 43f5ad6e90Tao Bao2017-03-201-0/+57
|\| |
| * | Merge "Add testcases for load_keys()."Tao Bao2017-03-201-0/+57
| |\ \
| | * | Add testcases for load_keys().Tao Bao2017-03-181-0/+57
* | | | Merge "Remove the dead #include's in verifier.cpp." am: 64d25024b9 am: b2617e882eTao Bao2017-03-201-1/+0
|\| | |
| * | | Remove the dead #include's in verifier.cpp.Tao Bao2017-03-181-1/+0
| |/ /
| * | Merge "Drop the dependency on 'ui' in verify_file()."Tao Bao2017-03-181-104/+45
| |\ \
| | * | Drop the dependency on 'ui' in verify_file().Tao Bao2017-03-171-104/+45
* | | | Merge "Drop the dependency on 'ui' in verify_file()."Tao Bao2017-03-181-105/+46
|\ \ \ \
| * | | | Drop the dependency on 'ui' in verify_file().Tao Bao2017-03-171-105/+46
* | | | | Merge "Add a test to perform block_image_update" am: 881b08ecd2 am: 5c06706d51Tianjie Xu2017-03-172-6/+123
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Add a test to perform block_image_update"Tianjie Xu2017-03-172-6/+123
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add a test to perform block_image_updateTianjie Xu2017-03-172-6/+123
| | | |/ | | |/|
* | | | Merge "More cleanup to imgdiff & imgpatch" am: 3541934ff5 am: 91f8574061Tianjie Xu2017-03-171-4/+5
|\| | | | |_|/ |/| |
| * | More cleanup to imgdiff & imgpatchTianjie Xu2017-03-161-4/+5
| |/
* | Merge "updater: Remove some obsoleted functions for file-based OTA." am: 342717d148 am: 000f364c19Tao Bao2017-03-141-113/+0
|\|
| * updater: Remove some obsoleted functions for file-based OTA.Tao Bao2017-03-131-113/+0
* | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 7a0dfec771 am: 1a23257214Bowgo Tsai2017-03-101-12/+5
|\|
| * recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIsBowgo Tsai2017-03-101-12/+5
* | Merge "Refractor the code for imgdiff" am: a2e7a07031 am: 68571e27d8Tianjie Xu2017-03-072-0/+57
|\|
| * Merge "Refractor the code for imgdiff"Treehugger Robot2017-03-072-0/+57
| |\
| | * Refractor the code for imgdiffTianjie Xu2017-03-072-0/+57
* | | Merge "Fix an error on bootloadermessager test teardown" am: b694ba8aab am: 536989892cTianjie Xu2017-03-031-2/+4
|\| |
| * | Merge "Fix an error on bootloadermessager test teardown"Tianjie Xu2017-03-031-2/+4
| |\ \
| | * | Fix an error on bootloadermessager test teardownTianjie Xu2017-03-031-2/+4
| | |/
* | | Merge "Recovery Test: add SideloadTest to test FUSE support on target" am: 53feebea4f am: 3d605c54e3Wei Wang2017-03-032-0/+22
|\| |
| * | Recovery Test: add SideloadTest to test FUSE support on targetWei Wang2017-03-032-0/+22
| |/
* | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" am: 0f26468eda am: 5cce91a95aTianjie Xu2017-03-013-3/+111
|\|
| * Skip BootloaderMessageTest, UncryptTest for devices without /miscTianjie Xu2017-03-013-3/+111
* | Merge "Use bspatch from external/bsdiff." am: f9962dbfe2 am: 2c467f6e49 am: 6f06890343Sen Jiang2017-02-161-0/+2
|\|
| * Use bspatch from external/bsdiff.Sen Jiang2017-02-021-0/+2
* | Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1 am: 5b5b8333e0 am: 9518d34c0fAlex Deymo2017-01-261-1/+1
|\|
| * Remove '_static' suffix from libext2* references.Alex Deymo2017-01-241-1/+1
* | Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadb am: 18098b7de3Tianjie Xu2017-01-193-2/+167
|\|
| * Add checkers and tests for empty locale in PNG fileTianjie Xu2017-01-193-2/+167
* | Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1a am: 9e93a79f4cAlex Deymo2017-01-121-1/+1
|\|
| * Remove "_static" suffix from libsparseAlex Deymo2017-01-111-1/+1
* | Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899 am: 9edd655f94Alex Deymo2017-01-121-1/+1
|\|
| * Remove "_static" suffix from libext4_utils.Alex Deymo2017-01-111-1/+1
* | Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 am: 179fc8a82b am: ba0dad8828Tao Bao2017-01-061-0/+50
|\|
| * tests: Add testcase for show_progress() and set_progress().Tao Bao2017-01-061-0/+50
* | Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b am: 4d37763c69 am: e513c0f2acTao Bao2017-01-041-0/+80
|\|
| * Merge "imgdiff: Fix an edge case that leads to infinite loop."Tao Bao2017-01-041-0/+80
| |\
| | * imgdiff: Fix an edge case that leads to infinite loop.Tao Bao2016-12-281-0/+80
* | | Merge "recovery: Fix the broken UI text." am: 56fc8fa376 am: 1227f6b841 am: 3806993e25Tao Bao2017-01-041-32/+38
|\| |
| * | recovery: Fix the broken UI text.Tao Bao2017-01-041-32/+38
| |/
* | Merge "Add tests for imgdiff." am: 344c8eb453 am: 4fe022c4ed am: 4e2471d6ddTao Bao2016-12-282-0/+477
|\|
| * Merge "Add tests for imgdiff."Tao Bao2016-12-282-0/+477
| |\
| | * Add tests for imgdiff.Tao Bao2016-12-202-0/+477
* | | Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 am: 1b83e7e28d am: 7f0f49dd2bTao Bao2016-12-232-0/+151
|\| |
| * | tests: Add test coverage for DirUtil.Tao Bao2016-12-222-0/+151
* | | Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e am: baf422229d am: ef801f9a62Tao Bao2016-12-222-8/+16
|\| |
| * | Merge "tests: Replace the O_RDONLY in access(2)."Tao Bao2016-12-222-8/+16
| |\ \
| | * | tests: Replace the O_RDONLY in access(2).Tao Bao2016-12-222-8/+16
| | |/
* | | Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579e am: 830ab1c482Tao Bao2016-12-222-1/+193
|\| |
| * | tests: Add testcase for ZipUtil.Tao Bao2016-12-222-1/+193
| |/
* / Add a checker for signature boundary in verifierTianjie Xu2016-12-172-1/+2
|/
* Add update_bootloader_message() to fix two-step OTAs.Tao Bao2016-12-151-0/+26
* Merge "tests: Add tests for bootloader_message."Tao Bao2016-12-152-0/+140
|\
| * tests: Add tests for bootloader_message.Tao Bao2016-12-152-0/+140
* | Merge "Add a stub recovery UI."Sen Jiang2016-12-141-1/+1
|\ \ | |/ |/|
| * Add a stub recovery UI.Sen Jiang2016-12-131-1/+1
* | Add tests for setup-bcb and clear-bcb via uncrypt.Tao Bao2016-12-142-0/+176
|/
* tests: Add testcases for EMMC targets.Tao Bao2016-11-221-31/+144
* updater: Refactor set_stage() and get_stage() functions.Tao Bao2016-11-182-0/+61
* updater: Add testcase for package_extract_dir().Tao Bao2016-11-182-0/+98
* updater: Add "write_value()" function.Tao Bao2016-11-171-0/+33
* updater: Fix the wrong return value for package_extract_file().Tao Bao2016-11-154-20/+86
* updater: Add more testcase for symlink().Tao Bao2016-11-091-6/+39
* Merge "Make make_parent() to take const argument"Treehugger Robot2016-11-081-0/+22
|\
| * Make make_parent() to take const argumentTianjie Xu2016-11-081-0/+22
* | Move recovery_test.cpp out of unit testTianjie Xu2016-11-083-92/+99
* | otautil: Clean up SysUtil.cpp.Tao Bao2016-11-072-6/+147
|/
* tests: Fix unit/zip_test.cpp.Tao Bao2016-11-041-59/+50
* updater: Add a testcase for RenameFn().Tao Bao2016-11-041-0/+29
* updater: Fix a bug in DeleteFn().Tao Bao2016-11-041-0/+33
* updater: Fix an off-by-1 bug in file_getprop().Tao Bao2016-11-031-0/+50
* tests: Set up testdata path for continuous native tests.Tao Bao2016-11-034-31/+23
* applypatch: Add testcases for applypatch executable.Tao Bao2016-11-017-257/+324
* applypatch: Switch the parameter of Value** to std::vector.Tao Bao2016-10-291-126/+138
* tests: Generate testdata for 2nd arch.Tao Bao2016-10-261-1/+12
* Add a unit test for applypatch_checkTianjie Xu2016-10-191-0/+5
* Replace minzip with libziparchiveTianjie Xu2016-10-185-3/+104
* Change StringValue to use std::stringTianjie Xu2016-10-153-81/+67
* edify: Some clean-ups to libedify.Tao Bao2016-10-132-6/+23
* updater: Kill the duplicate PrintSha1() in install.cpp.Tao Bao2016-10-111-7/+36
* Refactor libupdater into a seperate module.Tao Bao2016-10-112-6/+93
* edify: Move State.script and State.errmsg to std::string.Tao Bao2016-10-041-6/+1
* Merge "recovery: drop log/logger.h"Mark Salyzyn2016-10-041-1/+0
|\
| * recovery: drop log/logger.hMark Salyzyn2016-10-041-1/+0
* | edify: Move the testcases to gtest.Tao Bao2016-10-042-0/+158
|/
* Turn on -Werror for recoveryTianjie Xu2016-09-301-1/+2
* Switch recovery to libbase loggingTianjie Xu2016-09-011-2/+3
* Fix clang-tidy warnings in bootable/recovery.Chih-Hung Hsieh2016-08-261-1/+1
* Merge "Fix references to libcrypto_utils_static."Josh Gao2016-08-081-2/+2
|\
| * Fix references to libcrypto_utils_static.Josh Gao2016-08-061-2/+2
* | Merge \"Clean up verifier testcases.\"Tao Bao2016-08-0121-41/+30
|\|
| * Clean up verifier testcases.Tao Bao2016-08-0121-41/+30
* | tests: Remove obsolete MTD support.Tao Bao2016-06-161-1/+0
* | resolve merge conflicts of 5823dd4 to nyc-dev-plus-aospTianjie Xu2016-05-021-0/+1
|\ \
| * | Add ability to show "installing security update"Tianjie Xu2016-04-291-0/+1
* | | Merge "Fix matches_locale function" into nyc-devTianjie Xu2016-04-212-1/+34
|\| |
| * | Fix matches_locale functionTianjie Xu2016-04-202-1/+34
| * | Use BoringSSL instead of mincrypt to speed up package verification.Elliott Hughes2016-04-145-109/+26
| * | recovery: use __android_log_pmsg_file_write for log filesMark Salyzyn2016-03-312-0/+94
* | | resolve merge conflicts of 2bf95ac to nyc-dev-plus-aospElliott Hughes2016-04-135-109/+27
|\ \ \ | | |/ | |/|
| * | Convert recovery to use BoringSSL instead of mincrypt.Mattias Nissler2016-04-065-109/+28
* | | Merge "recovery: use __android_log_pmsg_file_write for log files" am: 75da771Mark Salyzyn2016-03-312-0/+94
|\| |
| * | recovery: use __android_log_pmsg_file_write for log filesMark Salyzyn2016-03-282-0/+94
* | | Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-devJed Estep2016-03-127-7/+428
|\ \ \ | |/ / |/| / | |/
| * Port applypatch.sh tests to recovery_component_testsJed Estep2016-03-127-8/+429
| * Fix verifier test base testdata directory after merge conflictJed Estep2016-02-221-1/+1
* | Merge "verifier_test: Suppress the unused parameter warnings."Tao Bao2016-02-091-8/+9
|\ \
| * | verifier_test: Suppress the unused parameter warnings.Tao Bao2016-02-051-8/+9
| |/
* / Change on-device directory for recovery test dataJed Estep2016-02-052-2/+2
|/
* Refactor existing tests to use gtestJed Estep2016-02-0422-3/+413
* recovery: Switch to clangTao Bao2015-06-031-0/+1
* More test makefile cleanup.Dan Albert2014-10-171-24/+23
* Add support for ECDSA signaturesKenny Root2013-10-102-0/+264
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 05:40:28 +0100