| Commit message (Expand) | Author | Age | Files | Lines |
* | release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release-4133428 snap-temp-L95800000077479875 | android-build-team Robot | 2017-06-25 | 10 | -204/+125 |
|\ |
|
| * | Merge "Restructure vr_ui" am: 20d40ce53a am: 674851dc86 am: 799cd0bb5d | Luke Song | 2017-06-24 | 0 | -0/+0 |
| |\ |
|
| | * | Merge "Restructure vr_ui" am: 20d40ce53a am: 674851dc86 | Luke Song | 2017-06-24 | 5 | -32/+13 |
| | |\ |
|
| | | * | Merge "Restructure vr_ui" am: 20d40ce53a | Luke Song | 2017-06-24 | 5 | -32/+13 |
| | | |\ |
|
| | | | * | Merge "Restructure vr_ui" | Luke Song | 2017-06-24 | 5 | -32/+13 |
| | | | |\ |
|
| | | | | * | Merge "Restructure vr_ui" | Treehugger Robot | 2017-06-24 | 5 | -32/+13 |
| | | | | |\ |
|
| | | | | | * | Restructure vr_ui | Luke Song | 2017-06-24 | 5 | -32/+13 |
| | | | | |/ |
|
| * | | | | | Merge "Restructure vr_ui" | Luke Song | 2017-06-24 | 5 | -32/+13 |
| |\ \ \ \ \ |
|
| | * | | | | | Restructure vr_ui | Luke Song | 2017-06-23 | 5 | -32/+13 |
| * | | | | | | Use Makefile variables to specify margin settings. am: 855eaffff6 -s ours | Tao Bao | 2017-06-24 | 0 | -0/+0 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Use Makefile variables to specify margin settings. | Tao Bao | 2017-06-24 | 0 | -0/+0 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Use Makefile variables to specify margin settings. | Tao Bao | 2017-06-23 | 3 | -13/+25 |
| * | | | | | | | screen_ui: Allow setting screen margin space. am: 8f7547edfa -s ours | Tao Bao | 2017-06-24 | 0 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | screen_ui: Allow setting screen margin space. | Tao Bao | 2017-06-24 | 0 | -0/+0 |
| | |\| | | | | |
|
| | | * | | | | | screen_ui: Allow setting screen margin space. | Tao Bao | 2017-06-23 | 2 | -70/+77 |
| * | | | | | | | Merge changes Icb6f7466,Ibf6238c9 am: eef231567c am: d1fa3c2380 am: 2eb2c0b276 | Tao Bao | 2017-06-24 | 0 | -0/+0 |
| |\| | | | | |
| | |_|/ / / /
| |/| | | | | |
|
| | * | | | | | Merge changes Icb6f7466,Ibf6238c9 am: eef231567c am: d1fa3c2380 | Tao Bao | 2017-06-24 | 3 | -71/+90 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Merge changes Icb6f7466,Ibf6238c9 am: eef231567c | Tao Bao | 2017-06-23 | 3 | -71/+90 |
| | | |\ \ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | * | | | Merge changes Icb6f7466,Ibf6238c9 | Tao Bao | 2017-06-23 | 3 | -71/+90 |
| | | | |\ \ \
| | | | | | |/
| | | | | |/| |
|
| | | | | * | | Merge changes Icb6f7466,Ibf6238c9 | Tao Bao | 2017-06-23 | 3 | -71/+90 |
| | | | | |\ \ |
|
| | | | | | * | | Use Makefile variables to specify margin settings. | Tao Bao | 2017-06-23 | 3 | -13/+25 |
| | | | | | * | | screen_ui: Allow setting screen margin space. | Tao Bao | 2017-06-21 | 2 | -71/+78 |
| * | | | | | | | Merge changes from topic 'recovery_ui_taimen' | Tao Bao | 2017-06-23 | 3 | -71/+90 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Use Makefile variables to specify margin settings. | Tao Bao | 2017-06-22 | 3 | -13/+25 |
| | * | | | | | | | screen_ui: Allow setting screen margin space. | Tao Bao | 2017-06-20 | 2 | -71/+78 |
| * | | | | | | | | Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9 am: af913974a5 am: e002d96194 | Tianjie Xu | 2017-06-23 | 1 | -96/+0 |
| |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9 am: af913974a5 | Tianjie Xu | 2017-06-23 | 1 | -96/+0 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9 | Tianjie Xu | 2017-06-23 | 1 | -96/+0 |
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "Remove the obsolete package_extract_dir() test" | Tianjie Xu | 2017-06-23 | 1 | -96/+0 |
| | | | |\ \ \ \ \
| | | | | | |/ / /
| | | | | |/| | | |
|
| | | | | * | | | | Merge "Remove the obsolete package_extract_dir() test" | Tianjie Xu | 2017-06-23 | 1 | -96/+0 |
| | | | | |\ \ \ \ |
|
| | | | | | * | | | | Remove the obsolete package_extract_dir() test | Tianjie Xu | 2017-06-23 | 1 | -96/+0 |
| | | | | | | |/ /
| | | | | | |/| | |
|
| * | | | | | | | | update_verifier: Support AVB. am: 336cbce252 -s ours | David Zeuthen | 2017-06-23 | 0 | -0/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | update_verifier: Support AVB. | David Zeuthen | 2017-06-23 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \
| | | | |_|_|_|_|/
| | | |/| | | | | |
|
| | | * | | | | | | update_verifier: Support AVB. | David Zeuthen | 2017-06-23 | 4 | -7/+24 |
| * | | | | | | | | Merge "update_verifier: Support AVB." am: e248e434ea am: 1f108dae49 am: b0c38f1cce | David Zeuthen | 2017-06-22 | 4 | -7/+24 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "update_verifier: Support AVB." am: e248e434ea am: 1f108dae49 | David Zeuthen | 2017-06-22 | 4 | -7/+24 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "update_verifier: Support AVB." am: e248e434ea | David Zeuthen | 2017-06-22 | 4 | -7/+24 |
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "update_verifier: Support AVB." | David Zeuthen | 2017-06-22 | 4 | -7/+24 |
| | | | |\ \ \ \ \
| | | | | | |/ / /
| | | | | |/| | | |
|
| | | | | * | | | | Merge "update_verifier: Support AVB." | Treehugger Robot | 2017-06-22 | 4 | -7/+24 |
| | | | | |\ \ \ \
| | | | | | |_|/ /
| | | | | |/| | | |
|
| | | | | | * | | | update_verifier: Support AVB. | David Zeuthen | 2017-05-24 | 4 | -7/+24 |
* | | | | | | | | | release-request-f3bcfb00-8080-4b95-b497-7457f544b4f6-for-git_oc-mr1-release-4116097 snap-temp-L44400000075746008 | android-build-team Robot | 2017-06-20 | 3 | -11/+86 |
|\| | | | | | | | |
|
| * | | | | | | | | recovery: replace make_ext4 with e2fsprogs | Jin Qian | 2017-06-19 | 3 | -11/+86 |
| | |_|_|_|_|_|/
| |/| | | | | | |
|
* | | | | | | | | release-request-c9e3b153-009d-4386-b83e-337752602795-for-git_oc-mr1-release-4111654 snap-temp-L22900000075285650 | android-build-team Robot | 2017-06-18 | 9 | -17/+153 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Introduce VR recovery ui" am: 5efe2bca22 am: 850e00951a am: 8daabacce5 | Luke Song | 2017-06-17 | 0 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Introduce VR recovery ui" am: 5efe2bca22 am: 850e00951a | Luke Song | 2017-06-17 | 6 | -8/+144 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Introduce VR recovery ui" am: 5efe2bca22 | Luke Song | 2017-06-17 | 6 | -8/+144 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Introduce VR recovery ui" | Luke Song | 2017-06-17 | 6 | -8/+144 |
| | | | |\| | | |
|
| | | | | * | | | Merge "Introduce VR recovery ui" | Treehugger Robot | 2017-06-17 | 6 | -8/+144 |
| | | | | |\ \ \ |
|
| | | | | | * | | | Introduce VR recovery ui | Luke Song | 2017-06-17 | 6 | -8/+144 |
| | | | | |/ / / |
|
| * | | | | | | | Merge "Introduce VR recovery ui" | Luke Song | 2017-06-16 | 6 | -8/+144 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Introduce VR recovery ui | Luke Song | 2017-06-15 | 6 | -8/+144 |
| * | | | | | | | | Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d am: 9f20e861b6 am: 80eb02dcbf | Chih-hung Hsieh | 2017-06-16 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d am: 9f20e861b6 | Chih-hung Hsieh | 2017-06-16 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d | Chih-hung Hsieh | 2017-06-16 | 1 | -0/+3 |
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "Add OWNERS in bootable/recovery" | Chih-hung Hsieh | 2017-06-16 | 1 | -0/+3 |
| | | | |\ \ \ \ \
| | | | | | |/ / /
| | | | | |/| | | |
|
| | | | | * | | | | Merge "Add OWNERS in bootable/recovery" | Chih-hung Hsieh | 2017-06-16 | 1 | -0/+3 |
| | | | | |\ \ \ \ |
|
| | | | | | * | | | | Add OWNERS in bootable/recovery | Chih-Hung Hsieh | 2017-06-15 | 1 | -0/+3 |
| * | | | | | | | | | Merge "Fix "No file_contexts" warning am: e35926e1af am: 3445b94c89" into oc-dr1-dev-plus-aosp | Jeff Vander Stoep | 2017-06-16 | 0 | -0/+0 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Fix "No file_contexts" warning am: e35926e1af am: 3445b94c89" into oc-dr1-dev-plus-aosp | Android Build Merger (Role) | 2017-06-16 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ | Fix "No file_contexts" warning am: e35926e1af | Jeff Vander Stoep | 2017-06-16 | 2 | -9/+6 |
| | | |\ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|/
| | | | |/| | | | | | |
|
| | | | * | | | | | | | Fix "No file_contexts" warning | Jeff Vander Stoep | 2017-06-16 | 2 | -9/+6 |
| | | | |\ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Fix "No file_contexts" warning am: e35926e1af am: eba11fa574 | Jeff Vander Stoep | 2017-06-16 | 0 | -0/+0 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | Fix "No file_contexts" warning am: e35926e1af | Jeff Vander Stoep | 2017-06-16 | 2 | -9/+6 |
| | |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / /
| | |/| | | / / / / / /
| | | | |_|/ / / / / /
| | | |/| | | | | | | |
|
| | | * | | | | | | | | Fix "No file_contexts" warning | Jeff Vander Stoep | 2017-06-16 | 2 | -9/+6 |
| | | |\ \ \ \ \ \ \ \
| | | | | |/ / / / / /
| | | | |/| | | | | | |
|
| | | | * | | | | | | | Fix "No file_contexts" warning | Jeff Vander Stoep | 2017-06-15 | 2 | -9/+6 |
| * | | | | | | | | | | Fix "No file_contexts" warning | Jeff Vander Stoep | 2017-06-15 | 2 | -9/+6 |
| | |_|_|_|_|_|_|/ /
| |/| | | | | | | | |
|
* | | | | | | | | | | release-request-46bf7ca6-57e7-44b8-8edc-ea8830c1cb3b-for-git_oc-mr1-release-4090244 snap-temp-L07700000073092334 | android-build-team Robot | 2017-06-11 | 1 | -3/+7 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87 am: efa40b4827 am: 54138462b4 | Tianjie Xu | 2017-06-09 | 1 | -3/+7 |
| |\| | | | | | | |
| | |_|_|/ / / / /
| |/| | | | | | | |
|
| | * | | | | | | | Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87 am: efa40b4827 | Tianjie Xu | 2017-06-09 | 1 | -3/+7 |
| |/| | | | | | |
| | |/ / / / / / |
|
| | * | | | | | | Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87 | Tianjie Xu | 2017-06-09 | 1 | -3/+7 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge "Fix a race condition for temperature_logger" | Tianjie Xu | 2017-06-09 | 1 | -3/+7 |
| | | |\ \ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | * | | | | Merge "Fix a race condition for temperature_logger" | Tianjie Xu | 2017-06-09 | 1 | -3/+7 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | Fix a race condition for temperature_logger | Tianjie Xu | 2017-06-08 | 1 | -3/+7 |
| | | | |/ / / |
|
* | | | | | | | release-request-fad05353-cc19-4c26-af2f-d5c8a574970e-for-git_oc-mr1-release-4057695 snap-temp-L92600000069427650 | android-build-team Robot | 2017-06-01 | 7 | -439/+0 |
|\| | | | | | |
|
| * | | | | | | Merge "kill package_extract_dir" am: 99e7216907 am: 49f9c969eb am: 66e53f59b9 | Tianjie Xu | 2017-06-01 | 7 | -439/+0 |
| |\| | | | | |
|
| | * | | | | | Merge "kill package_extract_dir" am: 99e7216907 am: 49f9c969eb | Tianjie Xu | 2017-05-31 | 7 | -439/+0 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Merge "kill package_extract_dir" am: 99e7216907 | Tianjie Xu | 2017-05-31 | 7 | -439/+0 |
| | | |\| | | | |
|
| | | | * | | | | Merge "kill package_extract_dir" | Tianjie Xu | 2017-05-31 | 7 | -439/+0 |
| | | | |\| | | |
|
| | | | | * | | | Merge "kill package_extract_dir" | Tianjie Xu | 2017-05-31 | 7 | -439/+0 |
| | | | | |\ \ \ |
|
| | | | | | * | | | kill package_extract_dir | Tianjie Xu | 2017-05-24 | 7 | -439/+0 |
| | | | | | | |/
| | | | | | |/| |
|
* | | | | | | | | release-request-80d7cd88-53c4-4e65-952a-f34bc86a0841-for-git_oc-mr1-release-4050000 snap-temp-L22200000068540971 | android-build-team Robot | 2017-05-28 | 1 | -58/+86 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af am: 0f8e67088a am: 4a2cfffd33 | Tianjie Xu | 2017-05-27 | 1 | -58/+86 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af am: 0f8e67088a | Tianjie Xu | 2017-05-27 | 1 | -58/+86 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af | Tianjie Xu | 2017-05-27 | 1 | -58/+86 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Implement a custom deflate sink function for bspatch" | Tianjie Xu | 2017-05-27 | 1 | -58/+86 |
| | | | |\| | | |
|
| | | | | * | | | Merge "Implement a custom deflate sink function for bspatch" | Tianjie Xu | 2017-05-27 | 1 | -58/+86 |
| | | | | |\ \ \ |
|
| | | | | | * | | | Implement a custom deflate sink function for bspatch | Tianjie Xu | 2017-05-26 | 1 | -58/+86 |
| | | | | |/ / / |
|
* | | | | | | | | release-request-e81235f1-b2b4-4de1-b974-255760176f06-for-git_oc-mr1-release-4040405 snap-temp-L68200000067456736 | android-build-team Robot | 2017-05-24 | 4 | -4/+12 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 am: 66f02b4e71 am: aef046255a | Tianjie Xu | 2017-05-24 | 4 | -4/+12 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 am: 66f02b4e71 | Tianjie Xu | 2017-05-24 | 4 | -4/+12 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 | Tianjie Xu | 2017-05-24 | 4 | -4/+12 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" | Tianjie Xu | 2017-05-24 | 4 | -4/+12 |
| | | | |\| | | |
|
| | | | | * | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" | Tianjie Xu | 2017-05-24 | 4 | -4/+12 |
| | | | | |\ \ \
| | | | | | |/ /
| | | | | |/| | |
|
| | | | | | * | | Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails | Tianjie Xu | 2017-05-24 | 4 | -4/+12 |
| | | | | |/ / |
|
* | | | | | | | release-request-91ef8626-1af7-4595-b2bd-2d85ee97e99f-for-git_oc-mr1-release-4029936 snap-temp-L27200000066301195 | android-build-team Robot | 2017-05-21 | 8 | -48/+98 |
|\| | | | | | |
|
| * | | | | | | Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9d am: 1562f41348 | Tianjie Xu | 2017-05-19 | 4 | -22/+71 |
| |\| | | | | |
|
| | * | | | | | Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9d | Tianjie Xu | 2017-05-19 | 4 | -22/+71 |
| | |\| | | | |
|
| | | * | | | | Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 | Tianjie Xu | 2017-05-19 | 4 | -22/+71 |
| | | |\| | | |
|
| | | | * | | | Merge "Print SHA1 of the patch if bsdiff fails with data error" | Tianjie Xu | 2017-05-19 | 4 | -22/+71 |
| | | | |\| | |
|
| | | | | * | | Merge "Print SHA1 of the patch if bsdiff fails with data error" | Tianjie Xu | 2017-05-19 | 4 | -22/+71 |
| | | | | |\ \ |
|
| | | | | | * | | Print SHA1 of the patch if bsdiff fails with data error | Tianjie Xu | 2017-05-16 | 4 | -22/+71 |
| * | | | | | | | Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 am: 8226fd8926 am: 01bcf118d5 | Tom Cherry | 2017-05-18 | 4 | -26/+27 |
| |\| | | | | | |
|
| | * | | | | | | Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 am: 8226fd8926 | Tom Cherry | 2017-05-18 | 4 | -26/+27 |
| | |\| | | | | |
|
| | | * | | | | | Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 | Tom Cherry | 2017-05-18 | 4 | -26/+27 |
| | | |\| | | | |
|
| | | | * | | | | Merge "libbootloader_message: convert to Android.bp" | Tom Cherry | 2017-05-18 | 4 | -26/+27 |
| | | | |\| | | |
|
| | | | | * | | | Merge "libbootloader_message: convert to Android.bp" | Tom Cherry | 2017-05-18 | 4 | -26/+27 |
| | | | | |\ \ \ |
|
| | | | | | * | | | libbootloader_message: convert to Android.bp | Tom Cherry | 2017-05-17 | 4 | -26/+27 |
| * | | | | | | | | Fix the input parameter for "set_retry_bootloader_message" am: 539b08cfcf | Tianjie Xu | 2017-05-18 | 0 | -0/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Fix the input parameter for "set_retry_bootloader_message" | Tianjie Xu | 2017-05-18 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \
| | | | |_|_|_|_|/
| | | |/| | | | | |
|
| | | * | | | | | | Fix the input parameter for "set_retry_bootloader_message" | Tianjie Xu | 2017-05-17 | 1 | -13/+13 |
* | | | | | | | | | release-request-0520ccd3-e696-4d2d-993b-af952b2dd6bd-for-git_oc-mr1-release-4022446 snap-temp-L69600000065417142 | android-build-team Robot | 2017-05-18 | 1 | -13/+13 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76 am: 1d6f88675b am: f1546892e1 | Tianjie Xu | 2017-05-17 | 1 | -13/+13 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76 am: 1d6f88675b | Tianjie Xu | 2017-05-17 | 1 | -13/+13 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76 | Tianjie Xu | 2017-05-17 | 1 | -13/+13 |
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "Fix the input parameter for "set_retry_bootloader_message"" | Tianjie Xu | 2017-05-17 | 1 | -13/+13 |
| | | | |\ \ \ \ \
| | | | | | |/ / /
| | | | | |/| | | |
|
| | | | | * | | | | Merge "Fix the input parameter for "set_retry_bootloader_message"" | Tianjie Xu | 2017-05-17 | 1 | -13/+13 |
| | | | | |\ \ \ \
| | | | | | |_|/ /
| | | | | |/| | | |
|
| | | | | | * | | | Fix the input parameter for "set_retry_bootloader_message" | Tianjie Xu | 2017-05-17 | 1 | -13/+13 |
| | | | | |/ / / |
|
* | | | | | | | | release-request-655284b0-7f0b-48b5-b01d-27f48a99f2c0-for-git_oc-mr1-release-4017105 snap-temp-L82600000064873863 | android-build-team Robot | 2017-05-17 | 25 | -556/+632 |
|\| | | | | | | |
|
| * | | | | | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b am: 843ca31c4c am: 9539cdb3c0 | Tao Bao | 2017-05-13 | 1 | -3/+5 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b am: 843ca31c4c | Tao Bao | 2017-05-12 | 1 | -3/+5 |
| | |\| | | | | |
|
| | | * | | | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b | Tao Bao | 2017-05-12 | 1 | -3/+5 |
| | | |\| | | | |
|
| | | | * | | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." | Tao Bao | 2017-05-12 | 1 | -3/+5 |
| | | | |\| | | |
|
| | | | | * | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." | Tao Bao | 2017-05-12 | 1 | -3/+5 |
| | | | | |\ \ \
| | | | | | |_|/
| | | | | |/| | |
|
| | | | | | * | | updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0. | Tao Bao | 2017-05-12 | 1 | -3/+5 |
| | | | | |/ / |
|
| * | | | | | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." am: 7cb1b79673 am: 7ca2e734fc am: e89cbd675c | Tao Bao | 2017-05-12 | 1 | -7/+16 |
| |\| | | | | |
|
| | * | | | | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." am: 7cb1b79673 am: 7ca2e734fc | Tao Bao | 2017-05-12 | 1 | -7/+16 |
| | |\| | | | |
|
| | | * | | | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." am: 7cb1b79673 | Tao Bao | 2017-05-12 | 1 | -7/+16 |
| | | |\| | | |
|
| | | | * | | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." | Tao Bao | 2017-05-12 | 1 | -7/+16 |
| | | | |\| | |
|
| | | | | * | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." | Tao Bao | 2017-05-12 | 1 | -7/+16 |
| | | | | |\ \ |
|
| | | | | | * | | Don't write to /sys/class/android_usb/android0/enable with configfs. | Tao Bao | 2017-05-11 | 1 | -7/+16 |
| | | | | |/ / |
|
| * | | | | | | Merge "recovery: Skip "/" in setup_install_mounts()." am: d7446c8eed am: b0626221a1 am: 8c7c38ca7f | Tao Bao | 2017-05-11 | 1 | -19/+22 |
| |\| | | | | |
|
| | * | | | | | Merge "recovery: Skip "/" in setup_install_mounts()." am: d7446c8eed am: b0626221a1 | Tao Bao | 2017-05-11 | 1 | -19/+22 |
| | |\| | | | |
|
| | | * | | | | Merge "recovery: Skip "/" in setup_install_mounts()." am: d7446c8eed | Tao Bao | 2017-05-11 | 1 | -19/+22 |
| | | |\| | | |
|
| | | | * | | | Merge "recovery: Skip "/" in setup_install_mounts()." | Tao Bao | 2017-05-11 | 1 | -19/+22 |
| | | | |\| | |
|
| | | | | * | | Merge "recovery: Skip "/" in setup_install_mounts()." | Tao Bao | 2017-05-11 | 1 | -19/+22 |
| | | | | |\ \ |
|
| | | | | | * | | recovery: Skip "/" in setup_install_mounts(). | Tao Bao | 2017-05-10 | 1 | -19/+22 |
| | | | | |/ / |
|
| * | | | | | | Merge "otautil: Android.mk -> Android.bp" am: 106ca8e93f am: 46938bcf0c am: 09690020fb | Steven Moreland | 2017-05-10 | 4 | -34/+37 |
| |\| | | | | |
|
| | * | | | | | Merge "otautil: Android.mk -> Android.bp" am: 106ca8e93f am: 46938bcf0c | Steven Moreland | 2017-05-10 | 4 | -34/+37 |
| | |\| | | | |
|
| | | * | | | | Merge "otautil: Android.mk -> Android.bp" am: 106ca8e93f | Steven Moreland | 2017-05-10 | 4 | -34/+37 |
| | | |\| | | |
|
| | | | * | | | Merge "otautil: Android.mk -> Android.bp" | Steven Moreland | 2017-05-10 | 4 | -34/+37 |
| | | | |\| | |
|
| | | | | * | | Merge "otautil: Android.mk -> Android.bp" | Treehugger Robot | 2017-05-10 | 4 | -34/+37 |
| | | | | |\ \ |
|
| | | | | | * | | otautil: Android.mk -> Android.bp | Steven Moreland | 2017-05-10 | 4 | -34/+37 |
| * | | | | | | | Merge "recovery: Use libverifier instead of rebuilding the sources." am: c008485643 am: 1dc25e3e0a am: 1f7e8f6ab6 | Tao Bao | 2017-05-09 | 1 | -3/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "recovery: Use libverifier instead of rebuilding the sources." am: c008485643 am: 1dc25e3e0a | Tao Bao | 2017-05-09 | 1 | -3/+1 |
| | |\| | | | | |
|
| | | * | | | | | Merge "recovery: Use libverifier instead of rebuilding the sources." am: c008485643 | Tao Bao | 2017-05-09 | 1 | -3/+1 |
| | | |\| | | | |
|
| | | | * | | | | Merge "recovery: Use libverifier instead of rebuilding the sources." | Tao Bao | 2017-05-09 | 1 | -3/+1 |
| | | | |\| | | |
|
| | | | | * | | | Merge "recovery: Use libverifier instead of rebuilding the sources." | Tao Bao | 2017-05-09 | 1 | -3/+1 |
| | | | | |\ \ \ |
|
| | | | | | * | | | recovery: Use libverifier instead of rebuilding the sources. | Tao Bao | 2017-05-08 | 1 | -3/+1 |
| | | | | | |/ / |
|
| * | | | | | | | Merge "Add a binary path param to update_binary_command()." am: 197304aada am: f648b5c9fc am: f49c57643d | Tao Bao | 2017-05-09 | 3 | -33/+103 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Add a binary path param to update_binary_command()." am: 197304aada am: f648b5c9fc | Tao Bao | 2017-05-09 | 3 | -33/+103 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Add a binary path param to update_binary_command()." am: 197304aada | Tao Bao | 2017-05-09 | 3 | -33/+103 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Add a binary path param to update_binary_command()." | Tao Bao | 2017-05-09 | 3 | -33/+103 |
| | | | |\| | | |
|
| | | | | * | | | Merge "Add a binary path param to update_binary_command()." | Tao Bao | 2017-05-09 | 3 | -33/+103 |
| | | | | |\ \ \
| | | | | | |/ /
| | | | | |/| | |
|
| | | | | | * | | Add a binary path param to update_binary_command(). | Tao Bao | 2017-05-08 | 3 | -33/+103 |
| | | | | |/ / |
|
| * | | | | | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abca am: d6f506e783 am: 5975ee6a46 | Jin Qian | 2017-05-05 | 1 | -3/+3 |
| |\| | | | | |
|
| | * | | | | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abca am: d6f506e783 | Jin Qian | 2017-05-05 | 1 | -3/+3 |
| | |\| | | | |
|
| | | * | | | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abca | Jin Qian | 2017-05-05 | 1 | -3/+3 |
| | | |\| | | |
|
| | | | * | | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" | Jin Qian | 2017-05-05 | 1 | -3/+3 |
| | | | |\| | |
|
| | | | | * | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" | Treehugger Robot | 2017-05-05 | 1 | -3/+3 |
| | | | | |\ \ |
|
| | | | | | * | | recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0 | Jin Qian | 2017-05-05 | 1 | -3/+3 |
| * | | | | | | | Merge "Update the comment for obsolete symlink handling ." am: a24f9d7cc7 am: e452c25620 am: 4ab07dfcd3 | Tianjie Xu | 2017-05-04 | 1 | -1/+0 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Update the comment for obsolete symlink handling ." am: a24f9d7cc7 am: e452c25620 | Tianjie Xu | 2017-05-04 | 1 | -1/+0 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Update the comment for obsolete symlink handling ." am: a24f9d7cc7 | Tianjie Xu | 2017-05-04 | 1 | -1/+0 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Update the comment for obsolete symlink handling ." | Tianjie Xu | 2017-05-04 | 1 | -1/+0 |
| | | | |\| | | |
|
| | | | | * | | | Merge "Update the comment for obsolete symlink handling ." | Treehugger Robot | 2017-05-04 | 1 | -1/+0 |
| | | | | |\ \ \ |
|
| | | | | | * | | | Update the comment for obsolete symlink handling . | Tianjie Xu | 2017-05-04 | 1 | -1/+0 |
| | | | | | |/ / |
|
| * | | | | | | | Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c42198581 am: 1d33e0815d am: a51e44cef7 | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c42198581 am: 1d33e0815d | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c42198581 | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Revert "Remove EXPAND/STRINGIFY macros."" | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| | | | |\| | | |
|
| | | | | * | | | Merge "Revert "Remove EXPAND/STRINGIFY macros."" | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| | | | | |\ \ \ |
|
| | | | | | * | | | Revert "Remove EXPAND/STRINGIFY macros." | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| * | | | | | | | | Merge "fuse_sideload: Change the minimal block size to 4096." am: 4e8e56eaea am: 53b98de866 am: 6bea344d7e | Tao Bao | 2017-05-04 | 4 | -141/+161 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "fuse_sideload: Change the minimal block size to 4096." am: 4e8e56eaea am: 53b98de866 | Tao Bao | 2017-05-04 | 4 | -141/+161 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "fuse_sideload: Change the minimal block size to 4096." am: 4e8e56eaea | Tao Bao | 2017-05-04 | 4 | -141/+161 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "fuse_sideload: Change the minimal block size to 4096." | Tao Bao | 2017-05-04 | 4 | -141/+161 |
| | | | |\| | | | |
|
| | | | | * | | | | Merge "fuse_sideload: Change the minimal block size to 4096." | Tao Bao | 2017-05-04 | 4 | -141/+161 |
| | | | | |\ \ \ \ |
|
| | | | | | * | | | | fuse_sideload: Change the minimal block size to 4096. | Tao Bao | 2017-05-03 | 4 | -141/+161 |
| * | | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7 am: 3642b99073 am: 5f8d2932d0 | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7 am: 3642b99073 | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7 | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "Remove EXPAND/STRINGIFY macros." | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| | | | |\| | | | | |
|
| | | | | * | | | | | Merge "Remove EXPAND/STRINGIFY macros." | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| | | | | |\ \ \ \ \
| | | | | | | |/ / /
| | | | | | |/| / /
| | | | | | |_|/ /
| | | | | |/| | | |
|
| | | | | | * | | | Remove EXPAND/STRINGIFY macros. | Tao Bao | 2017-05-03 | 3 | -4/+4 |
| | | | | |/ / / |
|
| * | | | | | | | Merge "Add a default error code when updater script aborts" am: 89394632b1 am: 18bb9a4f26 am: 7a1c2943ab | Tianjie Xu | 2017-05-03 | 2 | -7/+10 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Add a default error code when updater script aborts" am: 89394632b1 am: 18bb9a4f26 | Tianjie Xu | 2017-05-03 | 2 | -7/+10 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Add a default error code when updater script aborts" am: 89394632b1 | Tianjie Xu | 2017-05-03 | 2 | -7/+10 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Add a default error code when updater script aborts" | Tianjie Xu | 2017-05-03 | 2 | -7/+10 |
| | | | |\| | | |
|
| | | | | * | | | Merge "Add a default error code when updater script aborts" | Tianjie Xu | 2017-05-03 | 2 | -7/+10 |
| | | | | |\ \ \ |
|
| | | | | | * | | | Add a default error code when updater script aborts | Tianjie Xu | 2017-05-03 | 2 | -7/+10 |
| * | | | | | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c am: 08d9ede8f2 am: b3eeb817ab | Tao Bao | 2017-05-03 | 8 | -142/+114 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c am: 08d9ede8f2 | Tao Bao | 2017-05-03 | 8 | -142/+114 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c | Tao Bao | 2017-05-03 | 8 | -142/+114 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." | Tao Bao | 2017-05-03 | 8 | -142/+114 |
| | | | |\| | | | |
|
| | | | | * | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." | Tao Bao | 2017-05-03 | 8 | -142/+114 |
| | | | | |\ \ \ \
| | | | | | |_|/ /
| | | | | |/| | | |
|
| | | | | | * | | | Move sysMapFile and sysReleaseMap into MemMapping class. | Tao Bao | 2017-05-02 | 8 | -142/+114 |
| | | | | |/ / / |
|
| * | | | | | | | Merge "recovery: Change install_package() to take std::string." am: ba365180d3 am: c0c4ae1583 am: a0fb95a386 | Tao Bao | 2017-05-02 | 2 | -75/+77 |
| |\| | | | | | |
|
| | * | | | | | | Merge "recovery: Change install_package() to take std::string." am: ba365180d3 am: c0c4ae1583 | Tao Bao | 2017-05-02 | 2 | -75/+77 |
| | |\| | | | | |
|
| | | * | | | | | Merge "recovery: Change install_package() to take std::string." am: ba365180d3 | Tao Bao | 2017-05-02 | 2 | -75/+77 |
| | | |\| | | | |
|
| | | | * | | | | Merge "recovery: Change install_package() to take std::string." | Tao Bao | 2017-05-02 | 2 | -75/+77 |
| | | | |\| | | |
|
| | | | | * | | | Merge "recovery: Change install_package() to take std::string." | Tao Bao | 2017-05-02 | 2 | -75/+77 |
| | | | | |\ \ \ |
|
| | | | | | * | | | recovery: Change install_package() to take std::string. | Tao Bao | 2017-05-01 | 2 | -75/+77 |
| * | | | | | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter." am: e58dabade9 am: dc534a9481 am: 139a6dd9e2 | Tao Bao | 2017-05-01 | 3 | -101/+96 |
|/| | | | | | | |
| |/ / / / / / / |
|
| * | | | | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter." am: e58dabade9 am: dc534a9481 | Tao Bao | 2017-05-01 | 3 | -101/+96 |
| |\| | | | | | |
|
| | * | | | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter." am: e58dabade9 | Tao Bao | 2017-05-01 | 3 | -101/+96 |
| | |\| | | | | |
|
| | | * | | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter." | Tao Bao | 2017-05-01 | 3 | -101/+96 |
| | | |\| | | | |
|
| | | | * | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter." | Tao Bao | 2017-05-01 | 3 | -101/+96 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | adb_install: Stop passing RecoveryUI as a parameter. | Tao Bao | 2017-05-01 | 3 | -101/+96 |
| | | | |/ / / |
|
* | | | | | | | Merge "minui: Fix breakage in graphics_adf." am: 54da112277 am: d66f05b82c am: 4cc6889da8 | Tao Bao | 2017-04-29 | 1 | -1/+2 |
|\| | | | | | |
|
| * | | | | | | Merge "minui: Fix breakage in graphics_adf." am: 54da112277 am: d66f05b82c | Tao Bao | 2017-04-29 | 1 | -1/+2 |
| |\| | | | | |
|
| | * | | | | | Merge "minui: Fix breakage in graphics_adf." am: 54da112277 | Tao Bao | 2017-04-29 | 1 | -1/+2 |
| | |\| | | | |
|
| | | * | | | | Merge "minui: Fix breakage in graphics_adf." | Tao Bao | 2017-04-29 | 1 | -1/+2 |
| | | |\| | | |
|
| | | | * | | | Merge "minui: Fix breakage in graphics_adf." | Tao Bao | 2017-04-29 | 1 | -1/+2 |
| | | | |\ \ \ |
|
| | | | | * | | | minui: Fix breakage in graphics_adf. | Alistair Strachan | 2017-04-29 | 1 | -1/+2 |
* | | | | | | | | Merge "Fix potential OOM in update_verifier" am: 5443072c3c am: 00a309ab3e am: 711e8b649d | Tianjie Xu | 2017-04-28 | 1 | -6/+11 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Fix potential OOM in update_verifier" am: 5443072c3c am: 00a309ab3e | Tianjie Xu | 2017-04-28 | 1 | -6/+11 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Fix potential OOM in update_verifier" am: 5443072c3c | Tianjie Xu | 2017-04-28 | 1 | -6/+11 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Fix potential OOM in update_verifier" | Tianjie Xu | 2017-04-28 | 1 | -6/+11 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Fix potential OOM in update_verifier" | Tianjie Xu | 2017-04-28 | 1 | -6/+11 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | Fix potential OOM in update_verifier | Tianjie Xu | 2017-04-27 | 1 | -6/+11 |
| | | | | |/ / |
|
* | | | | | | | Adding support for quiescent reboot to recovery am: ed9db0fd73 | Dmitri Plotnikov | 2017-04-28 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | Adding support for quiescent reboot to recovery | Dmitri Plotnikov | 2017-04-28 | 0 | -0/+0 |
| |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | | |
|
| | * | | | | | Adding support for quiescent reboot to recovery | Dmitri Plotnikov | 2017-04-28 | 4 | -8/+27 |
* | | | | | | | Merge "Adding support for quiescent reboot to recovery" am: 0481faef77 am: 5b27cd1093 am: 533ad31cc1 | Dmitri Plotnikov | 2017-04-28 | 4 | -8/+27 |
|\| | | | | | |
|
| * | | | | | | Merge "Adding support for quiescent reboot to recovery" am: 0481faef77 am: 5b27cd1093 | Dmitri Plotnikov | 2017-04-28 | 4 | -8/+27 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge "Adding support for quiescent reboot to recovery" am: 0481faef77 | Dmitri Plotnikov | 2017-04-28 | 4 | -8/+27 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Merge "Adding support for quiescent reboot to recovery" | Dmitri Plotnikov | 2017-04-28 | 4 | -8/+27 |
| | | |\ \ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | * | | | Merge "Adding support for quiescent reboot to recovery" | Treehugger Robot | 2017-04-28 | 4 | -8/+27 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | Adding support for quiescent reboot to recovery | Dmitri Plotnikov | 2017-04-19 | 4 | -8/+27 |
* | | | | | | | Merge "Separate libupdate_verifier module and add testcases." am: c99bb23955 am: d8c078d2c6 am: c7410924a3 | Tao Bao | 2017-04-27 | 6 | -16/+179 |
|\| | | | | | |
|
| * | | | | | | Merge "Separate libupdate_verifier module and add testcases." am: c99bb23955 am: d8c078d2c6 | Tao Bao | 2017-04-27 | 6 | -16/+179 |
| |\| | | | | |
|
| | * | | | | | Merge "Separate libupdate_verifier module and add testcases." am: c99bb23955 | Tao Bao | 2017-04-27 | 6 | -16/+179 |
| | |\| | | | |
|
| | | * | | | | Merge "Separate libupdate_verifier module and add testcases." | Tao Bao | 2017-04-27 | 6 | -16/+179 |
| | | |\| | | |
|
| | | | * | | | Merge "Separate libupdate_verifier module and add testcases." | Tao Bao | 2017-04-27 | 6 | -16/+179 |
| | | | |\ \ \ |
|
| | | | | * | | | Separate libupdate_verifier module and add testcases. | Tao Bao | 2017-04-27 | 6 | -16/+179 |
* | | | | | | | | Merge "libfusesideload: Clean up the CFLAGS for the module." am: 416c55cf43 am: 74812187c0 am: 67dc335646 | Tao Bao | 2017-04-27 | 2 | -5/+6 |
|\| | | | | | | |
|
| * | | | | | | | Merge "libfusesideload: Clean up the CFLAGS for the module." am: 416c55cf43 am: 74812187c0 | Tao Bao | 2017-04-27 | 2 | -5/+6 |
| |\| | | | | | |
|
| | * | | | | | | Merge "libfusesideload: Clean up the CFLAGS for the module." am: 416c55cf43 | Tao Bao | 2017-04-27 | 2 | -5/+6 |
| | |\| | | | | |
|
| | | * | | | | | Merge "libfusesideload: Clean up the CFLAGS for the module." | Tao Bao | 2017-04-27 | 2 | -5/+6 |
| | | |\| | | | |
|
| | | | * | | | | Merge "libfusesideload: Clean up the CFLAGS for the module." | Tao Bao | 2017-04-27 | 2 | -5/+6 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | libfusesideload: Clean up the CFLAGS for the module. | Tao Bao | 2017-04-27 | 2 | -5/+6 |
| | | | |/ / / |
|
* | | | | | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1 am: 22b1fa7d61 am: 7ee4b7dd84 | Tao Bao | 2017-04-26 | 2 | -31/+1 |
|\| | | | | | |
|
| * | | | | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1 am: 22b1fa7d61 | Tao Bao | 2017-04-26 | 2 | -31/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1 | Tao Bao | 2017-04-26 | 2 | -31/+1 |
| | |\| | | | |
|
| | | * | | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"." | Tao Bao | 2017-04-26 | 2 | -31/+1 |
| | | |\| | | |
|
| | | | * | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"." | Tao Bao | 2017-04-26 | 2 | -31/+1 |
| | | | |\ \ \ |
|
| | | | | * | | | applypatch: Remove the obsolete support for "applypatch -s". | Tao Bao | 2017-04-26 | 2 | -31/+1 |
* | | | | | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." am: ac78ed8915 am: 282c863524 am: 3dcc24490b | Tao Bao | 2017-04-26 | 1 | -1/+4 |
|\| | | | | | | |
|
| * | | | | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." am: ac78ed8915 am: 282c863524 | Tao Bao | 2017-04-26 | 1 | -1/+4 |
| |\| | | | | | |
|
| | * | | | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." am: ac78ed8915 | Tao Bao | 2017-04-26 | 1 | -1/+4 |
| | |\| | | | | |
|
| | | * | | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." | Tao Bao | 2017-04-26 | 1 | -1/+4 |
| | | |\| | | | |
|
| | | | * | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." | Tao Bao | 2017-04-26 | 1 | -1/+4 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | applypatch: Add determine the return value of ApplyDiffPatch and | Jinguang Dong | 2017-04-26 | 1 | -1/+4 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "minadbd: Fix a failing test due to SIGPIPE." am: 7b1fffe095 am: f849ff34d4 am: c798cf2531 | Tao Bao | 2017-04-25 | 1 | -9/+11 |
|\| | | | | | | |
|
| * | | | | | | | Merge "minadbd: Fix a failing test due to SIGPIPE." am: 7b1fffe095 am: f849ff34d4 | Tao Bao | 2017-04-25 | 1 | -9/+11 |
| |\| | | | | | |
|
| | * | | | | | | Merge "minadbd: Fix a failing test due to SIGPIPE." am: 7b1fffe095 | Tao Bao | 2017-04-25 | 1 | -9/+11 |
| | |\| | | | | |
|
| | | * | | | | | Merge "minadbd: Fix a failing test due to SIGPIPE." | Tao Bao | 2017-04-25 | 1 | -9/+11 |
| | | |\| | | | |
|
| | | | * | | | | Merge "minadbd: Fix a failing test due to SIGPIPE." | Tao Bao | 2017-04-25 | 1 | -9/+11 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | minadbd: Fix a failing test due to SIGPIPE. | Tao Bao | 2017-04-25 | 1 | -9/+11 |
| | | | |/ / / |
|
* | | | | | | | Merge "recovery: Remove the include of adb.h." am: dff2276012 am: 2dad1a9d28 am: 36683d0fc8 | Tao Bao | 2017-04-25 | 2 | -3/+0 |
|\| | | | | | |
|
| * | | | | | | Merge "recovery: Remove the include of adb.h." am: dff2276012 am: 2dad1a9d28 | Tao Bao | 2017-04-25 | 2 | -3/+0 |
| |\| | | | | |
|
| | * | | | | | Merge "recovery: Remove the include of adb.h." am: dff2276012 | Tao Bao | 2017-04-25 | 2 | -3/+0 |
| | |\| | | | |
|
| | | * | | | | Merge "recovery: Remove the include of adb.h." | Tao Bao | 2017-04-25 | 2 | -3/+0 |
| | | |\| | | |
|
| | | | * | | | Merge "recovery: Remove the include of adb.h." | Tao Bao | 2017-04-25 | 2 | -3/+0 |
| | | | |\ \ \ |
|
| | | | | * | | | recovery: Remove the include of adb.h. | Tao Bao | 2017-04-24 | 2 | -3/+0 |
| | | | |/ / / |
|
* | | | | | | | Add more tests for verify_package_compatibility(). am: b4c0de6c7b -s ours | Tao Bao | 2017-04-25 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | Add more tests for verify_package_compatibility(). | Tao Bao | 2017-04-25 | 0 | -0/+0 |
| |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | | |
|
| | * | | | | | Add more tests for verify_package_compatibility(). | Tao Bao | 2017-04-24 | 1 | -0/+84 |
* | | | | | | | Merge "Add more tests for verify_package_compatibility()." am: a9dd77fa84 am: 5f85d07e87 am: 54f8988cfe | Tao Bao | 2017-04-24 | 1 | -0/+84 |
|\| | | | | | |
|
| * | | | | | | Merge "Add more tests for verify_package_compatibility()." am: a9dd77fa84 am: 5f85d07e87 | Tao Bao | 2017-04-24 | 1 | -0/+84 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge "Add more tests for verify_package_compatibility()." am: a9dd77fa84 | Tao Bao | 2017-04-24 | 1 | -0/+84 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Merge "Add more tests for verify_package_compatibility()." | Tao Bao | 2017-04-24 | 1 | -0/+84 |
| | | |\ \ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | * | | | Merge "Add more tests for verify_package_compatibility()." | Tao Bao | 2017-04-24 | 1 | -0/+84 |
| | | | |\ \ \ |
|
| | | | | * | | | Add more tests for verify_package_compatibility(). | Tao Bao | 2017-04-20 | 1 | -0/+84 |
* | | | | | | | | Merge "tests: Remove obsolete classes in applypatch_test." am: f17aa960db am: 8a3325dc8a am: f4a8d0bba6 | Tao Bao | 2017-04-24 | 1 | -49/+2 |
|\| | | | | | | |
|
| * | | | | | | | Merge "tests: Remove obsolete classes in applypatch_test." am: f17aa960db am: 8a3325dc8a | Tao Bao | 2017-04-24 | 1 | -49/+2 |
| |\| | | | | | |
|
| | * | | | | | | Merge "tests: Remove obsolete classes in applypatch_test." am: f17aa960db | Tao Bao | 2017-04-24 | 1 | -49/+2 |
| | |\| | | | | |
|
| | | * | | | | | Merge "tests: Remove obsolete classes in applypatch_test." | Tao Bao | 2017-04-24 | 1 | -49/+2 |
| | | |\| | | | |
|
| | | | * | | | | Merge "tests: Remove obsolete classes in applypatch_test." | Tao Bao | 2017-04-24 | 1 | -49/+2 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | tests: Remove obsolete classes in applypatch_test. | Tao Bao | 2017-04-21 | 1 | -49/+2 |
| | | | | |/ / / |
|
* | | | | | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." am: b6c9c41a3d am: 0cf72f0f14 am: c179ac9238 | Tao Bao | 2017-04-24 | 2 | -2/+2 |
|\| | | | | | | |
|
| * | | | | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." am: b6c9c41a3d am: 0cf72f0f14 | Tao Bao | 2017-04-24 | 2 | -2/+2 |
| |\| | | | | | |
|
| | * | | | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." am: b6c9c41a3d | Tao Bao | 2017-04-24 | 2 | -2/+2 |
| | |\| | | | | |
|
| | | * | | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." | Tao Bao | 2017-04-24 | 2 | -2/+2 |
| | | |\| | | | |
|
| | | | * | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." | Tao Bao | 2017-04-24 | 2 | -2/+2 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | librecovery: Remove -Wno-unused-parameter and add -Wall. | Tao Bao | 2017-04-24 | 2 | -2/+2 |
| | | | | |/ / / |
|
* | | | | | | | | Merge "Reboot the device on user build after the install fails" am: d6f436849d am: 4849c87033 am: 0cd8986bc2 | Tianjie Xu | 2017-04-22 | 1 | -4/+12 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Reboot the device on user build after the install fails" am: d6f436849d am: 4849c87033 | Tianjie Xu | 2017-04-22 | 1 | -4/+12 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Reboot the device on user build after the install fails" am: d6f436849d | Tianjie Xu | 2017-04-22 | 1 | -4/+12 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Reboot the device on user build after the install fails" | Tianjie Xu | 2017-04-22 | 1 | -4/+12 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Reboot the device on user build after the install fails" | Treehugger Robot | 2017-04-22 | 1 | -4/+12 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Reboot the device on user build after the install fails | Tianjie Xu | 2017-04-22 | 1 | -4/+12 |
| | | | | | |_|/
| | | | | |/| | |
|
* | | | | | | | | Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3 am: 235a2cc1c7 am: 33a8900d2b | Tianjie Xu | 2017-04-20 | 1 | -9/+7 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3 am: 235a2cc1c7 | Tianjie Xu | 2017-04-20 | 1 | -9/+7 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3 | Tianjie Xu | 2017-04-20 | 1 | -9/+7 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Minor clean up to minadbd_services.cpp" | Tianjie Xu | 2017-04-20 | 1 | -9/+7 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Minor clean up to minadbd_services.cpp" | Tianjie Xu | 2017-04-20 | 1 | -9/+7 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | Minor clean up to minadbd_services.cpp | Tianjie Xu | 2017-04-19 | 1 | -9/+7 |
| | | | | |/ / |
|
* | | | | | | | Merge "Call libvintf to verify package compatibility." am: b0945e1a23 am: 8e7884abcc am: d7a065eb1c | Tao Bao | 2017-04-20 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | Merge "Call libvintf to verify package compatibility." am: b0945e1a23 am: 8e7884abcc | Tao Bao | 2017-04-20 | 0 | -0/+0 |
| |\| | | | | |
|
| | * | | | | | Merge "Call libvintf to verify package compatibility." am: b0945e1a23 | Tao Bao | 2017-04-20 | 3 | -5/+17 |
| | |\| | | | |
|
| | | * | | | | Merge "Call libvintf to verify package compatibility." | Tao Bao | 2017-04-20 | 3 | -5/+17 |
| | | |\| | | |
|
| | | | * | | | Merge "Call libvintf to verify package compatibility." | Tao Bao | 2017-04-20 | 3 | -5/+17 |
| | | | |\ \ \ |
|
| | | | | * | | | Call libvintf to verify package compatibility. | Tao Bao | 2017-04-20 | 3 | -5/+17 |
* | | | | | | | | Call libvintf to verify package compatibility. am: da320ac6ab | Tao Bao | 2017-04-20 | 3 | -5/+17 |
|\| | | | | | | |
|
| * | | | | | | | Call libvintf to verify package compatibility. | Tao Bao | 2017-04-20 | 3 | -5/+17 |
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| | * | | | | | | Call libvintf to verify package compatibility. | Tao Bao | 2017-04-19 | 3 | -5/+17 |
* | | | | | | | | Merge "Add tests for read_metadata_from_package()." am: e888d45950 am: c08c055ce0 am: 7b9b77f445 | Tao Bao | 2017-04-19 | 2 | -43/+89 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Add tests for read_metadata_from_package()." am: e888d45950 am: c08c055ce0 | Tao Bao | 2017-04-19 | 2 | -43/+89 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | Merge "Add tests for read_metadata_from_package()." am: e888d45950 | Tao Bao | 2017-04-19 | 2 | -43/+89 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge "Add tests for read_metadata_from_package()." | Tao Bao | 2017-04-19 | 2 | -43/+89 |
| | | |\ \ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | * | | | | Merge "Add tests for read_metadata_from_package()." | Tao Bao | 2017-04-19 | 2 | -43/+89 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | Add tests for read_metadata_from_package(). | Tao Bao | 2017-04-19 | 2 | -43/+89 |
* | | | | | | | | Merge "Add 'system' to update_verifier's gid" into oc-dev am: 464c6ba9f8 | Tianjie Xu | 2017-04-19 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Add 'system' to update_verifier's gid" into oc-dev | Tianjie Xu | 2017-04-19 | 0 | -0/+0 |
| |\ \ \ \ \ \ \
| | | |_|_|_|/ /
| | |/| | | | | |
|
| | * | | | | | | Merge "Add 'system' to update_verifier's gid" into oc-dev | Tianjie Xu | 2017-04-19 | 1 | -2/+2 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Add 'system' to update_verifier's gid | Tianjie Xu | 2017-04-19 | 1 | -2/+2 |
* | | | | | | | | | Merge "Minor clean up to install.cpp." am: 08146728c1 am: 668e84233d am: 6650c0426f | Tao Bao | 2017-04-19 | 1 | -66/+61 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Minor clean up to install.cpp." am: 08146728c1 am: 668e84233d | Tao Bao | 2017-04-19 | 1 | -66/+61 |
| |\ \ \ \ \ \ \ \
| | | |_|/ / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Minor clean up to install.cpp." am: 08146728c1 | Tao Bao | 2017-04-19 | 1 | -66/+61 |
| | |\ \ \ \ \ \ \
| | | | |_|/ / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "Minor clean up to install.cpp." | Tao Bao | 2017-04-19 | 1 | -66/+61 |
| | | |\ \ \ \ \ \
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "Minor clean up to install.cpp." | Tao Bao | 2017-04-19 | 1 | -66/+61 |
| | | | |\ \ \ \ \
| | | | | | |_|/ /
| | | | | |/| | | |
|
| | | | | * | | | | Minor clean up to install.cpp. | Tao Bao | 2017-04-19 | 1 | -66/+61 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "Add tests for update_binary_command()." into oc-dev am: a6084f8c9b -s ours | Tao Bao | 2017-04-19 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Add tests for update_binary_command()." into oc-dev | Tao Bao | 2017-04-19 | 0 | -0/+0 |
| |\ \ \ \ \ \ \
| | | |_|_|/ / /
| | |/| | | | | |
|
| | * | | | | | | Merge "Add tests for update_binary_command()." into oc-dev | Tao Bao | 2017-04-19 | 4 | -82/+199 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Add tests for update_binary_command(). | Tao Bao | 2017-04-19 | 4 | -82/+199 |
* | | | | | | | | | Merge "Add tests for update_binary_command()." am: 44f61b4ce5 am: 1fc109bdc7 am: d218dca8f9 | Tao Bao | 2017-04-19 | 4 | -82/+198 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Add tests for update_binary_command()." am: 44f61b4ce5 am: 1fc109bdc7 | Tao Bao | 2017-04-19 | 4 | -82/+198 |
| |\ \ \ \ \ \ \ \
| | | |_|/ / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Add tests for update_binary_command()." am: 44f61b4ce5 | Tao Bao | 2017-04-19 | 4 | -82/+198 |
| | |\ \ \ \ \ \ \
| | | | |_|/ / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "Add tests for update_binary_command()." | Tao Bao | 2017-04-19 | 4 | -82/+198 |
| | | |\ \ \ \ \ \
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "Add tests for update_binary_command()." | Tao Bao | 2017-04-19 | 4 | -82/+198 |
| | | | |\ \ \ \ \
| | | | | |_|_|_|/
| | | | |/| | | | |
|
| | | | | * | | | | Add tests for update_binary_command(). | Tao Bao | 2017-04-18 | 4 | -82/+198 |
* | | | | | | | | | init.rc: Remove sys.powerctl action am: 37ac94978c | Tom Cherry | 2017-04-18 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | init.rc: Remove sys.powerctl action | Tom Cherry | 2017-04-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|/ / /
| | |/| | | | | | |
|
| | * | | | | | | | init.rc: Remove sys.powerctl action | Tom Cherry | 2017-04-18 | 1 | -3/+0 |
| | | |_|_|_|/ /
| | |/| | | | | |
|
* | | | | | | | | Merge "Add 'system' to update_verifier's gid" am: ba3f078f6f am: 4575986069 am: 239d154869 | Tianjie Xu | 2017-04-18 | 1 | -2/+2 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Add 'system' to update_verifier's gid" am: ba3f078f6f am: 4575986069 | Tianjie Xu | 2017-04-18 | 1 | -2/+2 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | Merge "Add 'system' to update_verifier's gid" am: ba3f078f6f | Tianjie Xu | 2017-04-18 | 1 | -2/+2 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge "Add 'system' to update_verifier's gid" | Tianjie Xu | 2017-04-18 | 1 | -2/+2 |
| | | |\ \ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | * | | | | Merge "Add 'system' to update_verifier's gid" | Tianjie Xu | 2017-04-18 | 1 | -2/+2 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Add 'system' to update_verifier's gid | Tianjie Xu | 2017-04-18 | 1 | -2/+2 |
* | | | | | | | | | Merge "init.rc: Remove sys.powerctl action" am: 9848209088 am: 9fcc7c8253 am: 6e575ccd0f | Tom Cherry | 2017-04-18 | 1 | -3/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "init.rc: Remove sys.powerctl action" am: 9848209088 am: 9fcc7c8253 | Tom Cherry | 2017-04-18 | 1 | -3/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "init.rc: Remove sys.powerctl action" am: 9848209088 | Tom Cherry | 2017-04-18 | 1 | -3/+0 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "init.rc: Remove sys.powerctl action" | Tom Cherry | 2017-04-18 | 1 | -3/+0 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "init.rc: Remove sys.powerctl action" | Tom Cherry | 2017-04-18 | 1 | -3/+0 |
| | | | |\ \ \ \ \
| | | | | |_|_|/ /
| | | | |/| | | | |
|
| | | | | * | | | | init.rc: Remove sys.powerctl action | Tom Cherry | 2017-04-18 | 1 | -3/+0 |
* | | | | | | | | | Merge "Fix the double free in verify_package_compatibility()." am: ce91df8293 am: dc388aab8b am: d87bccd567 | Tao Bao | 2017-04-18 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Fix the double free in verify_package_compatibility()." am: ce91df8293 am: dc388aab8b | Tao Bao | 2017-04-18 | 0 | -0/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Fix the double free in verify_package_compatibility()." am: ce91df8293 | Tao Bao | 2017-04-18 | 1 | -1/+0 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Fix the double free in verify_package_compatibility()." | Tao Bao | 2017-04-18 | 1 | -1/+0 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Fix the double free in verify_package_compatibility()." | Tao Bao | 2017-04-18 | 1 | -1/+0 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | Fix the double free in verify_package_compatibility(). | Tao Bao | 2017-04-18 | 1 | -1/+0 |
* | | | | | | | | | | Merge changes from topic 'libvintf' am: c1ca21a32d am: beb1cb1df5 am: 35849591a0 -s ours | Tao Bao | 2017-04-18 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge changes from topic 'libvintf' am: c1ca21a32d am: beb1cb1df5 | Tao Bao | 2017-04-18 | 0 | -0/+0 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge changes from topic 'libvintf' am: c1ca21a32d | Tao Bao | 2017-04-18 | 6 | -5/+164 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge changes from topic 'libvintf' | Tao Bao | 2017-04-18 | 6 | -5/+164 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge changes from topic 'libvintf' | Tao Bao | 2017-04-18 | 6 | -5/+164 |
| | | | |\| | | | | |
|
| | | | | * | | | | | Add the missing LOCAL_CFLAGS for librecovery. | Tao Bao | 2017-04-18 | 1 | -0/+5 |
| | | | | * | | | | | Verify the package compatibility with libvintf. | Tao Bao | 2017-04-13 | 6 | -5/+159 |
| | | | | | |/ / /
| | | | | |/| | | |
|
* | | | | | | | | | Merge "libmounts: Remove two dead functions." am: 4854e77fd2 am: 7e031fdfe6 am: fdc5ac8051 | Tao Bao | 2017-04-18 | 2 | -21/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "libmounts: Remove two dead functions." am: 4854e77fd2 am: 7e031fdfe6 | Tao Bao | 2017-04-18 | 2 | -21/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "libmounts: Remove two dead functions." am: 4854e77fd2 | Tao Bao | 2017-04-18 | 2 | -21/+0 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "libmounts: Remove two dead functions." | Tao Bao | 2017-04-18 | 2 | -21/+0 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "libmounts: Remove two dead functions." | Tao Bao | 2017-04-18 | 2 | -21/+0 |
| | | | |\ \ \ \ \
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | | * | | | | libmounts: Remove two dead functions. | Tao Bao | 2017-04-17 | 2 | -21/+0 |
| | | | | |/ / / |
|
* | | | | | | | | Fix the double free in verify_package_compatibility(). am: f978278995 | Tao Bao | 2017-04-17 | 1 | -1/+0 |
|\| | | | | | | |
|
| * | | | | | | | Fix the double free in verify_package_compatibility(). | Tao Bao | 2017-04-17 | 1 | -1/+0 |
| |\ \ \ \ \ \ \
| | | |_|_|_|/ /
| | |/| | | | | |
|
| | * | | | | | | Fix the double free in verify_package_compatibility(). | Tao Bao | 2017-04-17 | 1 | -1/+0 |
| | | |_|_|_|/
| | |/| | | | |
|
* | | | | | | | Merge "minadbd: switch adb_thread_create to std::thread." am: d3d91e5595 am: 0836159ce1 am: 572b7ba1bc | Josh Gao | 2017-04-14 | 1 | -27/+3 |
|\| | | | | | |
|
| * | | | | | | Merge "minadbd: switch adb_thread_create to std::thread." am: d3d91e5595 am: 0836159ce1 | Josh Gao | 2017-04-14 | 1 | -27/+3 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge "minadbd: switch adb_thread_create to std::thread." am: d3d91e5595 | Josh Gao | 2017-04-14 | 1 | -27/+3 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Merge "minadbd: switch adb_thread_create to std::thread." | Josh Gao | 2017-04-14 | 1 | -27/+3 |
| | | |\ \ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | * | | | Merge "minadbd: switch adb_thread_create to std::thread." | Josh Gao | 2017-04-14 | 1 | -27/+3 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | minadbd: switch adb_thread_create to std::thread. | Josh Gao | 2017-04-13 | 1 | -27/+3 |
| | | | |/ / |
|
* | | | | | | Add the missing LOCAL_CFLAGS for librecovery. am: 25dbe1717e | Tao Bao | 2017-04-13 | 1 | -0/+5 |
|\| | | | | |
|
| * | | | | | Add the missing LOCAL_CFLAGS for librecovery. | Tao Bao | 2017-04-13 | 1 | -0/+5 |
| |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | * | | | | Add the missing LOCAL_CFLAGS for librecovery. | Tao Bao | 2017-04-13 | 1 | -0/+5 |
* | | | | | | Verify the package compatibility with libvintf. am: 62e0bc7586 | Tao Bao | 2017-04-13 | 6 | -5/+159 |
|\| | | | | |
|
| * | | | | | Verify the package compatibility with libvintf. | Tao Bao | 2017-04-13 | 6 | -5/+159 |
| |\| | | | |
|
| | * | | | | Verify the package compatibility with libvintf. | Tao Bao | 2017-04-12 | 6 | -5/+159 |
* | | | | | | Merge "Protect filename_cache with lock in ota fault" am: 1b28a27c33 am: 461188865b am: 41bdd91780 | Tianjie Xu | 2017-04-11 | 2 | -3/+22 |
|\| | | | | |
|
| * | | | | | Merge "Protect filename_cache with lock in ota fault" am: 1b28a27c33 am: 461188865b | Tianjie Xu | 2017-04-11 | 2 | -3/+22 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | Merge "Protect filename_cache with lock in ota fault" am: 1b28a27c33 | Tianjie Xu | 2017-04-11 | 2 | -3/+22 |
| | |\ \ \ \
| | | | |/ /
| | | |/| | |
|
| | | * | | | Merge "Protect filename_cache with lock in ota fault" | Tianjie Xu | 2017-04-11 | 2 | -3/+22 |
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | | * | | Merge "Protect filename_cache with lock in ota fault" | Tianjie Xu | 2017-04-11 | 2 | -3/+22 |
| | | | |\ \ |
|
| | | | | * | | Protect filename_cache with lock in ota fault | Tianjie Xu | 2017-04-11 | 2 | -3/+22 |
| | | | |/ / |
|
* | | | | | | Merge "Abort the update if there's not enough new data" am: b4b0c49c48 am: bc66528cb9 am: 955c5ebece | Tianjie Xu | 2017-04-10 | 2 | -4/+92 |
|\| | | | | |
|
| * | | | | | Merge "Abort the update if there's not enough new data" am: b4b0c49c48 am: bc66528cb9 | Tianjie Xu | 2017-04-10 | 2 | -4/+92 |
| |\| | | | |
|
| | * | | | | Merge "Abort the update if there's not enough new data" am: b4b0c49c48 | Tianjie Xu | 2017-04-10 | 2 | -4/+92 |
| | |\| | | |
|
| | | * | | | Merge "Abort the update if there's not enough new data" | Tianjie Xu | 2017-04-10 | 2 | -4/+92 |
| | | |\| | |
|
| | | | * | | Merge "Abort the update if there's not enough new data" | Tianjie Xu | 2017-04-10 | 2 | -4/+92 |
| | | | |\ \ |
|
| | | | | * | | Abort the update if there's not enough new data | Tianjie Xu | 2017-04-08 | 2 | -4/+92 |
| | | | |/ / |
|
* | | | | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8 am: cc630bdde1 am: f25cd871cc | Tao Bao | 2017-04-05 | 3 | -49/+4 |
|\| | | | | |
|
| * | | | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8 am: cc630bdde1 | Tao Bao | 2017-04-05 | 3 | -49/+4 |
| |\| | | | |
|
| | * | | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8 | Tao Bao | 2017-04-05 | 3 | -49/+4 |
| | |\| | | |
|
| | | * | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." | Tao Bao | 2017-04-05 | 3 | -49/+4 |
| | | |\| | |
|
| | | | * | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." | Tao Bao | 2017-04-05 | 3 | -49/+4 |
| | | | |\ \ |
|
| | | | | * | | tests: Use get_bootloader_message_blk_device() to find /misc. | Tao Bao | 2017-04-05 | 3 | -49/+4 |
| | | | |/ / |
|
* | | | | | | Merge "Boot control HAL based on the A/B headers." am: b5fca37976 am: df141b9381 am: c14d0728a7 | Alex Deymo | 2017-04-05 | 5 | -0/+448 |
|\| | | | | |
|
| * | | | | | Merge "Boot control HAL based on the A/B headers." am: b5fca37976 am: df141b9381 | Alex Deymo | 2017-04-05 | 5 | -0/+448 |
| |\| | | | |
|
| | * | | | | Merge "Boot control HAL based on the A/B headers." am: b5fca37976 | Alex Deymo | 2017-04-05 | 5 | -0/+448 |
| | |\| | | |
|
| | | * | | | Merge "Boot control HAL based on the A/B headers." | Alex Deymo | 2017-04-05 | 5 | -0/+448 |
| | | |\| | |
|
| | | | * | | Merge "Boot control HAL based on the A/B headers." | Alex Deymo | 2017-04-05 | 5 | -0/+448 |
| | | | |\ \ |
|
| | | | | * | | Boot control HAL based on the A/B headers. | Alex Deymo | 2017-04-03 | 5 | -0/+448 |
* | | | | | | | Merge "Change the internal representation in RangeSet." am: 7ffa8be41d am: 2e12242b7a am: 7f4e5d55f4 | Tao Bao | 2017-04-05 | 3 | -239/+318 |
|\| | | | | | |
|
| * | | | | | | Merge "Change the internal representation in RangeSet." am: 7ffa8be41d am: 2e12242b7a | Tao Bao | 2017-04-04 | 3 | -239/+318 |
| |\| | | | | |
|
| | * | | | | | Merge "Change the internal representation in RangeSet." am: 7ffa8be41d | Tao Bao | 2017-04-04 | 3 | -239/+318 |
| | |\| | | | |
|
| | | * | | | | Merge "Change the internal representation in RangeSet." | Tao Bao | 2017-04-04 | 3 | -239/+318 |
| | | |\| | | |
|
| | | | * | | | Merge "Change the internal representation in RangeSet." | Tao Bao | 2017-04-04 | 3 | -239/+318 |
| | | |/| | | |
|
| | | | * | | | Change the internal representation in RangeSet. | Tao Bao | 2017-04-03 | 3 | -239/+318 |
| | | | |/ / |
|
* | | | | | | Merge "update_verifier: correct group in rc file" into oc-dev am: 5d9fb40ef7 | Tom Cherry | 2017-04-04 | 0 | -0/+0 |
|\| | | | | |
|
| * | | | | | Merge "update_verifier: correct group in rc file" into oc-dev | Tom Cherry | 2017-04-04 | 0 | -0/+0 |
| |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | * | | | | Merge "update_verifier: correct group in rc file" into oc-dev | TreeHugger Robot | 2017-04-04 | 2 | -3/+3 |
| | |\ \ \ \ |
|
| | | * | | | | update_verifier: correct group in rc file | Tom Cherry | 2017-04-04 | 2 | -3/+3 |
* | | | | | | | update_verifier: tweak priority of update_verifier for quick boot am: 98beba314b | Wei Wang | 2017-04-04 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | update_verifier: tweak priority of update_verifier for quick boot | Wei Wang | 2017-04-04 | 0 | -0/+0 |
| |\| | | | | |
|
| | * | | | | | update_verifier: tweak priority of update_verifier for quick boot | Wei Wang | 2017-04-04 | 1 | -2/+2 |
| | |/ / / / |
|
* | | | | | | Merge "update_verifier: correct group in rc file" am: 310fa65c02 am: 2717c28e77 am: bec8264c6f | Tom Cherry | 2017-04-04 | 2 | -3/+3 |
|\| | | | | |
|
| * | | | | | Merge "update_verifier: correct group in rc file" am: 310fa65c02 am: 2717c28e77 | Tom Cherry | 2017-04-04 | 2 | -3/+3 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | Merge "update_verifier: correct group in rc file" am: 310fa65c02 | Tom Cherry | 2017-04-04 | 2 | -3/+3 |
| | |\ \ \ \
| | | | |/ /
| | | |/| | |
|
| | | * | | | Merge "update_verifier: correct group in rc file" | Tom Cherry | 2017-04-04 | 2 | -3/+3 |
| | | |\ \ \ |
|
| | | | * \ \ | Merge "update_verifier: correct group in rc file" | Treehugger Robot | 2017-04-04 | 2 | -3/+3 |
| | | | |\ \ \ |
|
| | | | | * | | | update_verifier: correct group in rc file | Tom Cherry | 2017-04-04 | 2 | -3/+3 |
| | | | | | |/
| | | | | |/| |
|
* | | | | | | | Merge "update_verifier: tweak priority of update_verifier for quick boot" am: a6ea26987d am: 56e9b9cc26 am: 8ed4fd4b69 | Wei Wang | 2017-04-04 | 1 | -2/+2 |
|\| | | | | | |
|
| * | | | | | | Merge "update_verifier: tweak priority of update_verifier for quick boot" am: a6ea26987d am: 56e9b9cc26 | Wei Wang | 2017-04-04 | 1 | -2/+2 |
| |\| | | | | |
|
| | * | | | | | Merge "update_verifier: tweak priority of update_verifier for quick boot" am: a6ea26987d | Wei Wang | 2017-04-04 | 1 | -2/+2 |
| | |\| | | | |
|
| | | * | | | | Merge "update_verifier: tweak priority of update_verifier for quick boot" | Wei Wang | 2017-04-04 | 1 | -2/+2 |
| | | |\| | | |
|
| | | | * | | | Merge "update_verifier: tweak priority of update_verifier for quick boot" | Treehugger Robot | 2017-04-04 | 1 | -2/+2 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | update_verifier: tweak priority of update_verifier for quick boot | Wei Wang | 2017-04-03 | 1 | -2/+2 |
| | | | |/ / |
|
* | | | | | | Merge "applypatch: Remove duplicate test files." am: b6609f8895 am: 1f38a9b96e am: 0f72cf5403 | Tao Bao | 2017-04-03 | 5 | -468/+0 |
|\| | | | | |
|
| * | | | | | Merge "applypatch: Remove duplicate test files." am: b6609f8895 am: 1f38a9b96e | Tao Bao | 2017-04-03 | 5 | -468/+0 |
| |\| | | | |
|
| | * | | | | Merge "applypatch: Remove duplicate test files." am: b6609f8895 | Tao Bao | 2017-04-03 | 5 | -468/+0 |
| | |\| | | |
|
| | | * | | | Merge "applypatch: Remove duplicate test files." | Tao Bao | 2017-04-03 | 5 | -468/+0 |
| | | |\| | |
|
| | | | * | | Merge "applypatch: Remove duplicate test files." | Tao Bao | 2017-04-03 | 5 | -468/+0 |
| | | | |\ \ |
|
| | | | | * | | applypatch: Remove duplicate test files. | Tao Bao | 2017-04-02 | 5 | -468/+0 |
* | | | | | | | Merge "updater: Keep the parsed parameters in std::unique_ptr." am: c80dd4ade2 am: a982e53a6e am: 78e277cd42 | Tao Bao | 2017-04-03 | 1 | -160/+157 |
|\| | | | | | |
|
| * | | | | | | Merge "updater: Keep the parsed parameters in std::unique_ptr." am: c80dd4ade2 am: a982e53a6e | Tao Bao | 2017-04-03 | 1 | -160/+157 |
| |\| | | | | |
|
| | * | | | | | Merge "updater: Keep the parsed parameters in std::unique_ptr." am: c80dd4ade2 | Tao Bao | 2017-04-03 | 1 | -160/+157 |
| | |\| | | | |
|
| | | * | | | | Merge "updater: Keep the parsed parameters in std::unique_ptr." | Tao Bao | 2017-04-03 | 1 | -160/+157 |
| | | |\| | | |
|
| | | | * | | | Merge "updater: Keep the parsed parameters in std::unique_ptr." | Tao Bao | 2017-04-03 | 1 | -160/+157 |
| | | | |\ \ \ |
|
| | | | | * | | | updater: Keep the parsed parameters in std::unique_ptr. | Tao Bao | 2017-03-31 | 1 | -160/+157 |
| | | | | |/ / |
|
* | | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 am: 705a4d72c8 am: 8dcbd1b399 | Tianjie Xu | 2017-04-02 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 am: 705a4d72c8 | Tianjie Xu | 2017-04-02 | 0 | -0/+0 |
| |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | | |
|
| | * | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 | Tianjie Xu | 2017-04-02 | 1 | -3/+4 |
* | | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe am: 81f5b04df2 am: 253e223799 -s ours | Tianjie Xu | 2017-04-02 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe am: 81f5b04df2 | Tianjie Xu | 2017-04-02 | 0 | -0/+0 |
| |\| | | | | |
|
| | * | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe | Tianjie Xu | 2017-04-02 | 1 | -26/+33 |
* | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 474dc18479 -s ours am: bdf8a3106c -s ours | Bill Yi | 2017-04-02 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 474dc18479 -s ours | Bill Yi | 2017-04-02 | 0 | -0/+0 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master | Bill Yi | 2017-04-02 | 0 | -0/+0 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master | TreeHugger Robot | 2017-04-02 | 78 | -312/+390 |
| | | |\ \ \ \ |
|
| | | | * | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-04-02 | 78 | -312/+390 |
* | | | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 am: 705a4d72c8 | Tianjie Xu | 2017-04-02 | 1 | -3/+4 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 | Tianjie Xu | 2017-04-02 | 1 | -3/+4 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 | Tianjie Xu | 2017-04-02 | 1 | -3/+4 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Use regular check for partition name instead of CHECK()" | Tianjie Xu | 2017-04-02 | 1 | -3/+4 |
| | | |\ \ \ \ \
| | | | |/ / / /
| | | |/| | / /
| | | | | |/ /
| | | | |/| | |
|
| | | | * | | | Merge "Use regular check for partition name instead of CHECK()" | Tianjie Xu | 2017-04-02 | 1 | -3/+4 |
| | | | |\ \ \ |
|
| | | | | * | | | Use regular check for partition name instead of CHECK() | Tianjie Xu | 2017-04-01 | 1 | -3/+4 |
| | | | |/ / / |
|
* | | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe am: 81f5b04df2 | Tianjie Xu | 2017-04-01 | 1 | -26/+33 |
|\| | | | | | |
|
| * | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe | Tianjie Xu | 2017-04-01 | 1 | -26/+33 |
| |\| | | | | |
|
| | * | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e | Tianjie Xu | 2017-04-01 | 1 | -26/+33 |
| | |\| | | | |
|
| | | * | | | | Merge "Update_verifier should read blocks in EIO mode" | Tianjie Xu | 2017-04-01 | 1 | -26/+33 |
| | | |\| | | |
|
| | | | * | | | Merge "Update_verifier should read blocks in EIO mode" | Tianjie Xu | 2017-04-01 | 1 | -26/+33 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | Update_verifier should read blocks in EIO mode | Tianjie Xu | 2017-03-31 | 1 | -26/+33 |
* | | | | | | | Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7 am: 74c4da4c01 am: 3cf1113021 | Tao Bao | 2017-03-31 | 4 | -110/+199 |
|\| | | | | | |
|
| * | | | | | | Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7 am: 74c4da4c01 | Tao Bao | 2017-03-31 | 4 | -110/+199 |
| |\| | | | | |
|
| | * | | | | | Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7 | Tao Bao | 2017-03-31 | 4 | -110/+199 |
| | |\| | | | |
|
| | | * | | | | Merge "Move parse_range() and range_overlaps() into RangeSet." | Tao Bao | 2017-03-31 | 4 | -110/+199 |
| | | |\| | | |
|
| | | | * | | | Merge "Move parse_range() and range_overlaps() into RangeSet." | Tao Bao | 2017-03-31 | 4 | -110/+199 |
| | | | |\ \ \ |
|
| | | | | * | | | Move parse_range() and range_overlaps() into RangeSet. | Tao Bao | 2017-03-31 | 4 | -110/+199 |
* | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc am: 556ca4e301 am: d8df5485eb | Tianjie Xu | 2017-03-31 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc am: 556ca4e301 | Tianjie Xu | 2017-03-31 | 0 | -0/+0 |
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| | * | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc | Tianjie Xu | 2017-03-31 | 4 | -9/+159 |
* | | | | | | | | recovery: switch to fs_mgr_read_fstab_default() am: 930247241f | Bowgo Tsai | 2017-03-31 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | recovery: switch to fs_mgr_read_fstab_default() | Bowgo Tsai | 2017-03-31 | 0 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | recovery: switch to fs_mgr_read_fstab_default() | Bowgo Tsai | 2017-03-31 | 1 | -2/+2 |
* | | | | | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()" am: d0c7ae1fa6 am: 0e728806f3 am: 18cc5b330a | Bowgo Tsai | 2017-03-31 | 1 | -2/+2 |
|\| | | | | | | |
|
| * | | | | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()" am: d0c7ae1fa6 am: 0e728806f3 | Bowgo Tsai | 2017-03-31 | 1 | -2/+2 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()" am: d0c7ae1fa6 | Bowgo Tsai | 2017-03-31 | 1 | -2/+2 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()" | Bowgo Tsai | 2017-03-31 | 1 | -2/+2 |
| | | |\ \ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | * | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()" | Treehugger Robot | 2017-03-31 | 1 | -2/+2 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | recovery: switch to fs_mgr_read_fstab_default() | Bowgo Tsai | 2017-03-29 | 1 | -2/+2 |
* | | | | | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState." am: 65c065b4bb am: 7ccb4090d1 am: 8538fab040 | Tao Bao | 2017-03-31 | 1 | -164/+146 |
|\| | | | | | | |
|
| * | | | | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState." am: 65c065b4bb am: 7ccb4090d1 | Tao Bao | 2017-03-31 | 1 | -164/+146 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState." am: 65c065b4bb | Tao Bao | 2017-03-31 | 1 | -164/+146 |
| | |\| | | | | |
|
| | | * | | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState." | Tao Bao | 2017-03-31 | 1 | -164/+146 |
| | | |\| | | | |
|
| | | | * | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState." | Tao Bao | 2017-03-31 | 1 | -164/+146 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | updater: Move RangeSinkWrite into RangeSinkState. | Tao Bao | 2017-03-29 | 1 | -164/+146 |
| | | | | |/ / / |
|
* | | | | | | | | Merge "updater: Don't append newline when calling uiPrint()." am: 58cb690eac am: 08224f745c am: f39093d968 | Tao Bao | 2017-03-30 | 2 | -9/+10 |
|\| | | | | | | |
|
| * | | | | | | | Merge "updater: Don't append newline when calling uiPrint()." am: 58cb690eac am: 08224f745c | Tao Bao | 2017-03-30 | 2 | -9/+10 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater: Don't append newline when calling uiPrint()." am: 58cb690eac | Tao Bao | 2017-03-30 | 2 | -9/+10 |
| | |\| | | | | |
|
| | | * | | | | | Merge "updater: Don't append newline when calling uiPrint()." | Tao Bao | 2017-03-30 | 2 | -9/+10 |
| | | |\| | | | |
|
| | | | * | | | | Merge "updater: Don't append newline when calling uiPrint()." | Tao Bao | 2017-03-30 | 2 | -9/+10 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | updater: Don't append newline when calling uiPrint(). | Tao Bao | 2017-03-30 | 2 | -9/+10 |
* | | | | | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d am: b648a8781f am: 4d6f904a88 | Tao Bao | 2017-03-30 | 1 | -4/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d am: b648a8781f | Tao Bao | 2017-03-30 | 1 | -4/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d | Tao Bao | 2017-03-30 | 1 | -4/+0 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." | Tao Bao | 2017-03-30 | 1 | -4/+0 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." | Treehugger Robot | 2017-03-30 | 1 | -4/+0 |
| | | | |\ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | | * | | | | tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES. | Tao Bao | 2017-03-30 | 1 | -4/+0 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "Add test config to minadbd_test" am: df1a585504 am: b8f33fdf5f am: 57bb313b1e | Dan Shi | 2017-03-30 | 4 | -0/+60 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Add test config to minadbd_test" am: df1a585504 am: b8f33fdf5f | Dan Shi | 2017-03-30 | 4 | -0/+60 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Add test config to minadbd_test" am: df1a585504 | Dan Shi | 2017-03-30 | 4 | -0/+60 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Add test config to minadbd_test" | Dan Shi | 2017-03-30 | 4 | -0/+60 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Add test config to minadbd_test" | Treehugger Robot | 2017-03-30 | 4 | -0/+60 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Add test config to minadbd_test | Dan Shi | 2017-03-29 | 4 | -0/+60 |
* | | | | | | | | | update_verifier: raise priority and ioprio and start with exec_start am: beaa39bc23 | Tom Cherry | 2017-03-30 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | update_verifier: raise priority and ioprio and start with exec_start | Tom Cherry | 2017-03-30 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|_|/ /
| | |/| | | | | | |
|
| | * | | | | | | | update_verifier: raise priority and ioprio and start with exec_start | Tom Cherry | 2017-03-29 | 2 | -0/+13 |
* | | | | | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start" am: 3a8919e813 am: 8fe39a28b0 am: e404f5d9c8 | Tom Cherry | 2017-03-29 | 2 | -0/+13 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start" am: 3a8919e813 am: 8fe39a28b0 | Tom Cherry | 2017-03-29 | 2 | -0/+13 |
| |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start" am: 3a8919e813 | Tom Cherry | 2017-03-29 | 2 | -0/+13 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start" | Tom Cherry | 2017-03-29 | 2 | -0/+13 |
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start" | Treehugger Robot | 2017-03-29 | 2 | -0/+13 |
| | | | |\ \ \ \ \
| | | | | |_|_|/ /
| | | | |/| | | | |
|
| | | | | * | | | | update_verifier: raise priority and ioprio and start with exec_start | Tom Cherry | 2017-03-29 | 2 | -0/+13 |
| | | | | | |_|/
| | | | | |/| | |
|
* | | | | | | | | Merge "Log the error message when failing to mount/umount." am: 850f89f198 am: 23fe20fb6e am: cbc90e5c2c | Tao Bao | 2017-03-29 | 2 | -10/+22 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Log the error message when failing to mount/umount." am: 850f89f198 am: 23fe20fb6e | Tao Bao | 2017-03-29 | 2 | -10/+22 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Log the error message when failing to mount/umount." am: 850f89f198 | Tao Bao | 2017-03-29 | 2 | -10/+22 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Log the error message when failing to mount/umount." | Tao Bao | 2017-03-29 | 2 | -10/+22 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Log the error message when failing to mount/umount." | Tao Bao | 2017-03-29 | 2 | -10/+22 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Log the error message when failing to mount/umount. | Tao Bao | 2017-03-29 | 2 | -10/+22 |
* | | | | | | | | | Fix the bad merge (duplicate tests). | Tao Bao | 2017-03-29 | 1 | -45/+0 |
* | | | | | | | | | resolve merge conflicts of 39ef2d7f to oc-dev-plus-aosp | Tao Bao | 2017-03-29 | 1 | -0/+45 |
|\| | | | | | | | |
|
| * | | | | | | | | resolve merge conflicts of 39ef2d7f to oc-dev-plus-aosp | Tao Bao | 2017-03-29 | 3 | -3/+46 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "tests: Construct two bad packages at runtime for VerifierTest." am: 3f2d35522a | Tao Bao | 2017-03-29 | 3 | -3/+46 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "tests: Construct two bad packages at runtime for VerifierTest." | Tao Bao | 2017-03-29 | 3 | -3/+46 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "tests: Construct two bad packages at runtime for VerifierTest." | Tao Bao | 2017-03-29 | 3 | -3/+46 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | tests: Construct two bad packages at runtime for VerifierTest. | Tao Bao | 2017-03-28 | 3 | -3/+46 |
| | | | | | |/ / /
| | | | | |/| | | |
|
* | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9 am: 5ec12126f0 am: 0a599567ce | Tianjie Xu | 2017-03-29 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9 am: 5ec12126f0 | Tianjie Xu | 2017-03-29 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|_|/ /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9 | Tianjie Xu | 2017-03-29 | 30 | -24/+45 |
* | | | | | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37 am: c6df7d2937 am: 62a4e5ca98 | Tao Bao | 2017-03-29 | 1 | -103/+82 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37 am: c6df7d2937 | Tao Bao | 2017-03-29 | 1 | -103/+82 |
| |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37 | Tao Bao | 2017-03-29 | 1 | -103/+82 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." | Tao Bao | 2017-03-29 | 1 | -103/+82 |
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." | Tao Bao | 2017-03-29 | 1 | -103/+82 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | tests: Add a test for --wipe_ab into UncryptTest. | Tao Bao | 2017-03-28 | 1 | -103/+82 |
* | | | | | | | | | | Merge "Suppress the unused variable warning in parser.yy" am: b9b03a282b am: 05c111b90b am: 6835d52c7e | Tianjie Xu | 2017-03-28 | 1 | -0/+3 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Suppress the unused variable warning in parser.yy" am: b9b03a282b am: 05c111b90b | Tianjie Xu | 2017-03-28 | 1 | -0/+3 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Suppress the unused variable warning in parser.yy" am: b9b03a282b | Tianjie Xu | 2017-03-28 | 1 | -0/+3 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "Suppress the unused variable warning in parser.yy" | Tianjie Xu | 2017-03-28 | 1 | -0/+3 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "Suppress the unused variable warning in parser.yy" | Treehugger Robot | 2017-03-28 | 1 | -0/+3 |
| | | | |\ \ \ \ \ \ |
|
| | | | | * | | | | | | Suppress the unused variable warning in parser.yy | Tianjie Xu | 2017-03-28 | 1 | -0/+3 |
| | | | | | |_|/ / /
| | | | | |/| | | | |
|
* | | | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc am: 556ca4e301 | Tianjie Xu | 2017-03-28 | 4 | -9/+159 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc | Tianjie Xu | 2017-03-28 | 4 | -9/+159 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f | Tianjie Xu | 2017-03-28 | 4 | -9/+159 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "Log temperature during OTA update" | Tianjie Xu | 2017-03-28 | 4 | -9/+159 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "Log temperature during OTA update" | Tianjie Xu | 2017-03-28 | 4 | -9/+159 |
| | | | |\ \ \ \ \ \ |
|
| | | | | * | | | | | | Log temperature during OTA update | Tianjie Xu | 2017-03-28 | 4 | -9/+159 |
| | | | | |/ / / / / |
|
* | | | | | | | | | | Merge "tests: Construct two bad packages at runtime for VerifierTest." | Tao Bao | 2017-03-28 | 3 | -3/+46 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | tests: Construct two bad packages at runtime for VerifierTest. | Tao Bao | 2017-03-28 | 3 | -3/+46 |
| | |_|_|_|_|_|/ / /
| |/| | | | | | | | |
|
* | | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9 am: 5ec12126f0 | Tianjie Xu | 2017-03-28 | 30 | -24/+45 |
|\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| * | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9 | Tianjie Xu | 2017-03-28 | 30 | -24/+45 |
| |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 | Tianjie Xu | 2017-03-28 | 30 | -24/+45 |
| | |\ \ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" | Tianjie Xu | 2017-03-28 | 30 | -24/+45 |
| | | |\ \ \ \ \ \ \
| | | | | |/ / / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" | Tianjie Xu | 2017-03-28 | 30 | -24/+45 |
| | | | |\ \ \ \ \ \
| | | | | |_|_|_|/ /
| | | | |/| | | | | |
|
| | | | | * | | | | | Add the missing sr-Latn into png files and rename the png locale header | Tianjie Xu | 2017-03-25 | 30 | -24/+45 |
* | | | | | | | | | | Merge changes from topic 'sinkfn' am: 34df98ee6d am: 862b7e8523 am: a2015e0d86 | Tao Bao | 2017-03-28 | 7 | -161/+128 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge changes from topic 'sinkfn' am: 34df98ee6d am: 862b7e8523 | Tao Bao | 2017-03-28 | 7 | -161/+128 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge changes from topic 'sinkfn' am: 34df98ee6d | Tao Bao | 2017-03-28 | 7 | -161/+128 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge changes from topic 'sinkfn' | Tao Bao | 2017-03-28 | 7 | -161/+128 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge changes from topic 'sinkfn' | Treehugger Robot | 2017-03-28 | 7 | -231/+190 |
| | | | |\ \ \ \ \ \
| | | | | |_|_|_|/ /
| | | | |/| | | | | |
|
| | | | | * | | | | | applypatch: Let Apply{BSDiff,Image}Patch accept std::function. | Tao Bao | 2017-03-28 | 7 | -161/+128 |
* | | | | | | | | | | applypatch: Change the ssize_t length parameters to size_t. am: f7eb760fe7 am: d4d9ef3941 am: 52569ce2ed | Tao Bao | 2017-03-28 | 7 | -89/+81 |
|\| | | | | | | | | |
|
| * | | | | | | | | | applypatch: Change the ssize_t length parameters to size_t. am: f7eb760fe7 am: d4d9ef3941 | Tao Bao | 2017-03-28 | 7 | -89/+81 |
| |\| | | | | | | | |
|
| | * | | | | | | | | applypatch: Change the ssize_t length parameters to size_t. am: f7eb760fe7 | Tao Bao | 2017-03-28 | 7 | -89/+81 |
| | |\| | | | | | | |
|
| | | * | | | | | | | applypatch: Change the ssize_t length parameters to size_t. | Tao Bao | 2017-03-28 | 7 | -89/+81 |
| | | |\ \ \ \ \ \ \
| | | | | |/ / / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | applypatch: Change the ssize_t length parameters to size_t. | Tao Bao | 2017-03-28 | 7 | -89/+81 |
| | | | |/ / / / / |
|
* | | | | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069d am: 21b5268fbd | Tao Bao | 2017-03-28 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069d | Tao Bao | 2017-03-28 | 1 | -146/+143 |
| |\| | | | | | |
| | |_|_|_|/ / /
| |/| | | | | | |
|
* | | | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069d | Tao Bao | 2017-03-28 | 1 | -146/+143 |
|\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| / / / / / /
| |/ / / / / / |
|
| * | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 | Tao Bao | 2017-03-28 | 1 | -146/+143 |
| |\| | | | | |
|
| | * | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." | Tao Bao | 2017-03-28 | 1 | -146/+143 |
| | |\| | | | |
|
| | | * | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." | Tao Bao | 2017-03-28 | 1 | -146/+143 |
| | | |\ \ \ \
| | | | |_|/ /
| | | |/| | | |
|
| | | | * | | | updater: Clean up LoadSrcTgtVersion2(). | Tao Bao | 2017-03-28 | 1 | -146/+143 |
| | | | | |/
| | | | |/| |
|
* | | | | | | Merge "tests: Construct signature-boundary.zip at runtime." | Tao Bao | 2017-03-28 | 2 | -2/+18 |
|\ \ \ \ \ \ |
|
| * | | | | | | tests: Construct signature-boundary.zip at runtime. | Tao Bao | 2017-03-27 | 2 | -2/+18 |
* | | | | | | | Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" am: 27c3e47853 am: b0e768e269 | Tao Bao | 2017-03-27 | 1 | -8/+2 |
|\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| * | | | | | | Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" am: 27c3e47853 | Tao Bao | 2017-03-27 | 1 | -8/+2 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" | Tao Bao | 2017-03-27 | 1 | -8/+2 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" | Tao Bao | 2017-03-27 | 1 | -8/+2 |
| | | |\ \ \ \ |
|
| | | | * | | | | Revert "libbootloader_message: use different fstab paths for normal/recovery boot" | Bowgo Tsai | 2017-03-27 | 1 | -8/+2 |
* | | | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" am: df0619edea -s ours am: a97b0712d8 -s ours | Tianjie Xu | 2017-03-27 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" am: df0619edea -s ours | Tianjie Xu | 2017-03-27 | 0 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" | Tianjie Xu | 2017-03-27 | 0 | -0/+0 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" | Tianjie Xu | 2017-03-27 | 1 | -5/+9 |
| | | |\ \ \ \ \
| | | | |_|_|/ /
| | | |/| | | | |
|
| | | | * | | | | Skip logging the warning for uncrypt_status for devices w/o /cache | Tianjie Xu | 2017-03-26 | 1 | -5/+9 |
| | | | | |_|/
| | | | |/| | |
|
* | | | | | | | Skip logging the warning for uncrypt_status for devices w/o /cache am: 340e6762f8 | Tianjie Xu | 2017-03-27 | 0 | -0/+0 |
|\| | | | | |
| |_|_|_|_|/
|/| | | | | |
|
| * | | | | | Skip logging the warning for uncrypt_status for devices w/o /cache | Tianjie Xu | 2017-03-27 | 0 | -0/+0 |
| |\| | | | |
|
| | * | | | | Skip logging the warning for uncrypt_status for devices w/o /cache | Tianjie Xu | 2017-03-27 | 1 | -5/+9 |
* | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" into nyc-mr2-dev-plus-aosp | Tianjie Xu | 2017-03-27 | 1 | -5/+9 |
|\| | | | | |
|
| * | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" into nyc-mr2-dev-plus-aosp | Tianjie Xu | 2017-03-27 | 1 | -5/+9 |
| |\ \ \ \ \ |
|
| | * | | | | | Skip logging the warning for uncrypt_status for devices w/o /cache | Tianjie Xu | 2017-03-26 | 1 | -5/+9 |
* | | | | | | | Merge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494 am: 351f69e64a | Tao Bao | 2017-03-26 | 2 | -401/+109 |
|\| | | | | | |
|
| * | | | | | | Merge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494 | Tao Bao | 2017-03-26 | 2 | -401/+109 |
| |\ \ \ \ \ \
| | |/ / / / /
| |/| / / / /
| | |/ / / / |
|
| | * | | | | Merge "applypatch: Drop the support for patching non-EMMC targets." | Tao Bao | 2017-03-26 | 2 | -401/+109 |
| | |\| | | |
|
| | | * | | | Merge "applypatch: Drop the support for patching non-EMMC targets." | Tao Bao | 2017-03-26 | 2 | -401/+109 |
| | | |\ \ \ |
|
| | | | * | | | applypatch: Drop the support for patching non-EMMC targets. | Tao Bao | 2017-03-16 | 2 | -401/+109 |
* | | | | | | | Merge "Don't fail ReadArgs if length to parse is 0" am: f4c949a41e am: e102ea13ee | Tianjie Xu | 2017-03-26 | 1 | -1/+1 |
|\| | | | | | |
|
| * | | | | | | Merge "Don't fail ReadArgs if length to parse is 0" am: f4c949a41e | Tianjie Xu | 2017-03-26 | 1 | -1/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "Don't fail ReadArgs if length to parse is 0" | Tianjie Xu | 2017-03-26 | 1 | -1/+1 |
| | |\| | | | |
|
| | | * | | | | Merge "Don't fail ReadArgs if length to parse is 0" | Tianjie Xu | 2017-03-26 | 1 | -1/+1 |
| | | |\ \ \ \ |
|
| | | | * | | | | Don't fail ReadArgs if length to parse is 0 | Tianjie Xu | 2017-03-23 | 1 | -1/+1 |
| | | | | |/ /
| | | | |/| | |
|
* | | | | | | | Merge "updater: Remove some redundant arguments." am: 5212a00588 am: 4ae56a3586 | Tao Bao | 2017-03-26 | 1 | -78/+65 |
|\| | | | | | |
|
| * | | | | | | Merge "updater: Remove some redundant arguments." am: 5212a00588 | Tao Bao | 2017-03-26 | 1 | -78/+65 |
| |\| | | | | |
|
| | * | | | | | Merge "updater: Remove some redundant arguments." | Tao Bao | 2017-03-26 | 1 | -78/+65 |
| | |\| | | | |
|
| | | * | | | | Merge "updater: Remove some redundant arguments." | Tao Bao | 2017-03-26 | 1 | -78/+65 |
| | | |\ \ \ \ |
|
| | | | * | | | | updater: Remove some redundant arguments. | Tao Bao | 2017-03-24 | 1 | -78/+65 |
* | | | | | | | | Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c1e am: 85882b0779 | Bowgo Tsai | 2017-03-25 | 1 | -2/+8 |
|\| | | | | | | |
|
| * | | | | | | | Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c1e | Bowgo Tsai | 2017-03-25 | 1 | -2/+8 |
| |\| | | | | | |
|
| | * | | | | | | Merge "libbootloader_message: use different fstab paths for normal/recovery boot" | Bowgo Tsai | 2017-03-25 | 1 | -2/+8 |
| | |\| | | | | |
|
| | | * | | | | | Merge "libbootloader_message: use different fstab paths for normal/recovery boot" | Treehugger Robot | 2017-03-25 | 1 | -2/+8 |
| | | |\ \ \ \ \
| | | | | |_|_|/
| | | | |/| | | |
|
| | | | * | | | | libbootloader_message: use different fstab paths for normal/recovery boot | Bowgo Tsai | 2017-03-25 | 1 | -2/+8 |
* | | | | | | | | Merge "updater: Drop the support for BBOTA v1 and v2." am: 5479506c9c am: 7b82ad12f6 | Tao Bao | 2017-03-25 | 1 | -398/+330 |
|\| | | | | | | |
|
| * | | | | | | | Merge "updater: Drop the support for BBOTA v1 and v2." am: 5479506c9c | Tao Bao | 2017-03-25 | 1 | -398/+330 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater: Drop the support for BBOTA v1 and v2." | Tao Bao | 2017-03-25 | 1 | -398/+330 |
| | |\| | | | | |
|
| | | * | | | | | Merge "updater: Drop the support for BBOTA v1 and v2." | Tao Bao | 2017-03-25 | 1 | -398/+330 |
| | | |\ \ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | * | | | | updater: Drop the support for BBOTA v1 and v2. | Tao Bao | 2017-03-24 | 1 | -398/+330 |
| | | | | |/ /
| | | | |/| | |
|
* | | | | | | | Merge "Const modifiers" am: 4efd353d8f am: 92d8772c49 | Tao Bao | 2017-03-24 | 6 | -11/+11 |
|\| | | | | | |
|
| * | | | | | | Merge "Const modifiers" am: 4efd353d8f | Tao Bao | 2017-03-24 | 6 | -11/+11 |
| |\| | | | | |
|
| | * | | | | | Merge "Const modifiers" | Tao Bao | 2017-03-24 | 6 | -11/+11 |
| | |\| | | | |
|
| | | * | | | | Merge "Const modifiers" | Tao Bao | 2017-03-24 | 6 | -11/+11 |
| | | |\ \ \ \ |
|
| | | | * | | | | Const modifiers | Mikhail Lappo | 2017-03-23 | 6 | -11/+11 |
* | | | | | | | | Merge "Removed C-style casts" am: 110155a604 am: 6a831e02b6 | Tao Bao | 2017-03-24 | 3 | -3/+3 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Removed C-style casts" am: 110155a604 | Tao Bao | 2017-03-24 | 3 | -3/+3 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Removed C-style casts" | Tao Bao | 2017-03-24 | 3 | -3/+3 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Removed C-style casts" | Tao Bao | 2017-03-24 | 3 | -3/+3 |
| | | |\| | | | |
|
| | | | * | | | | Removed C-style casts | Mikhail Lappo | 2017-03-23 | 3 | -3/+3 |
* | | | | | | | | Merge "Fix the wrong parameter when calling read_metadata_from_package()." am: 6014db5da6 am: 5da7e41ec8 | Tao Bao | 2017-03-24 | 1 | -37/+35 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Fix the wrong parameter when calling read_metadata_from_package()." am: 6014db5da6 | Tao Bao | 2017-03-24 | 1 | -37/+35 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Fix the wrong parameter when calling read_metadata_from_package()." | Tao Bao | 2017-03-24 | 1 | -37/+35 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Fix the wrong parameter when calling read_metadata_from_package()." | Tao Bao | 2017-03-24 | 1 | -37/+35 |
| | | |\ \ \ \ \
| | | | |_|_|/ /
| | | |/| | | | |
|
| | | | * | | | | Fix the wrong parameter when calling read_metadata_from_package(). | Tao Bao | 2017-03-24 | 1 | -37/+35 |
| | | | | |/ /
| | | | |/| | |
|
* | | | | | | | Merge "Reword the wipe warning message to be more comprehensible." am: f09efaff89 am: eddc9a15f9 | Paul Crowley | 2017-03-24 | 1 | -4/+6 |
|\| | | | | | |
|
| * | | | | | | Merge "Reword the wipe warning message to be more comprehensible." am: f09efaff89 | Paul Crowley | 2017-03-24 | 1 | -4/+6 |
| |\| | | | | |
|
| | * | | | | | Merge "Reword the wipe warning message to be more comprehensible." | Paul Crowley | 2017-03-24 | 1 | -4/+6 |
| | |\| | | | |
|
| | | * | | | | Merge "Reword the wipe warning message to be more comprehensible." | Treehugger Robot | 2017-03-24 | 1 | -4/+6 |
| | | |\ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | | * | | | Reword the wipe warning message to be more comprehensible. | Paul Crowley | 2017-03-23 | 1 | -4/+6 |
| | | |/ / / |
|
* | | | | | | Merge "Redundant checking of STL container element" am: b56a3c2e3a am: 9e05f26e1a | Tao Bao | 2017-03-23 | 1 | -3/+1 |
|\| | | | | |
|
| * | | | | | Merge "Redundant checking of STL container element" am: b56a3c2e3a | Tao Bao | 2017-03-23 | 1 | -3/+1 |
| |\| | | | |
|
| | * | | | | Merge "Redundant checking of STL container element" | Tao Bao | 2017-03-23 | 1 | -3/+1 |
| | |\| | | |
|
| | | * | | | Merge "Redundant checking of STL container element" | Tao Bao | 2017-03-23 | 1 | -3/+1 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | Redundant checking of STL container element | Mikhail Lappo | 2017-03-23 | 1 | -3/+1 |
* | | | | | | Merge "Checking unsigned variable less than zero" am: 0d264bf088 am: 957f6491f8 | Tao Bao | 2017-03-23 | 1 | -2/+2 |
|\| | | | | |
|
| * | | | | | Merge "Checking unsigned variable less than zero" am: 0d264bf088 | Tao Bao | 2017-03-23 | 1 | -2/+2 |
| |\| | | | |
|
| | * | | | | Merge "Checking unsigned variable less than zero" | Tao Bao | 2017-03-23 | 1 | -2/+2 |
| | |\| | | |
|
| | | * | | | Merge "Checking unsigned variable less than zero" | Tao Bao | 2017-03-23 | 1 | -2/+2 |
| | | |\| | |
|
| | | | * | | Checking unsigned variable less than zero | Mikhail Lappo | 2017-03-23 | 1 | -2/+2 |
* | | | | | | Merge "Fixed scanf modifier" am: 577c668861 am: d414ae465e | Tao Bao | 2017-03-23 | 1 | -1/+1 |
|\| | | | | |
|
| * | | | | | Merge "Fixed scanf modifier" am: 577c668861 | Tao Bao | 2017-03-23 | 1 | -1/+1 |
| |\| | | | |
|
| | * | | | | Merge "Fixed scanf modifier" | Tao Bao | 2017-03-23 | 1 | -1/+1 |
| | |\| | | |
|
| | | * | | | Merge "Fixed scanf modifier" | Tao Bao | 2017-03-23 | 1 | -1/+1 |
| | | |\| | |
|
| | | | * | | Fixed scanf modifier | Mikhail Lappo | 2017-03-23 | 1 | -1/+1 |
* | | | | | | Merge "updater: Fix the broken case for apply_patch_check()." am: 9f2062657d am: 923d41ccd5 | Tao Bao | 2017-03-23 | 2 | -1/+50 |
|\| | | | | |
|
| * | | | | | Merge "updater: Fix the broken case for apply_patch_check()." am: 9f2062657d | Tao Bao | 2017-03-23 | 2 | -1/+50 |
| |\| | | | |
|
| | * | | | | Merge "updater: Fix the broken case for apply_patch_check()." | Tao Bao | 2017-03-23 | 2 | -1/+50 |
| | |\| | | |
|
| | | * | | | Merge "updater: Fix the broken case for apply_patch_check()." | Tao Bao | 2017-03-23 | 2 | -1/+50 |
| | | |\ \ \ |
|
| | | | * | | | updater: Fix the broken case for apply_patch_check(). | Tao Bao | 2017-03-23 | 2 | -1/+50 |
| | | | |/ / |
|
* | | | | | | Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." am: 833442cf4e am: ca9c1e0965 | Tao Bao | 2017-03-23 | 1 | -2/+3 |
|\| | | | | |
|
| * | | | | | Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." am: 833442cf4e | Tao Bao | 2017-03-23 | 1 | -2/+3 |
| |\| | | | |
|
| | * | | | | Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." | Tao Bao | 2017-03-23 | 1 | -2/+3 |
| | |\| | | |
|
| | | * | | | Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." | Tao Bao | 2017-03-23 | 1 | -2/+3 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | recovery: Replace the hard-coded 1000 with AID_SYSTEM. | Tao Bao | 2017-03-22 | 1 | -2/+3 |
* | | | | | | Merge "Remove malloc in edify functions" am: 1ea869b0c6 am: 137d85333e | Tianjie Xu | 2017-03-23 | 9 | -257/+331 |
|\| | | | | |
|
| * | | | | | Merge "Remove malloc in edify functions" am: 1ea869b0c6 | Tianjie Xu | 2017-03-23 | 9 | -257/+331 |
| |\| | | | |
|
| | * | | | | Merge "Remove malloc in edify functions" | Tianjie Xu | 2017-03-23 | 9 | -257/+331 |
| | |\| | | |
|
| | | * | | | Merge "Remove malloc in edify functions" | Tianjie Xu | 2017-03-23 | 9 | -257/+331 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | Remove malloc in edify functions | Tianjie Xu | 2017-03-22 | 9 | -257/+331 |
| | | |/ / |
|
* | | | | | Merge "Fix the permission of stashed blocks created by updater" am: d882b8892a am: deb2a29a42 | Tianjie Xu | 2017-03-22 | 1 | -0/+12 |
|\| | | | |
|
| * | | | | Merge "Fix the permission of stashed blocks created by updater" am: d882b8892a | Tianjie Xu | 2017-03-22 | 1 | -0/+12 |
| |\| | | |
|
| | * | | | Merge "Fix the permission of stashed blocks created by updater" | Tianjie Xu | 2017-03-22 | 1 | -0/+12 |
| | |\| | |
|
| | | * | | Merge "Fix the permission of stashed blocks created by updater" | Tianjie Xu | 2017-03-22 | 1 | -0/+12 |
| | | |\ \ |
|
| | | | * | | Fix the permission of stashed blocks created by updater | Tianjie Xu | 2017-03-22 | 1 | -0/+12 |
* | | | | | | Merge "Refactor asn1_decoder functions into a class." am: ea3d0b923d am: d7846b7303 | Tao Bao | 2017-03-22 | 4 | -410/+361 |
|\| | | | | |
|
| * | | | | | Merge "Refactor asn1_decoder functions into a class." am: ea3d0b923d | Tao Bao | 2017-03-22 | 4 | -410/+361 |
| |\| | | | |
|
| | * | | | | Merge "Refactor asn1_decoder functions into a class." | Tao Bao | 2017-03-22 | 4 | -410/+361 |
| | |\| | | |
|
| | | * | | | Merge "Refactor asn1_decoder functions into a class." | Tao Bao | 2017-03-22 | 4 | -410/+361 |
| | | |\ \ \ |
|
| | | | * | | | Refactor asn1_decoder functions into a class. | Tao Bao | 2017-03-21 | 4 | -410/+361 |
* | | | | | | | Merge "Fix updater include generation w/installclean" am: 6d0262218a am: c1cb30f842 | Dan Willemsen | 2017-03-22 | 1 | -16/+4 |
|\| | | | | | |
|
| * | | | | | | Merge "Fix updater include generation w/installclean" am: 6d0262218a | Dan Willemsen | 2017-03-22 | 1 | -16/+4 |
| |\| | | | | |
|
| | * | | | | | Merge "Fix updater include generation w/installclean" | Dan Willemsen | 2017-03-22 | 1 | -16/+4 |
| | |\| | | | |
|
| | | * | | | | Merge "Fix updater include generation w/installclean" | Treehugger Robot | 2017-03-22 | 1 | -16/+4 |
| | | |\ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | | * | | | Fix updater include generation w/installclean | Dan Willemsen | 2017-03-22 | 1 | -16/+4 |
* | | | | | | | Merge "verify_file: Add constness to a few addresses." am: 5b2bf90e13 am: 43bd2c8414 | Tao Bao | 2017-03-21 | 6 | -79/+78 |
|\| | | | | | |
|
| * | | | | | | Merge "verify_file: Add constness to a few addresses." am: 5b2bf90e13 | Tao Bao | 2017-03-21 | 6 | -79/+78 |
| |\| | | | | |
|
| | * | | | | | Merge "verify_file: Add constness to a few addresses." | Tao Bao | 2017-03-21 | 6 | -79/+78 |
| | |\| | | | |
|
| | | * | | | | Merge "verify_file: Add constness to a few addresses." | Tao Bao | 2017-03-21 | 6 | -79/+78 |
| | | |\ \ \ \
| | | | |_|/ /
| | | |/| | | |
|
| | | | * | | | verify_file: Add constness to a few addresses. | Tao Bao | 2017-03-21 | 6 | -79/+78 |
| | | |/ / / |
|
* | | | | | | Merge "Add testcases for load_keys()." am: 110102f37e am: 43f5ad6e90 | Tao Bao | 2017-03-20 | 1 | -0/+57 |
|\| | | | | |
|
| * | | | | | Merge "Add testcases for load_keys()." am: 110102f37e | Tao Bao | 2017-03-20 | 1 | -0/+57 |
| |\| | | | |
|
| | * | | | | Merge "Add testcases for load_keys()." | Tao Bao | 2017-03-20 | 1 | -0/+57 |
| | |\| | | |
|
| | | * | | | Merge "Add testcases for load_keys()." | Tao Bao | 2017-03-20 | 1 | -0/+57 |
| | | |\ \ \ |
|
| | | | * | | | Add testcases for load_keys(). | Tao Bao | 2017-03-18 | 1 | -0/+57 |
* | | | | | | | Merge "Remove the dead #include's in verifier.cpp." am: 64d25024b9 am: b2617e882e | Tao Bao | 2017-03-20 | 3 | -8/+2 |
|\| | | | | | |
|
| * | | | | | | Merge "Remove the dead #include's in verifier.cpp." am: 64d25024b9 | Tao Bao | 2017-03-20 | 3 | -8/+2 |
| |\| | | | | |
|
| | * | | | | | Merge "Remove the dead #include's in verifier.cpp." | Tao Bao | 2017-03-20 | 3 | -8/+2 |
| | |\| | | | |
|
| | | * | | | | Merge "Remove the dead #include's in verifier.cpp." | Tao Bao | 2017-03-20 | 3 | -8/+2 |
| | | |\ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | | * | | | Remove the dead #include's in verifier.cpp. | Tao Bao | 2017-03-18 | 3 | -8/+2 |
| | | |/ / / |
|
* | | | | | | resolve merge conflicts of 90d3f20c to stage-aosp-master am: 553c7bd307 | Tao Bao | 2017-03-18 | 0 | -0/+0 |
|\| | | | | |
|
| * | | | | | resolve merge conflicts of 90d3f20c to stage-aosp-master | Tao Bao | 2017-03-18 | 4 | -302/+240 |
| |\| | | | |
|
| | * | | | | resolve merge conflicts of 90d3f20c to stage-aosp-master | Tao Bao | 2017-03-18 | 4 | -302/+240 |
| | |\| | | |
|
| | | * | | | Merge "Drop the dependency on 'ui' in verify_file()." | Tao Bao | 2017-03-18 | 4 | -297/+235 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | Drop the dependency on 'ui' in verify_file(). | Tao Bao | 2017-03-17 | 4 | -297/+235 |
* | | | | | | Merge "Drop the dependency on 'ui' in verify_file()." | Tao Bao | 2017-03-18 | 4 | -303/+241 |
|\ \ \ \ \ \ |
|
| * | | | | | | Drop the dependency on 'ui' in verify_file(). | Tao Bao | 2017-03-17 | 4 | -303/+241 |
* | | | | | | | Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks""" am: 73cb75b46c am: 9accc96dd1 | Tianjie Xu | 2017-03-17 | 1 | -6/+140 |
|\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| * | | | | | | Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks""" am: 73cb75b46c | Tianjie Xu | 2017-03-17 | 1 | -6/+140 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks""" | Tianjie Xu | 2017-03-17 | 1 | -6/+140 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks""" | Tianjie Xu | 2017-03-17 | 1 | -6/+140 |
| | | |\ \ \ \ |
|
| | | | * | | | | Revert "Revert "Print SHA-1 in hex for corrupted blocks"" | Tianjie Xu | 2017-03-17 | 1 | -6/+140 |
* | | | | | | | | Merge "Add a test to perform block_image_update" am: 881b08ecd2 am: 5c06706d51 | Tianjie Xu | 2017-03-17 | 2 | -6/+123 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Add a test to perform block_image_update" am: 881b08ecd2 | Tianjie Xu | 2017-03-17 | 2 | -6/+123 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Add a test to perform block_image_update" | Tianjie Xu | 2017-03-17 | 2 | -6/+123 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Add a test to perform block_image_update" | Tianjie Xu | 2017-03-17 | 2 | -6/+123 |
| | | |\ \ \ \ \
| | | | |_|_|/ /
| | | |/| | | | |
|
| | | | * | | | | Add a test to perform block_image_update | Tianjie Xu | 2017-03-17 | 2 | -6/+123 |
| | | | | |_|/
| | | | |/| | |
|
* | | | | | | | Merge "Add the missing #include of <functional>." am: dd553d280f am: 965021ab8d | Tao Bao | 2017-03-17 | 2 | -0/+3 |
|\| | | | | | |
|
| * | | | | | | Merge "Add the missing #include of <functional>." am: dd553d280f | Tao Bao | 2017-03-17 | 2 | -0/+3 |
| |\| | | | | |
|
| | * | | | | | Merge "Add the missing #include of <functional>." | Tao Bao | 2017-03-17 | 2 | -0/+3 |
| | |\| | | | |
|
| | | * | | | | Merge "Add the missing #include of <functional>." | Tao Bao | 2017-03-17 | 2 | -0/+3 |
| | | |\ \ \ \
| | | | |_|/ /
| | | |/| | | |
|
| | | | * | | | Add the missing #include of <functional>. | Tao Bao | 2017-03-17 | 2 | -0/+3 |
| | | |/ / / |
|
* | | | | | | Merge "More cleanup to imgdiff & imgpatch" am: 3541934ff5 am: 91f8574061 | Tianjie Xu | 2017-03-17 | 6 | -197/+133 |
|\| | | | | |
|
| * | | | | | Merge "More cleanup to imgdiff & imgpatch" am: 3541934ff5 | Tianjie Xu | 2017-03-17 | 6 | -197/+133 |
| |\| | | | |
|
| | * | | | | Merge "More cleanup to imgdiff & imgpatch" | Tianjie Xu | 2017-03-17 | 6 | -197/+133 |
| | |\| | | |
|
| | | * | | | Merge "More cleanup to imgdiff & imgpatch" | Treehugger Robot | 2017-03-17 | 6 | -197/+133 |
| | | |\ \ \ |
|
| | | | * | | | More cleanup to imgdiff & imgpatch | Tianjie Xu | 2017-03-16 | 6 | -197/+133 |
| | | | |/ / |
|
* | | | | | | Merge "updater: Minor clean up to EnumerateStash()." am: 4fc7659612 am: 8209daeff1 | Tao Bao | 2017-03-17 | 1 | -73/+50 |
|\| | | | | |
|
| * | | | | | Merge "updater: Minor clean up to EnumerateStash()." am: 4fc7659612 | Tao Bao | 2017-03-17 | 1 | -73/+50 |
| |\| | | | |
|
| | * | | | | Merge "updater: Minor clean up to EnumerateStash()." | Tao Bao | 2017-03-17 | 1 | -73/+50 |
| | |\| | | |
|
| | | * | | | Merge "updater: Minor clean up to EnumerateStash()." | Tao Bao | 2017-03-17 | 1 | -73/+50 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | updater: Minor clean up to EnumerateStash(). | Tao Bao | 2017-03-16 | 1 | -73/+50 |
| | | |/ / |
|
* | | | / | Merge "Revert "Print SHA-1 in hex for corrupted blocks"" am: 06f6227f1d am: 8acce85be8 | Tao Bao | 2017-03-15 | 1 | -140/+3 |
|\| | | |
| |_|_|/
|/| | | |
|
| * | | | Merge "Revert "Print SHA-1 in hex for corrupted blocks"" am: 06f6227f1d | Tao Bao | 2017-03-15 | 1 | -140/+3 |
| |\| | |
|
| | * | | Merge "Revert "Print SHA-1 in hex for corrupted blocks"" | Tao Bao | 2017-03-15 | 1 | -140/+3 |
| | |\| |
|
| | | * | Merge "Revert "Print SHA-1 in hex for corrupted blocks"" | Tao Bao | 2017-03-15 | 1 | -140/+3 |
| | | |\ |
|
| | | | * | Revert "Print SHA-1 in hex for corrupted blocks" | Tao Bao | 2017-03-15 | 1 | -140/+3 |
| | | |/ |
|
* | | | | Merge "updater: Remove some obsoleted functions for file-based OTA." am: 342717d148 am: 000f364c19 | Tao Bao | 2017-03-14 | 2 | -475/+0 |
|\| | | |
|
| * | | | Merge "updater: Remove some obsoleted functions for file-based OTA." am: 342717d148 | Tao Bao | 2017-03-14 | 2 | -475/+0 |
| |\| | |
|
| | * | | Merge "updater: Remove some obsoleted functions for file-based OTA." | Tao Bao | 2017-03-14 | 2 | -475/+0 |
| | |\| |
|
| | | * | Merge "updater: Remove some obsoleted functions for file-based OTA." | Tao Bao | 2017-03-14 | 2 | -475/+0 |
| | | |\ |
|
| | | | * | updater: Remove some obsoleted functions for file-based OTA. | Tao Bao | 2017-03-13 | 2 | -475/+0 |
* | | | | | Merge "Print SHA-1 in hex for corrupted blocks" am: 59383b383c am: 821592aff4 | Tianjie Xu | 2017-03-13 | 1 | -3/+140 |
|\| | | | |
|
| * | | | | Merge "Print SHA-1 in hex for corrupted blocks" am: 59383b383c | Tianjie Xu | 2017-03-13 | 1 | -3/+140 |
| |\| | | |
|
| | * | | | Merge "Print SHA-1 in hex for corrupted blocks" | Tianjie Xu | 2017-03-13 | 1 | -3/+140 |
| | |\| | |
|
| | | * | | Merge "Print SHA-1 in hex for corrupted blocks" | Tianjie Xu | 2017-03-13 | 1 | -3/+140 |
| | | |\ \
| | | | |/
| | | |/| |
|
| | | | * | Print SHA-1 in hex for corrupted blocks | Tianjie Xu | 2017-03-13 | 1 | -3/+140 |
* | | | | | Merge "update_verifier: Set the success flag if dm-verity is not enabled." am: a7211b3c16 am: 6c6861d7c5 | Tao Bao | 2017-03-11 | 2 | -0/+9 |
|\| | | | |
|
| * | | | | Merge "update_verifier: Set the success flag if dm-verity is not enabled." am: a7211b3c16 | Tao Bao | 2017-03-11 | 2 | -0/+9 |
| |\| | | |
|
| | * | | | Merge "update_verifier: Set the success flag if dm-verity is not enabled." | Tao Bao | 2017-03-11 | 2 | -0/+9 |
| | |\| | |
|
| | | * | | Merge "update_verifier: Set the success flag if dm-verity is not enabled." | Tao Bao | 2017-03-11 | 2 | -0/+9 |
| | | |\ \ |
|
| | | | * | | update_verifier: Set the success flag if dm-verity is not enabled. | Tao Bao | 2017-03-11 | 2 | -0/+9 |
| | | |/ / |
|
* | | | | | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 7a0dfec771 am: 1a23257214 | Bowgo Tsai | 2017-03-10 | 4 | -44/+13 |
|\| | | | |
|
| * | | | | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 7a0dfec771 | Bowgo Tsai | 2017-03-10 | 4 | -44/+13 |
| |\| | | |
|
| | * | | | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" | Bowgo Tsai | 2017-03-10 | 4 | -44/+13 |
| | |\| | |
|
| | | * | | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" | Treehugger Robot | 2017-03-10 | 4 | -44/+13 |
| | | |\ \
| | | | |/
| | | |/| |
|
| | | | * | recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs | Bowgo Tsai | 2017-03-10 | 4 | -44/+13 |
| | | |/ |
|
* | | | | Merge "recovery: Fix the FIXME in get_menu_selection()." am: f0e8f0727e am: 316610763b | Tao Bao | 2017-03-08 | 1 | -99/+94 |
|\| | | |
|
| * | | | Merge "recovery: Fix the FIXME in get_menu_selection()." am: f0e8f0727e | Tao Bao | 2017-03-08 | 1 | -99/+94 |
| |\| | |
|
| | * | | Merge "recovery: Fix the FIXME in get_menu_selection()." | Tao Bao | 2017-03-08 | 1 | -99/+94 |
| | |\| |
|
| | | * | Merge "recovery: Fix the FIXME in get_menu_selection()." | Tao Bao | 2017-03-08 | 1 | -99/+94 |
| | | |\ |
|
| | | | * | recovery: Fix the FIXME in get_menu_selection(). | Tao Bao | 2017-03-08 | 1 | -99/+94 |
* | | | | | Merge "recovery: Move a few int to bool." am: cbb2bcf541 am: b97f06a5dd | Tao Bao | 2017-03-08 | 3 | -147/+142 |
|\| | | | |
|
| * | | | | Merge "recovery: Move a few int to bool." am: cbb2bcf541 | Tao Bao | 2017-03-08 | 3 | -147/+142 |
| |\| | | |
|
| | * | | | Merge "recovery: Move a few int to bool." | Tao Bao | 2017-03-08 | 3 | -147/+142 |
| | |\| | |
|
| | | * | | Merge "recovery: Move a few int to bool." | Tao Bao | 2017-03-08 | 3 | -147/+142 |
| | | |\| |
|
| | | | * | recovery: Move a few int to bool. | Tao Bao | 2017-03-08 | 3 | -147/+142 |
| | | |/ |
|
* | | | | Merge "recovery: Add the missing #include." am: b7f56f9b91 am: d988b56999 | Tao Bao | 2017-03-07 | 1 | -0/+2 |
|\| | | |
|
| * | | | Merge "recovery: Add the missing #include." am: b7f56f9b91 | Tao Bao | 2017-03-07 | 1 | -0/+2 |
| |\| | |
|
| | * | | Merge "recovery: Add the missing #include." | Tao Bao | 2017-03-07 | 1 | -0/+2 |
| | |\| |
|
| | | * | Merge "recovery: Add the missing #include." | Tao Bao | 2017-03-07 | 1 | -0/+2 |
| | | |\ |
|
| | | | * | recovery: Add the missing #include. | Tao Bao | 2017-03-07 | 1 | -0/+2 |
| | | |/ |
|
* | | | | Merge "recovery: Drop the "--stages" / '-g' argument." am: 9bd1dced90 am: ecf5467a82 | Tao Bao | 2017-03-07 | 2 | -14/+5 |
|\| | | |
|
| * | | | Merge "recovery: Drop the "--stages" / '-g' argument." am: 9bd1dced90 | Tao Bao | 2017-03-07 | 2 | -14/+5 |
| |\| | |
|
| | * | | Merge "recovery: Drop the "--stages" / '-g' argument." | Tao Bao | 2017-03-07 | 2 | -14/+5 |
| | |\| |
|
| | | * | Merge "recovery: Drop the "--stages" / '-g' argument." | Tao Bao | 2017-03-07 | 2 | -14/+5 |
| | | |\ |
|
| | | | * | recovery: Drop the "--stages" / '-g' argument. | Tao Bao | 2017-03-07 | 2 | -14/+5 |
* | | | | | Merge "recovery: Add SetStage() into 'Run graphics test'." am: 1a575f8d5f am: e303128144 | Tao Bao | 2017-03-07 | 1 | -25/+37 |
|\| | | | |
|
| * | | | | Merge "recovery: Add SetStage() into 'Run graphics test'." am: 1a575f8d5f | Tao Bao | 2017-03-07 | 1 | -25/+37 |
| |\| | | |
|
| | * | | | Merge "recovery: Add SetStage() into 'Run graphics test'." | Tao Bao | 2017-03-07 | 1 | -25/+37 |
| | |\| | |
|
| | | * | | Merge "recovery: Add SetStage() into 'Run graphics test'." | Tao Bao | 2017-03-07 | 1 | -25/+37 |
| | | |\ \ |
|
| | | | * | | recovery: Add SetStage() into 'Run graphics test'. | Tao Bao | 2017-03-07 | 1 | -25/+37 |
| | | | |/ |
|
* | | | | | Merge "recovery: Minor clean up to choose_recovery_file()." am: 73d21d1c1c am: 4a2bde2d26 | Tao Bao | 2017-03-07 | 1 | -51/+35 |
|\| | | | |
|
| * | | | | Merge "recovery: Minor clean up to choose_recovery_file()." am: 73d21d1c1c | Tao Bao | 2017-03-07 | 1 | -51/+35 |
| |\| | | |
|
| | * | | | Merge "recovery: Minor clean up to choose_recovery_file()." | Tao Bao | 2017-03-07 | 1 | -51/+35 |
| | |\| | |
|
| | | * | | Merge "recovery: Minor clean up to choose_recovery_file()." | Tao Bao | 2017-03-07 | 1 | -51/+35 |
| | | |\ \
| | | | |/
| | | |/| |
|
| | | | * | recovery: Minor clean up to choose_recovery_file(). | Tao Bao | 2017-03-07 | 1 | -51/+35 |
| | | |/ |
|
* | | | | Merge "Refractor the code for imgdiff" am: a2e7a07031 am: 68571e27d8 | Tianjie Xu | 2017-03-07 | 4 | -618/+653 |
|\| | | |
|
| * | | | Merge "Refractor the code for imgdiff" am: a2e7a07031 | Tianjie Xu | 2017-03-07 | 4 | -618/+653 |
| |\| | |
|
| | * | | Merge "Refractor the code for imgdiff" | Tianjie Xu | 2017-03-07 | 4 | -618/+653 |
| | |\| |
|
| | | * | Merge "Refractor the code for imgdiff" | Treehugger Robot | 2017-03-07 | 4 | -618/+653 |
| | | |\ |
|
| | | | * | Refractor the code for imgdiff | Tianjie Xu | 2017-03-07 | 4 | -618/+653 |
* | | | | | Merge "Fix an error on bootloadermessager test teardown" am: b694ba8aab am: 536989892c | Tianjie Xu | 2017-03-03 | 1 | -2/+4 |
|\| | | | |
|
| * | | | | Merge "Fix an error on bootloadermessager test teardown" am: b694ba8aab | Tianjie Xu | 2017-03-03 | 1 | -2/+4 |
| |\| | | |
|
| | * | | | Merge "Fix an error on bootloadermessager test teardown" | Tianjie Xu | 2017-03-03 | 1 | -2/+4 |
| | |\| | |
|
| | | * | | Merge "Fix an error on bootloadermessager test teardown" | Tianjie Xu | 2017-03-03 | 1 | -2/+4 |
| | | |\ \ |
|
| | | | * | | Fix an error on bootloadermessager test teardown | Tianjie Xu | 2017-03-03 | 1 | -2/+4 |
| | | | |/ |
|
* | | | | | Merge "Recovery Test: add SideloadTest to test FUSE support on target" am: 53feebea4f am: 3d605c54e3 | Wei Wang | 2017-03-03 | 2 | -0/+22 |
|\| | | | |
|
| * | | | | Merge "Recovery Test: add SideloadTest to test FUSE support on target" am: 53feebea4f | Wei Wang | 2017-03-03 | 2 | -0/+22 |
| |\| | | |
|
| | * | | | Merge "Recovery Test: add SideloadTest to test FUSE support on target" | Wei Wang | 2017-03-03 | 2 | -0/+22 |
| | |\| | |
|
| | | * | | Merge "Recovery Test: add SideloadTest to test FUSE support on target" | Treehugger Robot | 2017-03-03 | 2 | -0/+22 |
| | | |\ \
| | | | |/
| | | |/| |
|
| | | | * | Recovery Test: add SideloadTest to test FUSE support on target | Wei Wang | 2017-03-03 | 2 | -0/+22 |
| | | |/ |
|
* | | | | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" am: 0f26468eda am: 5cce91a95a | Tianjie Xu | 2017-03-01 | 3 | -3/+111 |
|\| | | |
|
| * | | | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" am: 0f26468eda | Tianjie Xu | 2017-03-01 | 3 | -3/+111 |
| |\| | |
|
| | * | | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" | Tianjie Xu | 2017-03-01 | 3 | -3/+111 |
| | |\| |
|
| | | * | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" | Treehugger Robot | 2017-03-01 | 3 | -3/+111 |
| | | |\ |
|
| | | | * | Skip BootloaderMessageTest, UncryptTest for devices without /misc | Tianjie Xu | 2017-03-01 | 3 | -3/+111 |
* | | | | | Merge "recovery: Remember the last log position." am: d549616b24 am: 6691dacf56 | Tao Bao | 2017-03-01 | 1 | -1/+2 |
|\| | | | |
|
| * | | | | Merge "recovery: Remember the last log position." am: d549616b24 | Tao Bao | 2017-03-01 | 1 | -1/+2 |
| |\| | | |
|
| | * | | | Merge "recovery: Remember the last log position." | Tao Bao | 2017-03-01 | 1 | -1/+2 |
| | |\| | |
|
| | | * | | Merge "recovery: Remember the last log position." | Tao Bao | 2017-03-01 | 1 | -1/+2 |
| | | |\ \
| | | | |/
| | | |/| |
|
| | | | * | recovery: Remember the last log position. | Tao Bao | 2017-03-01 | 1 | -1/+2 |
| | | |/ |
|
* | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-02-28 | 1 | -1/+1 |
* | | | | Merge "recovery: Don't show "No /cache partition found" on screen." am: 021304503a am: 7c77883b06 | Tao Bao | 2017-02-24 | 1 | -1/+0 |
|\| | | |
|
| * | | | Merge "recovery: Don't show "No /cache partition found" on screen." am: 021304503a | Tao Bao | 2017-02-24 | 1 | -1/+0 |
| |\| | |
|
| | * | | Merge "recovery: Don't show "No /cache partition found" on screen." | Tao Bao | 2017-02-24 | 1 | -1/+0 |
| | |\| |
|
| | | * | Merge "recovery: Don't show "No /cache partition found" on screen." | Treehugger Robot | 2017-02-24 | 1 | -1/+0 |
| | | |\ |
|
| | | | * | recovery: Don't show "No /cache partition found" on screen. | Tao Bao | 2017-02-24 | 1 | -1/+0 |
* | | | | | Merge "Add a missing #include for openat(2)." am: 3ac0dd2a56 am: cdfe2895b4 | Elliott Hughes | 2017-02-24 | 1 | -0/+1 |
|\| | | | |
|
| * | | | | Merge "Add a missing #include for openat(2)." am: 3ac0dd2a56 | Elliott Hughes | 2017-02-24 | 1 | -0/+1 |
| |\| | | |
|
| | * | | | Merge "Add a missing #include for openat(2)." | Elliott Hughes | 2017-02-24 | 1 | -0/+1 |
| |/| | |
| | |/ / |
|
| | * | | Merge "Add a missing #include for openat(2)." | Elliott Hughes | 2017-02-24 | 1 | -0/+1 |
| | |\ \ |
|
| | | * | | Add a missing #include for openat(2). | Elliott Hughes | 2017-02-23 | 1 | -0/+1 |
| | |/ / |
|
* | | | | Merge "Use bspatch from external/bsdiff." am: f9962dbfe2 am: 2c467f6e49 am: 6f06890343 | Sen Jiang | 2017-02-16 | 5 | -183/+31 |
|\| | | |
|
| * | | | Merge "Use bspatch from external/bsdiff." am: f9962dbfe2 am: 2c467f6e49 | Sen Jiang | 2017-02-16 | 5 | -183/+31 |
| |\ \ \ |
|
| | * \ \ | Merge "Use bspatch from external/bsdiff." am: f9962dbfe2 | Sen Jiang | 2017-02-16 | 5 | -183/+31 |
| | |\ \ \ |
|
| | | * | | | Merge "Use bspatch from external/bsdiff." | Sen Jiang | 2017-02-16 | 5 | -183/+31 |
| | | |\| | |
|
| | | | * | | Merge "Use bspatch from external/bsdiff." | Sen Jiang | 2017-02-16 | 5 | -183/+31 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | Use bspatch from external/bsdiff. | Sen Jiang | 2017-02-02 | 5 | -183/+31 |
* | | | | | | Merge "recovery: Clean up browse_directory()." am: 635eb1c83e am: c42d44bbeb am: 19e7776451 | Tao Bao | 2017-02-14 | 1 | -92/+55 |
|\| | | | | |
|
| * | | | | | Merge "recovery: Clean up browse_directory()." am: 635eb1c83e am: c42d44bbeb | Tao Bao | 2017-02-14 | 1 | -92/+55 |
| |\| | | | |
|
| | * | | | | Merge "recovery: Clean up browse_directory()." am: 635eb1c83e | Tao Bao | 2017-02-14 | 1 | -92/+55 |
| | |\| | | |
|
| | | * | | | Merge "recovery: Clean up browse_directory()." | Tao Bao | 2017-02-14 | 1 | -92/+55 |
| | | |\| | |
|
| | | | * | | Merge "recovery: Clean up browse_directory()." | Tao Bao | 2017-02-14 | 1 | -92/+55 |
| | | | |\ \ |
|
| | | | | * | | recovery: Clean up browse_directory(). | Tao Bao | 2017-02-11 | 1 | -92/+55 |
* | | | | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." am: 0d14cc279c am: 6585a3c368 am: b8997adc20 | Tao Bao | 2017-02-13 | 8 | -271/+333 |
|\| | | | | | |
|
| * | | | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." am: 0d14cc279c am: 6585a3c368 | Tao Bao | 2017-02-13 | 8 | -271/+333 |
| |\| | | | | |
|
| | * | | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." am: 0d14cc279c | Tao Bao | 2017-02-13 | 8 | -271/+333 |
| | |\| | | | |
|
| | | * | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." | Tao Bao | 2017-02-13 | 8 | -271/+333 |
| | | |\| | | |
|
| | | | * | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." | Tao Bao | 2017-02-13 | 8 | -271/+333 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | minui: Move graphics_{adf,drm,fbdev} into classes. | Tao Bao | 2017-02-11 | 8 | -271/+333 |
| | | | |/ / |
|
* | | | | | | Merge "minui: Save errno before calling close()." am: df464dbe79 am: 8075089ca1 am: 30c164411f | Tao Bao | 2017-02-10 | 1 | -1/+2 |
|\| | | | | |
|
| * | | | | | Merge "minui: Save errno before calling close()." am: df464dbe79 am: 8075089ca1 | Tao Bao | 2017-02-10 | 1 | -1/+2 |
| |\| | | | |
|
| | * | | | | Merge "minui: Save errno before calling close()." am: df464dbe79 | Tao Bao | 2017-02-10 | 1 | -1/+2 |
| | |\| | | |
|
| | | * | | | Merge "minui: Save errno before calling close()." | Tao Bao | 2017-02-10 | 1 | -1/+2 |
| | | |\| | |
|
| | | | * | | Merge "minui: Save errno before calling close()." | Treehugger Robot | 2017-02-10 | 1 | -1/+2 |
| | | | |\ \ |
|
| | | | | * | | minui: Save errno before calling close(). | Tao Bao | 2017-02-09 | 1 | -1/+2 |
| | | | |/ / |
|
* | | | | | | Merge "minui: Clean up graphics_fbdev.cpp." am: 5121961421 am: e91a2d23ca am: c441edd1c3 | Tao Bao | 2017-02-09 | 1 | -139/+129 |
|\| | | | | |
|
| * | | | | | Merge "minui: Clean up graphics_fbdev.cpp." am: 5121961421 am: e91a2d23ca | Tao Bao | 2017-02-09 | 1 | -139/+129 |
| |\| | | | |
|
| | * | | | | Merge "minui: Clean up graphics_fbdev.cpp." am: 5121961421 | Tao Bao | 2017-02-09 | 1 | -139/+129 |
| | |\| | | |
|
| | | * | | | Merge "minui: Clean up graphics_fbdev.cpp." | Tao Bao | 2017-02-09 | 1 | -139/+129 |
| | | |\| | |
|
| | | | * | | Merge "minui: Clean up graphics_fbdev.cpp." | Treehugger Robot | 2017-02-09 | 1 | -139/+129 |
| | | | |\ \ |
|
| | | | | * | | minui: Clean up graphics_fbdev.cpp. | Tao Bao | 2017-02-07 | 1 | -139/+129 |
* | | | | | | | Merge "minui: Clean up graphics_adf.cpp." am: d592e1d5e1 am: 46829c326e am: ffd5c03711 | Tao Bao | 2017-02-09 | 1 | -191/+156 |
|\| | | | | | |
|
| * | | | | | | Merge "minui: Clean up graphics_adf.cpp." am: d592e1d5e1 am: 46829c326e | Tao Bao | 2017-02-09 | 1 | -191/+156 |
| |\| | | | | |
|
| | * | | | | | Merge "minui: Clean up graphics_adf.cpp." am: d592e1d5e1 | Tao Bao | 2017-02-09 | 1 | -191/+156 |
| | |\| | | | |
|
| | | * | | | | Merge "minui: Clean up graphics_adf.cpp." | Tao Bao | 2017-02-09 | 1 | -191/+156 |
| | | |\| | | |
|
| | | | * | | | Merge "minui: Clean up graphics_adf.cpp." | Tao Bao | 2017-02-09 | 1 | -191/+156 |
| | | | |\ \ \ |
|
| | | | | * | | | minui: Clean up graphics_adf.cpp. | Tao Bao | 2017-02-07 | 1 | -191/+156 |
| | | | | |/ / |
|
* | | | | | | | Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71 am: f6b6b75916 am: ed5ee5292c | Tao Bao | 2017-02-09 | 1 | -351/+297 |
|\| | | | | | |
|
| * | | | | | | Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71 am: f6b6b75916 | Tao Bao | 2017-02-09 | 1 | -351/+297 |
| |\| | | | | |
|
| | * | | | | | Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71 | Tao Bao | 2017-02-09 | 1 | -351/+297 |
| | |\| | | | |
|
| | | * | | | | Merge "minui: Clean up graphics_drm.cpp." | Tao Bao | 2017-02-09 | 1 | -351/+297 |
| | | |\| | | |
|
| | | | * | | | Merge "minui: Clean up graphics_drm.cpp." | Treehugger Robot | 2017-02-09 | 1 | -351/+297 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | minui: Clean up graphics_drm.cpp. | Tao Bao | 2017-02-07 | 1 | -351/+297 |
| | | | |/ / |
|
* | | | | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e am: 80176c68b2 am: b8af1beed0 | Tao Bao | 2017-02-04 | 6 | -9/+9 |
|\| | | | | |
|
| * | | | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e am: 80176c68b2 | Tao Bao | 2017-02-04 | 6 | -9/+9 |
| |\| | | | |
|
| | * | | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e | Tao Bao | 2017-02-04 | 6 | -9/+9 |
| | |\| | | |
|
| | | * | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." | Tao Bao | 2017-02-04 | 6 | -9/+9 |
| | | |\| | |
|
| | | | * | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." | Treehugger Robot | 2017-02-04 | 6 | -9/+9 |
| | | | |\ \ |
|
| | | | | * | | Replace _exit(-1) with _exit(EXIT_FAILURE). | Tao Bao | 2017-02-03 | 6 | -9/+9 |
| | | | |/ / |
|
* | | | | | | Merge "Avoid to call UI functions in child process" am: 0f275ae56e am: 5fa2e576f9 am: 15ab95bb63 | Tianjie Xu | 2017-02-03 | 1 | -1/+5 |
|\| | | | | |
|
| * | | | | | Merge "Avoid to call UI functions in child process" am: 0f275ae56e am: 5fa2e576f9 | Tianjie Xu | 2017-02-03 | 1 | -1/+5 |
| |\| | | | |
|
| | * | | | | Merge "Avoid to call UI functions in child process" am: 0f275ae56e | Tianjie Xu | 2017-02-03 | 1 | -1/+5 |
| | |\| | | |
|
| | | * | | | Merge "Avoid to call UI functions in child process" | Tianjie Xu | 2017-02-03 | 1 | -1/+5 |
| | | |\| | |
|
| | | | * | | Merge "Avoid to call UI functions in child process" | Treehugger Robot | 2017-02-03 | 1 | -1/+5 |
| | | | |\ \ |
|
| | | | | * | | Avoid to call UI functions in child process | Tianjie Xu | 2017-02-03 | 1 | -1/+5 |
* | | | | | | | Merge "update_verifier should read dm wrapped partition" am: c44c479197 am: d40cd0e7cf am: a8764c46aa | Tianjie Xu | 2017-02-03 | 1 | -6/+64 |
|\| | | | | | |
|
| * | | | | | | Merge "update_verifier should read dm wrapped partition" am: c44c479197 am: d40cd0e7cf | Tianjie Xu | 2017-02-03 | 1 | -6/+64 |
| |\| | | | | |
|
| | * | | | | | Merge "update_verifier should read dm wrapped partition" am: c44c479197 | Tianjie Xu | 2017-02-03 | 1 | -6/+64 |
| | |\| | | | |
|
| | | * | | | | Merge "update_verifier should read dm wrapped partition" | Tianjie Xu | 2017-02-03 | 1 | -6/+64 |
| | | |\| | | |
|
| | | | * | | | Merge "update_verifier should read dm wrapped partition" | Tianjie Xu | 2017-02-03 | 1 | -6/+64 |
| | | | |\ \ \ |
|
| | | | | * | | | update_verifier should read dm wrapped partition | Tianjie Xu | 2017-01-26 | 1 | -6/+64 |
| | | | | |/ / |
|
* | | | | | | | Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540d am: ec8d74580d am: 7d8e13a535 | Tao Bao | 2017-02-03 | 1 | -62/+1 |
|\| | | | | | |
|
| * | | | | | | Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540d am: ec8d74580d | Tao Bao | 2017-02-03 | 1 | -62/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540d | Tao Bao | 2017-02-03 | 1 | -62/+1 |
| | |\| | | | |
|
| | | * | | | | Merge "minui: Minor clean up to graphics.cpp." | Tao Bao | 2017-02-03 | 1 | -62/+1 |
| | | |\| | | |
|
| | | | * | | | Merge "minui: Minor clean up to graphics.cpp." | Tao Bao | 2017-02-03 | 1 | -62/+1 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | minui: Minor clean up to graphics.cpp. | Tao Bao | 2017-02-03 | 1 | -62/+1 |
| | | | |/ / |
|
* | | | | | | Merge "Fix a log issue in ui.cpp." am: 7f38fbf976 am: c33d037d7d am: 2be767eba4 | Tao Bao | 2017-02-01 | 1 | -1/+1 |
|\| | | | | |
|
| * | | | | | Merge "Fix a log issue in ui.cpp." am: 7f38fbf976 am: c33d037d7d | Tao Bao | 2017-02-01 | 1 | -1/+1 |
| |\| | | | |
|
| | * | | | | Merge "Fix a log issue in ui.cpp." am: 7f38fbf976 | Tao Bao | 2017-02-01 | 1 | -1/+1 |
| | |\| | | |
|
| | | * | | | Merge "Fix a log issue in ui.cpp." | Tao Bao | 2017-02-01 | 1 | -1/+1 |
| | | |\| | |
|
| | | | * | | Merge "Fix a log issue in ui.cpp." | Tao Bao | 2017-02-01 | 1 | -1/+1 |
| | | | |\ \ |
|
| | | | | * | | Fix a log issue in ui.cpp. | Tao Bao | 2017-02-01 | 1 | -1/+1 |
| | | | |/ / |
|
* | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d am: 29ef12f777 am: 1c35b48253 | Tao Bao | 2017-02-01 | 1 | -0/+1 |
|\| | | | | |
|
| * | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d am: 29ef12f777 | Tao Bao | 2017-02-01 | 1 | -0/+1 |
| |\| | | | |
|
| | * | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d | Tao Bao | 2017-02-01 | 1 | -0/+1 |
| | |\| | | |
|
| | | * | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" | Tao Bao | 2017-02-01 | 1 | -0/+1 |
| | | |\| | |
|
| | | | * | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" | Tao Bao | 2017-02-01 | 1 | -0/+1 |
| | | | |\ \ |
|
| | | | | * | | bootable/recovery: cleanup compiler warnings (potential leak of memory) | Rahul Chaudhry | 2016-12-07 | 1 | -0/+1 |
* | | | | | | | Merge "recovery: Add screensaver mode." am: 389a29193c am: 2684259c34 am: 79ce31073a | Tao Bao | 2017-01-31 | 2 | -24/+120 |
|\| | | | | | |
|
| * | | | | | | Merge "recovery: Add screensaver mode." am: 389a29193c am: 2684259c34 | Tao Bao | 2017-01-31 | 2 | -24/+120 |
| |\| | | | | |
|
| | * | | | | | Merge "recovery: Add screensaver mode." am: 389a29193c | Tao Bao | 2017-01-31 | 2 | -24/+120 |
| | |\| | | | |
|
| | | * | | | | Merge "recovery: Add screensaver mode." | Tao Bao | 2017-01-31 | 2 | -24/+120 |
| | | |\| | | |
|
| | | | * | | | Merge "recovery: Add screensaver mode." | Tao Bao | 2017-01-31 | 2 | -24/+120 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | recovery: Add screensaver mode. | Tao Bao | 2017-01-31 | 2 | -24/+120 |
| | | | |/ / |
|
* | | | | | | Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1 am: 5b5b8333e0 am: 9518d34c0f | Alex Deymo | 2017-01-26 | 2 | -2/+2 |
|\| | | | | |
|
| * | | | | | Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1 am: 5b5b8333e0 | Alex Deymo | 2017-01-26 | 2 | -2/+2 |
| |\| | | | |
|
| | * | | | | Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1 | Alex Deymo | 2017-01-26 | 2 | -2/+2 |
| | |\| | | |
|
| | | * | | | Merge "Remove '_static' suffix from libext2* references." | Alex Deymo | 2017-01-26 | 2 | -2/+2 |
| | | |\| | |
|
| | | | * | | Merge "Remove '_static' suffix from libext2* references." | Alex Deymo | 2017-01-26 | 2 | -2/+2 |
| | | | |\ \ |
|
| | | | | * | | Remove '_static' suffix from libext2* references. | Alex Deymo | 2017-01-24 | 2 | -2/+2 |
* | | | | | | | Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 am: a78bbda4e2 am: 445f24f712 | Connor O'Brien | 2017-01-25 | 1 | -1/+6 |
|\| | | | | | |
|
| * | | | | | | Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 am: a78bbda4e2 | Connor O'Brien | 2017-01-25 | 1 | -1/+6 |
| |\| | | | | |
|
| | * | | | | | Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 | Connor O'Brien | 2017-01-25 | 1 | -1/+6 |
| | |\| | | | |
|
| | | * | | | | Merge "Use flash erase & logical block size for userdata wipe" | Connor O'Brien | 2017-01-25 | 1 | -1/+6 |
| | | |\| | | |
|
| | | | * | | | Merge "Use flash erase & logical block size for userdata wipe" | Treehugger Robot | 2017-01-25 | 1 | -1/+6 |
| | | | |\ \ \ |
|
| | | | | * | | | Use flash erase & logical block size for userdata wipe | Connor O'Brien | 2017-01-25 | 1 | -1/+6 |
| | | | |/ / / |
|
* | | | | | | | Merge "minui: Move callback functions to std::function." am: a476312714 am: 343987b2a1 am: 19856bcb2e | Tao Bao | 2017-01-25 | 5 | -129/+115 |
|\| | | | | | |
|
| * | | | | | | Merge "minui: Move callback functions to std::function." am: a476312714 am: 343987b2a1 | Tao Bao | 2017-01-25 | 5 | -129/+115 |
| |\| | | | | |
|
| | * | | | | | Merge "minui: Move callback functions to std::function." am: a476312714 | Tao Bao | 2017-01-25 | 5 | -129/+115 |
| | |\| | | | |
|
| | | * | | | | Merge "minui: Move callback functions to std::function." | Tao Bao | 2017-01-25 | 5 | -129/+115 |
| | | |\| | | |
|
| | | | * | | | Merge "minui: Move callback functions to std::function." | Tao Bao | 2017-01-25 | 5 | -129/+115 |
| | | | |\ \ \ |
|
| | | | | * | | | minui: Move callback functions to std::function. | Tao Bao | 2017-01-23 | 5 | -129/+115 |
* | | | | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 am: 8e01ded271 am: b30b8cf436 | Tao Bao | 2017-01-25 | 1 | -48/+46 |
|\| | | | | | | |
|
| * | | | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 am: 8e01ded271 | Tao Bao | 2017-01-25 | 1 | -48/+46 |
| |\| | | | | | |
|
| | * | | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 | Tao Bao | 2017-01-25 | 1 | -48/+46 |
| | |\| | | | | |
|
| | | * | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." | Tao Bao | 2017-01-25 | 1 | -48/+46 |
| | | |\| | | | |
|
| | | | * | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." | Tao Bao | 2017-01-25 | 1 | -48/+46 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | update_verifier: Move property_get() to android::base::GetProperty(). | Tao Bao | 2017-01-20 | 1 | -48/+46 |
* | | | | | | | | | Merge "Print with newline for ui_print." am: 90deaf9ab7 am: 1313a9636d am: 14be4eb8ce | Tao Bao | 2017-01-24 | 3 | -7/+1 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Print with newline for ui_print." am: 90deaf9ab7 am: 1313a9636d | Tao Bao | 2017-01-24 | 3 | -7/+1 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Print with newline for ui_print." am: 90deaf9ab7 | Tao Bao | 2017-01-24 | 3 | -7/+1 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Print with newline for ui_print." | Tao Bao | 2017-01-24 | 3 | -7/+1 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Print with newline for ui_print." | Tao Bao | 2017-01-24 | 3 | -7/+1 |
| | | | |\ \ \ \ \
| | | | | |_|_|/ /
| | | | |/| | | | |
|
| | | | | * | | | | Print with newline for ui_print. | Tao Bao | 2017-01-22 | 3 | -7/+1 |
| | | | | |/ / / |
|
* | | | | | | | | Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4e am: 58eace4a96 | Chris Phoenix | 2017-01-23 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4e | Chris Phoenix | 2017-01-23 | 1 | -1/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 | Chris Phoenix | 2017-01-23 | 1 | -1/+1 |
| | |\| | | | | |
|
| | | * | | | | | Merge "bootctrl HAL uses "default" service name" | Chris Phoenix | 2017-01-23 | 1 | -1/+1 |
| | | |\| | | | |
|
| | | | * | | | | Merge "bootctrl HAL uses "default" service name" | Chris Phoenix | 2017-01-23 | 1 | -1/+1 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | bootctrl HAL uses "default" service name | Chris Phoenix | 2017-01-20 | 1 | -1/+1 |
* | | | | | | | | | Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12e am: f1a371b1b0 | Tianjie Xu | 2017-01-23 | 11 | -0/+3 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12e | Tianjie Xu | 2017-01-23 | 11 | -0/+3 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Restore the max width for recovery background texts" am: c1df344381 | Tianjie Xu | 2017-01-23 | 11 | -0/+3 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Restore the max width for recovery background texts" | Tianjie Xu | 2017-01-23 | 11 | -0/+3 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Restore the max width for recovery background texts" | Tianjie Xu | 2017-01-23 | 11 | -0/+3 |
| | | | |\ \ \ \ \
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | | * | | | | Restore the max width for recovery background texts | Tianjie Xu | 2017-01-23 | 11 | -0/+3 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "bootctrl HAL uses "default" service name" | Chris Phoenix | 2017-01-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | bootctrl HAL uses "default" service name | Chris Phoenix | 2017-01-21 | 1 | -1/+1 |
* | | | | | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48 am: 6a82bc228a | Tao Bao | 2017-01-20 | 2 | -4/+10 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| / / / / / / /
| |/ / / / / / / |
|
| * | | | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48 | Tao Bao | 2017-01-20 | 2 | -4/+10 |
| |\| | | | | | |
|
| | * | | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 | Tao Bao | 2017-01-20 | 2 | -4/+10 |
| | |\| | | | | |
|
| | | * | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." | Tao Bao | 2017-01-20 | 2 | -4/+10 |
| | | |\| | | | |
|
| | | | * | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." | Tao Bao | 2017-01-20 | 2 | -4/+10 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | imgpatch: Compile with ZLIB_CONST defined. | Tao Bao | 2017-01-20 | 2 | -4/+10 |
| | | | | |/ / |
|
* | | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254 am: e4dcbd1c9e | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254 | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ |
|
* | | | | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254 am: 87f49b83ca | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254 | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \
| | | |_|/ / / / /
| | |/| | | | | | |
|
| | * | | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ |
|
| | | | | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ |
|
| | | | | | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ |
|
| | | | | | | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | | | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | | | | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | | | | | * | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev | Tianjie Xu | 2017-01-20 | 1 | -0/+7 |
* | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 am: 9bb0819ef6 am: f859652e5f | Sen Jiang | 2017-01-19 | 2 | -16/+20 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 am: 9bb0819ef6 | Sen Jiang | 2017-01-19 | 2 | -16/+20 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 | Sen Jiang | 2017-01-19 | 2 | -16/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / /
| | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." | Sen Jiang | 2017-01-19 | 2 | -16/+20 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." | Sen Jiang | 2017-01-19 | 2 | -16/+20 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | imgdiff: cache bsdiff suffix array in zip mode. | Sen Jiang | 2017-01-19 | 2 | -16/+20 |
| | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | | | | |/| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadb am: 18098b7de3 | Tianjie Xu | 2017-01-19 | 5 | -3/+177 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadb | Tianjie Xu | 2017-01-19 | 5 | -3/+177 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 | Tianjie Xu | 2017-01-19 | 5 | -3/+177 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" | Tianjie Xu | 2017-01-19 | 5 | -3/+177 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" | Tianjie Xu | 2017-01-19 | 5 | -3/+177 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | Add checkers and tests for empty locale in PNG file | Tianjie Xu | 2017-01-19 | 5 | -3/+177 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: 4aa56ad477" into nyc-mr2-dev-plus-aosp | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: 4aa56ad477" into nyc-mr2-dev-plus-aosp | Android Build Merger (Role) | 2017-01-19 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: 4aa56ad477 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: de530474e9 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | / / / / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |_|_|/ / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | |_|_|/ / / / / / / / / /
| | | | | | |/| | | | | | | | | | | | |
|
| | | | | | * | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | |_|_|/ / / / / / / / /
| | | | | | | |/| | | | | | | | | | | |
|
| | | | | | | * | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | |_|_|/ / / / / / / /
| | | | | | | | |/| | | | | | | | | | |
|
| | | | | | | | * | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | |_|_|/ / / / / / /
| | | | | | | | | |/| | | | | | | | | |
|
| | | | | | | | | * | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | |_|_|/ / / / / /
| | | | | | | | | | |/| | | | | | | | |
|
| | | | | | | | | | * | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |_|_|/ / / / /
| | | | | | | | | | | |/| | | | | | | |
|
| | | | | | | | | | | * | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | |_|_|/ / / /
| | | | | | | | | | | | |/| | | | | | |
|
| | | | | | | | | | | | * | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | |_|_|/ / /
| | | | | | | | | | | | | |/| | | | | |
|
| | | | | | | | | | | | | * | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | |_|_|/ /
| | | | | | | | | | | | | | |/| | | | |
|
| | | | | | | | | | | | | | * | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ \ \ \ \ |
|
| | | | | | | | | | | | | | | * \ \ \ \ | DO NOT MERGE: Add a checker for signature boundary in verifier | Tianjie Xu | 2017-01-18 | 1 | -0/+7 |
| | | | | | | | | | | | | | | |\ \ \ \ \ |
|
| | | | | | | | | | | | | | | | * | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier | Tianjie Xu | 2016-12-20 | 1 | -0/+7 |
* | | | | | | | | | | | | | | | | | | | | | resolve build error when merging 0f7f7e21 am: 97ea844aca | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | resolve build error when merging 0f7f7e21 | Tianjie Xu | 2017-01-19 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | resolve build error when merging 0f7f7e21 | Tianjie Xu | 2017-01-19 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | | Merge "Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceab am: f127896675" into nyc-mr2-dev-plus-aosp | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceab am: f127896675" into nyc-mr2-dev-plus-aosp | Android Build Merger (Role) | 2017-01-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceab am: f127896675 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceab | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / /
| | |/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceab am: 8a45adb243 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceab | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / /
| |/| | | / / / / / / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |/ / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | |/ / / / / / / / / / / / / /
| | | | | | |/| | | | | | | | | | | | | | |
|
| | | | | | * | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | |/ / / / / / / / / / / / /
| | | | | | | |/| | | | | | | | | | | | | |
|
| | | | | | | * | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | |/ / / / / / / / / / / /
| | | | | | | | |/| | | | | | | | | | | | |
|
| | | | | | | | * | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | |/ / / / / / / / / / /
| | | | | | | | | |/| | | | | | | | | | | |
|
| | | | | | | | | * | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | |/ / / / / / / / / /
| | | | | | | | | | |/| | | | | | | | | | |
|
| | | | | | | | | | * | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |/ / / / / / / / /
| | | | | | | | | | | |/| | | | | | | | | |
|
| | | | | | | | | | | * | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | |/ / / / / / / /
| | | | | | | | | | | | |/| | | | | | | | |
|
| | | | | | | | | | | | * | | | | | | | | | Add a checker for signature boundary in verifier | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | |/ / / / / / /
| | | | | | | | | | | | | |/| | | | | | | |
|
| | | | | | | | | | | | | * | | | | | | | | Add a checker for signature boundary in verifier | Tianjie Xu | 2016-12-17 | 1 | -0/+6 |
* | | | | | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." am: 13d15af08f am: ad20b76397 am: 54890af615 | Tao Bao | 2017-01-17 | 11 | -22/+45 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." am: 13d15af08f am: ad20b76397 | Tao Bao | 2017-01-17 | 11 | -22/+45 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." am: 13d15af08f | Tao Bao | 2017-01-17 | 11 | -22/+45 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| | | |/| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." | Tao Bao | 2017-01-17 | 11 | -22/+45 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | | | |/| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." | Tao Bao | 2017-01-17 | 11 | -22/+45 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | minui: Export minui/minui.h. | Tao Bao | 2017-01-17 | 11 | -22/+45 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71 am: 421d92707d am: 81bffbda89 | Tao Bao | 2017-01-14 | 2 | -82/+78 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71 am: 421d92707d | Tao Bao | 2017-01-14 | 2 | -82/+78 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71 | Tao Bao | 2017-01-14 | 2 | -82/+78 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." | Tao Bao | 2017-01-14 | 2 | -82/+78 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." | Tao Bao | 2017-01-14 | 2 | -82/+78 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | recovery: Move property_get() to android::base::GetProperty(). | Tao Bao | 2017-01-13 | 2 | -82/+78 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" am: f0af02fea6 am: 19e4f627d8 am: e05674f93e | Tianjie Xu | 2017-01-14 | 26 | -2/+20 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" am: f0af02fea6 am: 19e4f627d8 | Tianjie Xu | 2017-01-14 | 26 | -2/+20 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" am: f0af02fea6 | Tianjie Xu | 2017-01-14 | 26 | -2/+20 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" | Tianjie Xu | 2017-01-14 | 26 | -2/+20 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" | Tianjie Xu | 2017-01-14 | 26 | -2/+20 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | Update background text images in recovery | Tianjie Xu | 2017-01-07 | 26 | -2/+20 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Rename language+country resources to just language" | Roozbeh Pournader | 2017-01-13 | 30 | -270/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | Rename language+country resources to just language | Roozbeh Pournader | 2017-01-11 | 30 | -0/+0 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb am: f8f1a25850 am: a1e336d548 | Alex Deymo | 2017-01-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb am: f8f1a25850 | Alex Deymo | 2017-01-12 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb | Alex Deymo | 2017-01-12 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' | Alex Deymo | 2017-01-12 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' | Alex Deymo | 2017-01-12 | 3 | -6/+6 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1a am: 9e93a79f4c | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1a | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse am: 67f3aa8804 | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse | Alex Deymo | 2017-01-11 | 3 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899 am: 9edd655f94 | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899 | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. am: 31653660ad | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
| | | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. | Alex Deymo | 2017-01-11 | 3 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-01-12 | 30 | -0/+270 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1 am: 7d345f27e7 | Tianjie Xu | 2017-01-10 | 3 | -4/+6 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1 | Tianjie Xu | 2017-01-10 | 3 | -4/+6 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 | Tianjie Xu | 2017-01-10 | 3 | -4/+6 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" | Tianjie Xu | 2017-01-10 | 3 | -4/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" | Tianjie Xu | 2017-01-10 | 3 | -4/+6 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Do not inject I/O fault on a retry | Tianjie Xu | 2017-01-09 | 3 | -4/+6 |
| | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Address review comment." am: 77ec0071cf am: 3e003ceeda am: ac431948d3 | Elliott Hughes | 2017-01-10 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Address review comment." am: 77ec0071cf am: 3e003ceeda | Elliott Hughes | 2017-01-10 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Address review comment." am: 77ec0071cf | Elliott Hughes | 2017-01-10 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Address review comment." | Elliott Hughes | 2017-01-10 | 1 | -1/+1 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Address review comment." | Elliott Hughes | 2017-01-10 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Address review comment. | Elliott Hughes | 2017-01-09 | 1 | -1/+1 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 am: 61728ff4d8 am: 6ac5db29db | Elliott Hughes | 2017-01-09 | 1 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 am: 61728ff4d8 | Elliott Hughes | 2017-01-09 | 1 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 | Elliott Hughes | 2017-01-09 | 1 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." | Elliott Hughes | 2017-01-09 | 1 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." | Elliott Hughes | 2017-01-09 | 1 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Move to .md files for even trivial documentation. | Elliott Hughes | 2017-01-07 | 1 | -0/+0 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." am: 33808f16c5 am: fe0a80184c am: b7ce9c5e00 | Tao Bao | 2017-01-09 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." am: 33808f16c5 am: fe0a80184c | Tao Bao | 2017-01-09 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." am: 33808f16c5 | Tao Bao | 2017-01-09 | 1 | -2/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." | Tao Bao | 2017-01-09 | 1 | -2/+2 |
| | | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." | Tao Bao | 2017-01-09 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | recovery: Fix the argument parsing. | Tao Bao | 2017-01-09 | 1 | -2/+2 |
| | | | | | |/ / / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 am: 06b4254a70 am: 5ec75851a7 | Tianjie Xu | 2017-01-07 | 1 | -1/+40 |
|\| | | | | | | | | | | | | | | | | | | | | | |
| |_|_|_|_|_|/ / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 am: 06b4254a70 | Tianjie Xu | 2017-01-07 | 1 | -1/+40 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 | Tianjie Xu | 2017-01-07 | 1 | -1/+40 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" | Tianjie Xu | 2017-01-07 | 1 | -1/+40 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" | Tianjie Xu | 2017-01-07 | 1 | -1/+40 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Retry ioctl in uncrypt if it returns block# 0 | Tianjie Xu | 2016-12-05 | 1 | -1/+40 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb am: 1bbd9c68af am: af53db6ba0 | Tao Bao | 2017-01-06 | 1 | -145/+166 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb am: 1bbd9c68af | Tao Bao | 2017-01-06 | 1 | -145/+166 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb | Tao Bao | 2017-01-06 | 1 | -145/+166 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." | Tao Bao | 2017-01-06 | 1 | -145/+166 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." | Treehugger Robot | 2017-01-06 | 1 | -145/+166 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | recovery: Clean up try_update_binary() in install.cpp. | Tao Bao | 2017-01-06 | 1 | -145/+166 |
| | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 am: 179fc8a82b am: ba0dad8828 | Tao Bao | 2017-01-06 | 1 | -0/+50 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 am: 179fc8a82b | Tao Bao | 2017-01-06 | 1 | -0/+50 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 | Tao Bao | 2017-01-06 | 1 | -0/+50 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." | Tao Bao | 2017-01-06 | 1 | -0/+50 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." | Tao Bao | 2017-01-06 | 1 | -0/+50 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | tests: Add testcase for show_progress() and set_progress(). | Tao Bao | 2017-01-06 | 1 | -0/+50 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." am: 91f74c82cd am: 719a15b187 am: fbb5dbb471 | Tao Bao | 2017-01-05 | 1 | -83/+84 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." am: 91f74c82cd am: 719a15b187 | Tao Bao | 2017-01-05 | 1 | -83/+84 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." am: 91f74c82cd | Tao Bao | 2017-01-05 | 1 | -83/+84 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." | Tao Bao | 2017-01-05 | 1 | -83/+84 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." | Tao Bao | 2017-01-05 | 1 | -83/+84 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | updater: Clean up CreateStash(). | Tao Bao | 2016-12-29 | 1 | -84/+85 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b am: 4d37763c69 am: e513c0f2ac | Tao Bao | 2017-01-04 | 3 | -15/+91 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b am: 4d37763c69 | Tao Bao | 2017-01-04 | 3 | -15/+91 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b | Tao Bao | 2017-01-04 | 3 | -15/+91 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." | Tao Bao | 2017-01-04 | 3 | -15/+91 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." | Tao Bao | 2017-01-04 | 3 | -15/+91 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | imgdiff: Fix an edge case that leads to infinite loop. | Tao Bao | 2016-12-28 | 3 | -15/+91 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" am: 1302ea8725 am: 9f9d50d4ed am: e477a54c8d | Jerry Zhang | 2017-01-04 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" am: 1302ea8725 am: 9f9d50d4ed | Jerry Zhang | 2017-01-04 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" am: 1302ea8725 | Jerry Zhang | 2017-01-04 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" | Jerry Zhang | 2017-01-04 | 1 | -1/+1 |
| | | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" | Jerry Zhang | 2017-01-04 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | Write aliases before ffs mount in recovery | Jerry Zhang | 2017-01-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." am: 56fc8fa376 am: 1227f6b841 am: 3806993e25 | Tao Bao | 2017-01-04 | 9 | -236/+244 |
|\| | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." am: 56fc8fa376 am: 1227f6b841 | Tao Bao | 2017-01-04 | 9 | -236/+244 |
| |\| | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." am: 56fc8fa376 | Tao Bao | 2017-01-04 | 9 | -236/+244 |
| | |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." | Tao Bao | 2017-01-04 | 9 | -236/+244 |
| | | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." | Tao Bao | 2017-01-04 | 9 | -236/+244 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | recovery: Fix the broken UI text. | Tao Bao | 2017-01-04 | 9 | -236/+244 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" | Jerry Zhang | 2017-01-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | Write aliases before ffs mount in recovery | Jerry Zhang | 2017-01-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." am: 466e1b396a am: 6502c50e4b am: cb9c4fc4fb | Tao Bao | 2017-01-04 | 1 | -74/+63 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
|/| / / / / / / / / / / / / / / / / / / / / / / / /
| |/ / / / / / / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." am: 466e1b396a am: 6502c50e4b | Tao Bao | 2017-01-04 | 1 | -74/+63 |
| |\| | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." am: 466e1b396a | Tao Bao | 2017-01-04 | 1 | -74/+63 |
| | |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." | Tao Bao | 2017-01-04 | 1 | -74/+63 |
| | | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." | Tao Bao | 2017-01-04 | 1 | -74/+63 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | updater: Refactor parse_range(). | Tao Bao | 2017-01-04 | 1 | -74/+63 |
| | | | |/ / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0 am: 05e7db3000 am: 83317083c8 | Tao Bao | 2017-01-04 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0 am: 05e7db3000 | Tao Bao | 2017-01-04 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0 | Tao Bao | 2017-01-04 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" | Tao Bao | 2017-01-04 | 1 | -2/+4 |
| | | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" | Tao Bao | 2017-01-04 | 1 | -2/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.png | Tim Kryger | 2017-01-04 | 1 | -2/+4 |
| | | | | | |/ / / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 am: c58f5e73d5 am: c025f145cb | Tao Bao | 2017-01-04 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 am: c58f5e73d5 | Tao Bao | 2017-01-04 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 | Tao Bao | 2017-01-04 | 1 | -2/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." | Tao Bao | 2017-01-04 | 1 | -2/+2 |
| | | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." | Tao Bao | 2017-01-04 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | | updater: Update the header name for bootloader.h. | Tao Bao | 2016-12-29 | 1 | -2/+2 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf am: 29e1b7b4b2 am: 1b29658702 | Tao Bao | 2016-12-28 | 2 | -3/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf am: 29e1b7b4b2 | Tao Bao | 2016-12-28 | 2 | -3/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf | Tao Bao | 2016-12-28 | 2 | -3/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." | Tao Bao | 2016-12-28 | 2 | -3/+2 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." | Tao Bao | 2016-12-28 | 2 | -3/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | applypatch: Don't expose FindMatchingPatch(). | Tao Bao | 2016-12-28 | 2 | -3/+2 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." am: 344c8eb453 am: 4fe022c4ed am: 4e2471d6dd | Tao Bao | 2016-12-28 | 8 | -266/+812 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." am: 344c8eb453 am: 4fe022c4ed | Tao Bao | 2016-12-28 | 8 | -266/+812 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." am: 344c8eb453 | Tao Bao | 2016-12-28 | 8 | -266/+812 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." | Tao Bao | 2016-12-28 | 8 | -266/+812 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." | Tao Bao | 2016-12-28 | 8 | -266/+812 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | Add tests for imgdiff. | Tao Bao | 2016-12-20 | 8 | -266/+812 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 am: 1b83e7e28d am: 7f0f49dd2b | Tao Bao | 2016-12-23 | 2 | -0/+151 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 am: 1b83e7e28d | Tao Bao | 2016-12-23 | 2 | -0/+151 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 | Tao Bao | 2016-12-23 | 2 | -0/+151 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." | Tao Bao | 2016-12-23 | 2 | -0/+151 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." | Tao Bao | 2016-12-23 | 2 | -0/+151 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | tests: Add test coverage for DirUtil. | Tao Bao | 2016-12-22 | 2 | -0/+151 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e am: baf422229d am: ef801f9a62 | Tao Bao | 2016-12-22 | 2 | -8/+16 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e am: baf422229d | Tao Bao | 2016-12-22 | 2 | -8/+16 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e | Tao Bao | 2016-12-22 | 2 | -8/+16 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." | Tao Bao | 2016-12-22 | 2 | -8/+16 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." | Tao Bao | 2016-12-22 | 2 | -8/+16 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | tests: Replace the O_RDONLY in access(2). | Tao Bao | 2016-12-22 | 2 | -8/+16 |
| | | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579e am: 830ab1c482 | Tao Bao | 2016-12-22 | 2 | -1/+193 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579e | Tao Bao | 2016-12-22 | 2 | -1/+193 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 | Tao Bao | 2016-12-22 | 2 | -1/+193 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." | Tao Bao | 2016-12-22 | 2 | -1/+193 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." | Tao Bao | 2016-12-22 | 2 | -1/+193 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | tests: Add testcase for ZipUtil. | Tao Bao | 2016-12-22 | 2 | -1/+193 |
| | | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 am: bc344ba7b9 am: 11e9af909d | Paul Crowley | 2016-12-22 | 1 | -12/+52 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 am: bc344ba7b9 | Paul Crowley | 2016-12-22 | 1 | -12/+52 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 | Paul Crowley | 2016-12-22 | 1 | -12/+52 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." | Paul Crowley | 2016-12-22 | 1 | -12/+52 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." | Treehugger Robot | 2016-12-22 | 1 | -12/+52 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Support a "ask before wiping" boot flag. | Paul Crowley | 2016-12-21 | 1 | -12/+52 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add a checker for signature boundary in verifier" | Tianjie Xu | 2016-12-19 | 3 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier | Tianjie Xu | 2016-12-17 | 3 | -1/+8 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 am: b0337774b2 am: 88bd5d59de | Tao Bao | 2016-12-19 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / /
|/| / / / / / / / / / / / / / / / / / / / / /
| |/ / / / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 am: b0337774b2 | Tao Bao | 2016-12-19 | 1 | -0/+11 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 | Tao Bao | 2016-12-19 | 1 | -0/+11 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." | Tao Bao | 2016-12-19 | 1 | -0/+11 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." | Tao Bao | 2016-12-19 | 1 | -0/+11 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | Bugfix:updater always retry apply patch failed,when memcpy failed. | katao | 2016-12-19 | 1 | -0/+11 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.png am: 48be23c8ed am: 14bdbb6c77 -s ours | Tim Kryger | 2016-12-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.png am: 48be23c8ed | Tim Kryger | 2016-12-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / /
| | |/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.png | Tim Kryger | 2016-12-15 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: 910c83b915 | Tim Kryger | 2016-12-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp | Tim Kryger | 2016-12-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp | TreeHugger Robot | 2016-12-16 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp am: a5876e43f7 | Tim Kryger | 2016-12-16 | 1 | -2/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp | Tim Kryger | 2016-12-16 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp | Tim Kryger | 2016-12-15 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.png | Tim Kryger | 2016-11-29 | 1 | -2/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 am: 9a707b08ef am: cb15594696 | Tao Bao | 2016-12-16 | 4 | -12/+65 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 am: 9a707b08ef | Tao Bao | 2016-12-16 | 4 | -12/+65 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 | Tao Bao | 2016-12-16 | 4 | -12/+65 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." | Tao Bao | 2016-12-15 | 4 | -12/+65 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." | Tao Bao | 2016-12-15 | 4 | -12/+65 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Add update_bootloader_message() to fix two-step OTAs. | Tao Bao | 2016-12-15 | 4 | -12/+65 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." am: 07d985b75b am: 7f3ada54ec am: 870b87dfc8 | Tao Bao | 2016-12-16 | 2 | -0/+140 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." am: 07d985b75b am: 7f3ada54ec | Tao Bao | 2016-12-16 | 2 | -0/+140 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." am: 07d985b75b | Tao Bao | 2016-12-16 | 2 | -0/+140 |
| | |\| | | | | | | | | | | | | | | | | | | |
| | | |_|/ / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." | Tao Bao | 2016-12-15 | 2 | -0/+140 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." | Tao Bao | 2016-12-15 | 2 | -0/+140 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | tests: Add tests for bootloader_message. | Tao Bao | 2016-12-15 | 2 | -0/+140 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." am: 8c1584feaf am: 2f8f6ec0fc am: ef45a88680 | Sen Jiang | 2016-12-14 | 9 | -17/+102 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." am: 8c1584feaf am: 2f8f6ec0fc | Sen Jiang | 2016-12-14 | 9 | -17/+102 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." am: 8c1584feaf | Sen Jiang | 2016-12-14 | 9 | -17/+102 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." | Sen Jiang | 2016-12-14 | 9 | -17/+102 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." | Sen Jiang | 2016-12-14 | 9 | -17/+102 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Add a stub recovery UI. | Sen Jiang | 2016-12-13 | 9 | -17/+102 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." am: 2bb3a2270e am: f7f3f821a8 am: e97575e7ae | Tao Bao | 2016-12-14 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." am: 2bb3a2270e am: f7f3f821a8 | Tao Bao | 2016-12-14 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." am: 2bb3a2270e | Tao Bao | 2016-12-14 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." | Tao Bao | 2016-12-14 | 1 | -1/+1 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." | Treehugger Robot | 2016-12-14 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | updater: Fix the operator order. | Tao Bao | 2016-12-14 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2 am: 527f08ed0b am: 1871a2feeb | Tao Bao | 2016-12-14 | 3 | -26/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2 am: 527f08ed0b | Tao Bao | 2016-12-14 | 3 | -26/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2 | Tao Bao | 2016-12-14 | 3 | -26/+4 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." | Tao Bao | 2016-12-14 | 3 | -26/+4 |
| | | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." | Tao Bao | 2016-12-14 | 3 | -26/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Remove the obsolete comments for firmware update. | Tao Bao | 2016-12-14 | 3 | -26/+4 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1 am: af62097c08 am: b1e8150c44 | Tao Bao | 2016-12-14 | 3 | -1/+177 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1 am: af62097c08 | Tao Bao | 2016-12-14 | 3 | -1/+177 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1 | Tao Bao | 2016-12-14 | 3 | -1/+177 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." | Tao Bao | 2016-12-14 | 3 | -1/+177 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." | Tao Bao | 2016-12-14 | 3 | -1/+177 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Add tests for setup-bcb and clear-bcb via uncrypt. | Tao Bao | 2016-12-14 | 3 | -1/+177 |
| | | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6 am: 7294a8830b am: 495478e853 | Tao Bao | 2016-12-14 | 1 | -95/+85 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6 am: 7294a8830b | Tao Bao | 2016-12-13 | 1 | -95/+85 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6 | Tao Bao | 2016-12-13 | 1 | -95/+85 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." | Tao Bao | 2016-12-13 | 1 | -95/+85 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." | Tao Bao | 2016-12-13 | 1 | -95/+85 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | recovery: Clean up the log saving while wiping. | Tao Bao | 2016-12-13 | 1 | -95/+85 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9a am: 01afbb8f29 | Tao Bao | 2016-12-13 | 1 | -1/+2 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9a | Tao Bao | 2016-12-13 | 1 | -1/+2 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb | Tao Bao | 2016-12-13 | 1 | -1/+2 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." | Tao Bao | 2016-12-13 | 1 | -1/+2 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." | Tao Bao | 2016-12-13 | 1 | -1/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | clang-format: Adjust short functions / if settings. | Tao Bao | 2016-12-13 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 am: 09197c47e2 am: 1b321e43e1 | Tao Bao | 2016-12-13 | 2 | -9/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 am: 09197c47e2 | Tao Bao | 2016-12-13 | 2 | -9/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 | Tao Bao | 2016-12-13 | 2 | -9/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" | Tao Bao | 2016-12-13 | 2 | -9/+2 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" | Tao Bao | 2016-12-13 | 2 | -9/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Revert "write_bootloader_message(<options>) should not reset stage field." | Tao Bao | 2016-12-13 | 2 | -9/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5be am: cbb044239a am: ff77b42d66 | Tao Bao | 2016-12-10 | 1 | -21/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5be am: cbb044239a | Tao Bao | 2016-12-10 | 1 | -21/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5be | Tao Bao | 2016-12-10 | 1 | -21/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." | Tao Bao | 2016-12-10 | 1 | -21/+1 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." | Tao Bao | 2016-12-10 | 1 | -21/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | recovery: Remove obsolete code that supports "CACHE:foo" format. | Tao Bao | 2016-12-10 | 1 | -21/+1 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d am: f4fabe254c am: d8ce8fa609 | Tao Bao | 2016-12-09 | 2 | -2/+9 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d am: f4fabe254c | Tao Bao | 2016-12-09 | 2 | -2/+9 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d | Tao Bao | 2016-12-09 | 2 | -2/+9 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." | Tao Bao | 2016-12-09 | 2 | -2/+9 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." | Tao Bao | 2016-12-09 | 2 | -2/+9 |
| | | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | write_bootloader_message(<options>) should not reset stage field. | Tao Bao | 2016-12-06 | 2 | -2/+9 |
| | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| | | | | |/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c am: 6be6680109 am: d4ceb1fb64 | Tao Bao | 2016-12-09 | 1 | -2/+5 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c am: 6be6680109 | Tao Bao | 2016-12-09 | 1 | -2/+5 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c | Tao Bao | 2016-12-09 | 1 | -2/+5 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." | Tao Bao | 2016-12-09 | 1 | -2/+5 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." | Tao Bao | 2016-12-09 | 1 | -2/+5 |
| | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | recovery: Fix the argument parsing from COMMAND_FILE. | Tao Bao | 2016-12-09 | 1 | -2/+5 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237 am: dd9c5674df | Tao Bao | 2016-12-06 | 1 | -80/+70 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237 | Tao Bao | 2016-12-06 | 1 | -80/+70 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." am: 3aadbbac39 | Tao Bao | 2016-12-06 | 1 | -80/+70 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." | Tao Bao | 2016-12-06 | 1 | -80/+70 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." | Tao Bao | 2016-12-06 | 1 | -80/+70 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | recovery: Clean up get_args(). | Tao Bao | 2016-12-05 | 1 | -80/+70 |
| | | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | Revert "Import translations. DO NOT MERGE" | Bill Yi | 2016-12-05 | 81 | -0/+729 |
* | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-12-03 | 81 | -729/+0 |
* | | | | | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." am: d2c56629ab am: 1d9779b57b am: 997ccbc5a4 | Tao Bao | 2016-12-02 | 3 | -993/+994 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." am: d2c56629ab am: 1d9779b57b | Tao Bao | 2016-12-02 | 3 | -993/+994 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." am: d2c56629ab | Tao Bao | 2016-12-02 | 3 | -993/+994 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." | Tao Bao | 2016-12-02 | 3 | -993/+994 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." | Tao Bao | 2016-12-02 | 3 | -993/+994 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | updater: Switch to libbase logging. | Tao Bao | 2016-12-01 | 3 | -993/+994 |
* | | | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 am: 80cd188162 am: bd8f34190c | Tao Bao | 2016-12-01 | 1 | -0/+16 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 am: 80cd188162 | Tao Bao | 2016-12-01 | 1 | -0/+16 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 | Tao Bao | 2016-12-01 | 1 | -0/+16 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" | Tao Bao | 2016-12-01 | 1 | -0/+16 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" | Tao Bao | 2016-12-01 | 1 | -0/+16 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | bootable/recovery: cleanup compiler warnings (unused value) | Rahul Chaudhry | 2016-11-30 | 1 | -0/+16 |
| | | | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix inconsistent code." | Tao Bao | 2016-12-01 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | updater: Fix inconsistent code. | Tao Bao | 2016-12-01 | 1 | -1/+3 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 am: be54feda58 am: 83b649ee1d | Tao Bao | 2016-11-30 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / /
|/| / / / / / / / / / / / / / / / / / / / /
| |/ / / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 am: be54feda58 | Tao Bao | 2016-11-30 | 1 | -0/+4 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 | Tao Bao | 2016-11-30 | 1 | -0/+4 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" | Tao Bao | 2016-11-30 | 1 | -0/+4 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" | Tao Bao | 2016-11-30 | 1 | -0/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | bootable/recovery: cleanup compiler warnings (potential leak of memory) | Rahul Chaudhry | 2016-11-16 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" am: 1528def46e am: ae2463bb35 am: 95beb966e2 | Connor O'Brien | 2016-11-30 | 2 | -15/+21 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" am: 1528def46e am: ae2463bb35 | Connor O'Brien | 2016-11-30 | 2 | -15/+21 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" am: 1528def46e | Connor O'Brien | 2016-11-30 | 2 | -15/+21 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" | Connor O'Brien | 2016-11-30 | 2 | -15/+21 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" | Connor O'Brien | 2016-11-30 | 2 | -15/+21 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | Switch update verifier to HIDL HAL | Connor O'Brien | 2016-11-21 | 2 | -15/+21 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 am: 1f934beedd am: 8762a560fc | Tao Bao | 2016-11-29 | 4 | -89/+93 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 am: 1f934beedd | Tao Bao | 2016-11-29 | 4 | -89/+93 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 | Tao Bao | 2016-11-29 | 4 | -89/+93 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." | Tao Bao | 2016-11-29 | 4 | -89/+93 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." | Tao Bao | 2016-11-29 | 4 | -89/+93 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | Remove ota_close(int) and ota_fclose(FILE*). | Tao Bao | 2016-11-28 | 4 | -89/+93 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf am: 839fbbdad3 am: 6a8e0eb164 | Tao Bao | 2016-11-29 | 3 | -9/+25 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf am: 839fbbdad3 | Tao Bao | 2016-11-29 | 3 | -9/+25 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf | Tao Bao | 2016-11-29 | 3 | -9/+25 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." | Tao Bao | 2016-11-29 | 3 | -9/+25 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." | Tao Bao | 2016-11-29 | 3 | -9/+25 |
| | | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&). | Tao Bao | 2016-11-23 | 3 | -9/+25 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." am: d226f28e87 am: fcfdda98da am: 5e52ac31d4 | Tao Bao | 2016-11-29 | 1 | -31/+144 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." am: d226f28e87 am: fcfdda98da | Tao Bao | 2016-11-29 | 1 | -31/+144 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." am: d226f28e87 | Tao Bao | 2016-11-29 | 1 | -31/+144 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." | Tao Bao | 2016-11-29 | 1 | -31/+144 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." | Tao Bao | 2016-11-29 | 1 | -31/+144 |
| | | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | tests: Add testcases for EMMC targets. | Tao Bao | 2016-11-22 | 1 | -31/+144 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours am: 67bc0b9573 -s ours am: b7d4d77b3e -s ours | Andriy Naborskyy | 2016-11-23 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours am: 67bc0b9573 -s ours | Andriy Naborskyy | 2016-11-23 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours | Andriy Naborskyy | 2016-11-23 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE updater: Add "write_value()" function. am: 1bf1772625 -s ours | Tao Bao | 2016-11-22 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE updater: Add "write_value()" function. | Tao Bao | 2016-11-22 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | DO NOT MERGE updater: Add "write_value()" function. | Tao Bao | 2016-11-18 | 1 | -1/+28 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407 am: 1aa41a106d am: b4aae79230 | Tao Bao | 2016-11-21 | 1 | -5/+5 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407 am: 1aa41a106d | Tao Bao | 2016-11-21 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407 | Tao Bao | 2016-11-21 | 1 | -5/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." | Tao Bao | 2016-11-21 | 1 | -5/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." | Treehugger Robot | 2016-11-21 | 1 | -5/+5 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | applypatch: Release FD when explicitly calling close. | Tao Bao | 2016-11-21 | 1 | -5/+5 |
| | | | | | |_|/ / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f am: 2a962adc85 am: 5713071c81 | Tao Bao | 2016-11-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f am: 2a962adc85 | Tao Bao | 2016-11-21 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f | Tao Bao | 2016-11-21 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" | Tao Bao | 2016-11-21 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" | Tao Bao | 2016-11-21 | 1 | -0/+8 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | Fail gracefully when we fail to fork the update binary | Matthew Bouyack | 2016-11-21 | 1 | -0/+8 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cf589f523a -s ours am: 92ac9041c1 -s ours | Bill Yi | 2016-11-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cf589f523a -s ours | Bill Yi | 2016-11-21 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master | Bill Yi | 2016-11-21 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master | TreeHugger Robot | 2016-11-21 | 78 | -312/+390 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 9a4ff5a900 -s ours am: 8d7399f553 -s ours | Bill Yi | 2016-11-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 9a4ff5a900 -s ours | Bill Yi | 2016-11-21 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-11-21 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-11-21 | 78 | -312/+390 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc am: fa62ae6d0b am: 4cbedcc679 | Tao Bao | 2016-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc am: fa62ae6d0b | Tao Bao | 2016-11-20 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc | Tao Bao | 2016-11-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." | Tao Bao | 2016-11-20 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / /
| | | |/| / / / / / / / / / / / / / / / / /
| | | | |/ / / / / / / / / / / / / / / / / |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." | Tao Bao | 2016-11-20 | 2 | -39/+186 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | Call update_engine_sideload from recovery. | Alex Deymo | 2016-11-20 | 2 | -39/+186 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486 am: 146f92ab3e am: 062a2cffb3 | Tao Bao | 2016-11-20 | 6 | -91/+193 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486 am: 146f92ab3e | Tao Bao | 2016-11-20 | 6 | -91/+193 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486 | Tao Bao | 2016-11-20 | 6 | -91/+193 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." | Tao Bao | 2016-11-20 | 6 | -91/+193 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." | Tao Bao | 2016-11-20 | 6 | -91/+193 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | updater: Refactor set_stage() and get_stage() functions. | Tao Bao | 2016-11-18 | 6 | -91/+193 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master am: ad57e2ca2c am: 9f4d385704 | Tao Bao | 2016-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master am: ad57e2ca2c | Tao Bao | 2016-11-20 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master | Tao Bao | 2016-11-20 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master | Tao Bao | 2016-11-20 | 1 | -2/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master. am: 5422d80961 am: ca64fa7bb9 | Tao Bao | 2016-11-20 | 1 | -2/+6 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master. am: 5422d80961 | Tao Bao | 2016-11-20 | 1 | -2/+6 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master. | Tao Bao | 2016-11-20 | 1 | -2/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master. | Tao Bao | 2016-11-19 | 1 | -2/+6 |
* | | | | | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line. am: fbde508ace am: 52b4d869b0 | Tao Bao | 2016-11-19 | 1 | -1/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line. am: fbde508ace | Tao Bao | 2016-11-19 | 1 | -1/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line. | Tao Bao | 2016-11-19 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line. | Tao Bao | 2016-11-19 | 1 | -1/+0 |
| | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aosp am: 692e95aa87 | Connor O'Brien | 2016-11-18 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aosp | Connor O'Brien | 2016-11-18 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aosp | Connor O'Brien | 2016-11-18 | 2 | -25/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL" am: 7206ec7a1d | Connor O'Brien | 2016-11-18 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL" | Connor O'Brien | 2016-11-18 | 2 | -25/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL" | Connor O'Brien | 2016-11-18 | 2 | -25/+15 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours am: 6fd51ffdaa am: b5cf492040 | Connor O'Brien | 2016-11-18 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours am: 6fd51ffdaa | Connor O'Brien | 2016-11-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours | Connor O'Brien | 2016-11-18 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" | Connor O'Brien | 2016-11-18 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" | Connor O'Brien | 2016-11-18 | 2 | -21/+15 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL" | Connor O'Brien | 2016-11-18 | 2 | -21/+15 |
* | | | | | | | | | | | | | | | | | | | | | | | Skip this change on AOSP. | Yifan Hong | 2016-11-18 | 0 | -0/+0 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e am: d109c788ad am: 9b1a791e3c | Tao Bao | 2016-11-18 | 3 | -17/+119 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e am: d109c788ad | Tao Bao | 2016-11-18 | 3 | -17/+119 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e | Tao Bao | 2016-11-18 | 3 | -17/+119 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." | Tao Bao | 2016-11-18 | 3 | -17/+119 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." | Tao Bao | 2016-11-18 | 3 | -17/+119 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | updater: Add testcase for package_extract_dir(). | Tao Bao | 2016-11-18 | 3 | -17/+119 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" | Connor O'Brien | 2016-11-18 | 2 | -25/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL" | Connor O'Brien | 2016-11-18 | 2 | -25/+15 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc am: d2cd8b4d30 am: 776ea9b464 | Tao Bao | 2016-11-18 | 2 | -282/+280 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc am: d2cd8b4d30 | Tao Bao | 2016-11-18 | 2 | -282/+280 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc | Tao Bao | 2016-11-18 | 2 | -282/+280 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." | Tao Bao | 2016-11-18 | 2 | -282/+280 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." | Tao Bao | 2016-11-18 | 2 | -282/+280 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | applypatch: Use unique_fd to avoid leaking FDs. | Tao Bao | 2016-11-17 | 2 | -282/+280 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." am: d00046b691 am: 100dba35f9 am: 29dc892c07 | Tao Bao | 2016-11-18 | 2 | -3/+64 |
|\| | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." am: d00046b691 am: 100dba35f9 | Tao Bao | 2016-11-18 | 2 | -3/+64 |
| |\| | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." am: d00046b691 | Tao Bao | 2016-11-18 | 2 | -3/+64 |
| | |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." | Tao Bao | 2016-11-18 | 2 | -3/+64 |
| | | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." | Tao Bao | 2016-11-18 | 2 | -3/+64 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | | updater: Add "write_value()" function. | Tao Bao | 2016-11-17 | 2 | -3/+64 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df am: 9e4ba70b7f am: c43acc9938 | Tao Bao | 2016-11-17 | 1 | -283/+257 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df am: 9e4ba70b7f | Tao Bao | 2016-11-17 | 1 | -283/+257 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df | Tao Bao | 2016-11-17 | 1 | -283/+257 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." | Tao Bao | 2016-11-17 | 1 | -283/+257 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." | Tao Bao | 2016-11-17 | 1 | -283/+257 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |/ / / / / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | | applypatch: Clean up LoadPartitionContents(). | Tao Bao | 2016-11-17 | 1 | -283/+257 |
| | | | | |/ / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s ours am: b9d1cd7713 -s ours am: 97f6af8d34 -s ours | Connor O'Brien | 2016-11-17 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s ours am: b9d1cd7713 -s ours | Connor O'Brien | 2016-11-17 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s ours | Connor O'Brien | 2016-11-17 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
| | | |_|_|_|_|/ / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" | Connor O'Brien | 2016-11-17 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" | Connor O'Brien | 2016-11-17 | 2 | -15/+21 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | |/| | / / / / / / / / / / / / / / / / /
| | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HAL | Connor O'Brien | 2016-11-16 | 2 | -15/+21 |
| | | | | | |_|_|/ / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HAL am: 86199a47e1 | Connor O'Brien | 2016-11-17 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HAL | Connor O'Brien | 2016-11-17 | 2 | -15/+25 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HAL | Connor O'Brien | 2016-11-17 | 2 | -15/+25 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 am: 849a911dee am: 6a6e54da04 | Rahul Chaudhry | 2016-11-16 | 2 | -3/+3 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 am: 849a911dee | Rahul Chaudhry | 2016-11-16 | 2 | -3/+3 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 | Rahul Chaudhry | 2016-11-16 | 2 | -3/+3 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." | Rahul Chaudhry | 2016-11-16 | 2 | -3/+3 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." | Treehugger Robot | 2016-11-16 | 2 | -3/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | Remove unnecessary uses of reinterpret_cast. | Rahul Chaudhry | 2016-11-16 | 2 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" | Connor O'Brien | 2016-11-16 | 2 | -15/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HAL | Connor O'Brien | 2016-11-16 | 2 | -15/+25 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c am: 0c15140dad am: b8c4ae9f80 | Tao Bao | 2016-11-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c am: 0c15140dad | Tao Bao | 2016-11-16 | 6 | -29/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c | Tao Bao | 2016-11-16 | 6 | -29/+29 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." | Tao Bao | 2016-11-16 | 6 | -29/+29 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." | Tao Bao | 2016-11-16 | 6 | -29/+29 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap. | Rahul Chaudhry | 2016-11-16 | 6 | -29/+29 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-master am: f83101a911 am: 7563bad2ac | Tao Bao | 2016-11-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-master am: f83101a911 | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-master | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-master | Tao Bao | 2016-11-16 | 6 | -137/+197 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "updater: Fix the wrong return value for package_extract_file()." | Tao Bao | 2016-11-16 | 6 | -137/+197 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | updater: Fix the wrong return value for package_extract_file(). | Tao Bao | 2016-11-15 | 6 | -137/+197 |
| | | | | | |/ / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' am: d6137a2ae0 am: 38236d0f35 am: 2e55280df2 | Tao Bao | 2016-11-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' am: d6137a2ae0 am: 38236d0f35 | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' am: d6137a2ae0 | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' | Tao Bao | 2016-11-16 | 5 | -67/+93 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: 97eda9db70 am: c2f6ebf15b am: 9c29567c67 | Damien Bargiacchi | 2016-11-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: 97eda9db70 am: c2f6ebf15b | Damien Bargiacchi | 2016-11-16 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: 97eda9db70 | Damien Bargiacchi | 2016-11-16 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font | Damien Bargiacchi | 2016-11-16 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font | Damien Bargiacchi | 2016-11-16 | 2 | -8/+16 |
* | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-master am: 03eb766a56 am: 7f0a56dbf1 | Tao Bao | 2016-11-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-master am: 03eb766a56 | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-master | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-master | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Support use of custom fonts in miniui | Damien Bargiacchi | 2016-11-15 | 5 | -65/+83 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | / / / / / / / / / / / / / / / / | updater: Fix the wrong return value for package_extract_file(). am: 2274e57f67 | Tao Bao | 2016-11-16 | 6 | -137/+197 |
|\| | | | | | | | | | | | | | | | | | | |
| |_|_|_|/ / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | updater: Fix the wrong return value for package_extract_file(). | Tao Bao | 2016-11-16 | 6 | -137/+197 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | updater: Fix the wrong return value for package_extract_file(). | Tao Bao | 2016-11-16 | 6 | -137/+197 |
* | | | | | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." am: b76960c984 am: 1f0af0c2ea am: db50f8863a | Tao Bao | 2016-11-14 | 1 | -0/+14 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." am: b76960c984 am: 1f0af0c2ea | Tao Bao | 2016-11-14 | 1 | -0/+14 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." am: b76960c984 | Tao Bao | 2016-11-14 | 1 | -0/+14 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." | Tao Bao | 2016-11-14 | 1 | -0/+14 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." | Tao Bao | 2016-11-14 | 1 | -0/+14 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | Add .clang-format style file. | Tao Bao | 2016-11-07 | 1 | -0/+14 |
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649 am: 08c4130493 am: 0f81984970 | Tao Bao | 2016-11-14 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649 am: 08c4130493 | Tao Bao | 2016-11-14 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649 | Tao Bao | 2016-11-14 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." | Tao Bao | 2016-11-14 | 1 | -1/+1 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." | Tao Bao | 2016-11-14 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | Fix "ordered comparison between pointer and zero". | MinSeong Kim | 2016-11-11 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 am: f2574b8206 am: 91f736fe1a | Tianjie Xu | 2016-11-12 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 am: f2574b8206 | Tianjie Xu | 2016-11-12 | 1 | -2/+18 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 | Tianjie Xu | 2016-11-12 | 1 | -2/+18 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" | Tianjie Xu | 2016-11-12 | 1 | -2/+18 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" | Tianjie Xu | 2016-11-12 | 1 | -2/+18 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | Allow uncrypt to work without socket communication | Tianjie Xu | 2016-11-11 | 1 | -2/+18 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfe am: 62aaba5a3f | Vineela Tummalapalli | 2016-11-10 | 2 | -0/+22 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfe | Vineela Tummalapalli | 2016-11-10 | 2 | -0/+22 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 | Vineela Tummalapalli | 2016-11-10 | 2 | -0/+22 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." | Vineela Tummalapalli | 2016-11-10 | 2 | -0/+22 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." | Treehugger Robot | 2016-11-10 | 2 | -0/+22 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | Add 'reboot bootloader' to bootloader_message. | Vineela Tummalapalli | 2016-11-10 | 2 | -0/+22 |
| | | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." | TreeHugger Robot | 2016-11-10 | 6 | -30/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap. | Rahul Chaudhry | 2016-11-09 | 6 | -30/+30 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours am: 96c3c32b66 am: b86af2577c | Tianjie Xu | 2016-11-10 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours am: 96c3c32b66 | Tianjie Xu | 2016-11-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours | Tianjie Xu | 2016-11-10 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" | Tianjie Xu | 2016-11-10 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" | Tianjie Xu | 2016-11-10 | 2 | -12/+128 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Touch blocks in care_map in update_verifier | Tianjie Xu | 2016-11-09 | 2 | -12/+128 |
| | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 am: 2c175c302c am: 7da0c7e439 | Tao Bao | 2016-11-09 | 2 | -26/+56 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 am: 2c175c302c | Tao Bao | 2016-11-09 | 2 | -26/+56 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 | Tao Bao | 2016-11-09 | 2 | -26/+56 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." | Tao Bao | 2016-11-09 | 2 | -26/+56 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." | Tao Bao | 2016-11-09 | 2 | -26/+56 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | updater: Add more testcase for symlink(). | Tao Bao | 2016-11-09 | 2 | -26/+56 |
| | | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23 am: d9d435cd83 | Tao Bao | 2016-11-09 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23 | Tao Bao | 2016-11-09 | 2 | -12/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." am: b80d136dca | Tao Bao | 2016-11-09 | 2 | -12/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." | Tao Bao | 2016-11-09 | 2 | -12/+1 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." | Tao Bao | 2016-11-09 | 2 | -12/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | otautil: Clean up obsolete includes. | Tao Bao | 2016-11-08 | 2 | -12/+1 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." | Tao Bao | 2016-11-09 | 2 | -12/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | otautil: Clean up obsolete includes. | Tao Bao | 2016-11-08 | 2 | -12/+0 |
| | |_|_|_|/ / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "healthd: change how charger is launched in recovery." | Sandeep Patil | 2016-11-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | healthd: change how charger is launched in recovery. | Sandeep Patil | 2016-11-01 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7 am: 260573b3c2 | Tianjie Xu | 2016-11-08 | 2 | -19/+49 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7 | Tianjie Xu | 2016-11-08 | 2 | -19/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" am: 52e2a97aa7 | Tianjie Xu | 2016-11-08 | 2 | -19/+49 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" | Tianjie Xu | 2016-11-08 | 2 | -19/+49 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" | Treehugger Robot | 2016-11-08 | 2 | -19/+49 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | Make make_parent() to take const argument | Tianjie Xu | 2016-11-08 | 2 | -19/+49 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 am: e9390679c9 am: a1c121e034 | Tianjie Xu | 2016-11-08 | 4 | -92/+112 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 am: e9390679c9 | Tianjie Xu | 2016-11-08 | 4 | -92/+112 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 | Tianjie Xu | 2016-11-08 | 4 | -92/+112 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" | Tianjie Xu | 2016-11-08 | 4 | -92/+112 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" | Treehugger Robot | 2016-11-08 | 4 | -92/+112 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Move recovery_test.cpp out of unit test | Tianjie Xu | 2016-11-08 | 4 | -92/+112 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660d am: 5d52303488 | Tao Bao | 2016-11-08 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660d | Tao Bao | 2016-11-08 | 4 | -200/+349 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-master | Tao Bao | 2016-11-08 | 4 | -200/+349 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-master | Tao Bao | 2016-11-08 | 4 | -200/+349 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up SysUtil.cpp." | Tao Bao | 2016-11-08 | 4 | -195/+344 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | otautil: Clean up SysUtil.cpp. | Tao Bao | 2016-11-07 | 4 | -195/+344 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | otautil: Clean up SysUtil.cpp. | Tao Bao | 2016-11-08 | 4 | -201/+350 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 am: f46041a7d4 am: a99c6eab22 | Tao Bao | 2016-11-07 | 1 | -59/+50 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 am: f46041a7d4 | Tao Bao | 2016-11-07 | 1 | -59/+50 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 | Tao Bao | 2016-11-07 | 1 | -59/+50 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." | Tao Bao | 2016-11-07 | 1 | -59/+50 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." | Tao Bao | 2016-11-07 | 1 | -59/+50 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | tests: Fix unit/zip_test.cpp. | Tao Bao | 2016-11-04 | 1 | -59/+50 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df am: 05a801ca8e am: 8269eb0d1f | Tao Bao | 2016-11-04 | 2 | -1/+33 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df am: 05a801ca8e | Tao Bao | 2016-11-04 | 2 | -1/+33 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df | Tao Bao | 2016-11-04 | 2 | -1/+33 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." | Tao Bao | 2016-11-04 | 2 | -1/+33 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." | Tao Bao | 2016-11-04 | 2 | -1/+33 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | updater: Add a testcase for RenameFn(). | Tao Bao | 2016-11-04 | 2 | -1/+33 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 am: 99adda9d67 am: 92097726ef | Tianjie Xu | 2016-11-04 | 6 | -182/+178 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 am: 99adda9d67 | Tianjie Xu | 2016-11-04 | 6 | -182/+178 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 | Tianjie Xu | 2016-11-04 | 6 | -182/+178 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" | Tianjie Xu | 2016-11-04 | 6 | -182/+178 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" | Tianjie Xu | 2016-11-04 | 6 | -182/+178 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | Cleanup the duplicates of logs rotation functions | Tianjie Xu | 2016-11-04 | 6 | -182/+178 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0 am: 4f91ca78b9 am: 786b083b8e | Tao Bao | 2016-11-04 | 2 | -9/+46 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0 am: 4f91ca78b9 | Tao Bao | 2016-11-04 | 2 | -9/+46 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0 | Tao Bao | 2016-11-04 | 2 | -9/+46 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." | Tao Bao | 2016-11-04 | 2 | -9/+46 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." | Tao Bao | 2016-11-04 | 2 | -9/+46 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | updater: Fix a bug in DeleteFn(). | Tao Bao | 2016-11-04 | 2 | -9/+46 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 am: cb3cbaffac am: b9c3411de7 | Tao Bao | 2016-11-04 | 7 | -70/+69 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 am: cb3cbaffac | Tao Bao | 2016-11-04 | 7 | -70/+69 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 | Tao Bao | 2016-11-04 | 7 | -70/+69 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" | Tao Bao | 2016-11-04 | 7 | -70/+69 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" | Tao Bao | 2016-11-04 | 7 | -70/+69 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Revert "Revert "Some cleanups to recovery."" | Tao Bao | 2016-11-03 | 7 | -70/+69 |
| | | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0 am: 917be35f0f am: 4098285e8c | Tao Bao | 2016-11-04 | 2 | -6/+59 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0 am: 917be35f0f | Tao Bao | 2016-11-04 | 2 | -6/+59 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0 | Tao Bao | 2016-11-04 | 2 | -6/+59 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." | Tao Bao | 2016-11-04 | 2 | -6/+59 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." | Tao Bao | 2016-11-04 | 2 | -6/+59 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | updater: Fix an off-by-1 bug in file_getprop(). | Tao Bao | 2016-11-03 | 2 | -6/+59 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161a am: a98b4e4bef am: f35ce240a1 | Tao Bao | 2016-11-03 | 4 | -31/+23 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161a am: a98b4e4bef | Tao Bao | 2016-11-03 | 4 | -31/+23 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161a | Tao Bao | 2016-11-03 | 4 | -31/+23 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." | Tao Bao | 2016-11-03 | 4 | -31/+23 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." | Tao Bao | 2016-11-03 | 4 | -31/+23 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | tests: Set up testdata path for continuous native tests. | Tao Bao | 2016-11-03 | 4 | -31/+23 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4 am: 4fc42365ac am: 24356d778f | Tao Bao | 2016-11-02 | 11 | -287/+426 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4 am: 4fc42365ac | Tao Bao | 2016-11-02 | 11 | -287/+426 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4 | Tao Bao | 2016-11-02 | 11 | -287/+426 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." | Tao Bao | 2016-11-02 | 11 | -287/+426 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." | Treehugger Robot | 2016-11-02 | 11 | -287/+426 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | applypatch: Add testcases for applypatch executable. | Tao Bao | 2016-11-01 | 11 | -287/+426 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c am: 88fc75ee54 am: 0b6085a341 | Tianjie Xu | 2016-11-02 | 4 | -632/+424 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c am: 88fc75ee54 | Tianjie Xu | 2016-11-02 | 4 | -632/+424 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c | Tianjie Xu | 2016-11-02 | 4 | -632/+424 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" | Tianjie Xu | 2016-11-02 | 4 | -632/+424 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" | Tianjie Xu | 2016-11-02 | 4 | -632/+424 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | Cleanup ReadArgs & ReadValueArgs usage | Tianjie Xu | 2016-11-01 | 4 | -632/+424 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | / / / / / / / / / / / / / / / / | Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef am: bc48de6bf0 am: edf2928edf | Tao Bao | 2016-11-01 | 5 | -152/+162 |
|\| | | | | | | | | | | | | | | | | | | |
| |_|_|_|/ / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef am: bc48de6bf0 | Tao Bao | 2016-11-01 | 5 | -152/+162 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef | Tao Bao | 2016-11-01 | 5 | -152/+162 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector." | Tao Bao | 2016-11-01 | 5 | -152/+162 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector." | Tao Bao | 2016-11-01 | 5 | -152/+162 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | applypatch: Switch the parameter of Value** to std::vector. | Tao Bao | 2016-10-29 | 5 | -152/+162 |
| | | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours am: 67bc0b9573 -s ours am: 9ab6af5a61 -s ours | Andriy Naborskyy | 2016-10-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours am: 67bc0b9573 -s ours | Andriy Naborskyy | 2016-10-27 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours | Andriy Naborskyy | 2016-10-27 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours | Andriy Naborskyy | 2016-10-27 | 0 | -0/+0 |
| | |/| | | | | | | | | | | | | | | | |
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours | Andriy Naborskyy | 2016-10-27 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours | Andriy Naborskyy | 2016-10-27 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |_|_|/ / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours | Andriy Naborskyy | 2016-10-27 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | |_|_|/ / / / / / / / / /
| | | | | | |/| | | | | | | | | | | | |
|
| | | | | | * | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init | Andriy Naborskyy | 2016-10-27 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | |_|_|/ / / / / / / / /
| | | | | | | |/| | | | | | | | | | | |
|
| | | | | | | * | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init | Andriy Naborskyy | 2016-10-25 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 am: 0c571e5923 am: 3456ee19f9 | Dan Albert | 2016-10-27 | 7 | -63/+70 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 am: 0c571e5923 | Dan Albert | 2016-10-27 | 7 | -63/+70 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 | Dan Albert | 2016-10-27 | 7 | -63/+70 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|/ / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" | Dan Albert | 2016-10-27 | 7 | -63/+70 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|/ / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" | Treehugger Robot | 2016-10-27 | 7 | -63/+70 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Revert "Some cleanups to recovery." | Dan Albert | 2016-10-27 | 7 | -63/+70 |
* | | | | | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." am: 46fb0a6a6f am: 00f893fe23 am: 05c68a8775 | Tao Bao | 2016-10-27 | 7 | -70/+63 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." am: 46fb0a6a6f am: 00f893fe23 | Tao Bao | 2016-10-27 | 7 | -70/+63 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." am: 46fb0a6a6f | Tao Bao | 2016-10-27 | 7 | -70/+63 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." | Tao Bao | 2016-10-27 | 7 | -70/+63 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." | Treehugger Robot | 2016-10-27 | 7 | -70/+63 |
| | | | |\| | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | Some cleanups to recovery. | Tao Bao | 2016-10-26 | 7 | -70/+63 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2 am: 750bb46305 am: 74851d8191 | Tao Bao | 2016-10-26 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2 am: 750bb46305 | Tao Bao | 2016-10-26 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2 | Tao Bao | 2016-10-26 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" | Tao Bao | 2016-10-26 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" | Tao Bao | 2016-10-26 | 2 | -14/+41 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Skip update-on-boot for bootreason in blacklist | Tianjie Xu | 2016-10-26 | 2 | -14/+41 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc am: 8f9672c0db am: ab526b1246 | Tao Bao | 2016-10-26 | 1 | -1/+12 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc am: 8f9672c0db | Tao Bao | 2016-10-26 | 1 | -1/+12 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc | Tao Bao | 2016-10-26 | 1 | -1/+12 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." | Tao Bao | 2016-10-26 | 1 | -1/+12 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." | Tao Bao | 2016-10-26 | 1 | -1/+12 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | tests: Generate testdata for 2nd arch. | Tao Bao | 2016-10-26 | 1 | -1/+12 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba am: 565273839e am: 6d9f8993b0 | Tao Bao | 2016-10-25 | 1 | -2/+3 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba am: 565273839e | Tao Bao | 2016-10-25 | 1 | -2/+3 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba | Tao Bao | 2016-10-25 | 1 | -2/+3 |
| |/| | | | | | | | | | | | | | | | |
| | |/ / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." | Tao Bao | 2016-10-25 | 1 | -2/+3 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." | Tao Bao | 2016-10-25 | 1 | -2/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | applypatch: Fix the bug when constructing VAL_BLOB. | Tao Bao | 2016-10-25 | 1 | -2/+3 |
| | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Shrink all recovery loop images with zopflipng am: 2f2c723d1b | Damien Bargiacchi | 2016-10-20 | 455 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Shrink all recovery loop images with zopflipng | Damien Bargiacchi | 2016-10-20 | 455 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Shrink all recovery loop images with zopflipng | Damien Bargiacchi | 2016-10-20 | 455 | -0/+0 |
* | | | | | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." am: fd796317c3 am: a866b12c2d | Yabin Cui | 2016-10-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." am: fd796317c3 | Yabin Cui | 2016-10-19 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." | Yabin Cui | 2016-10-19 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." | Treehugger Robot | 2016-10-19 | 6 | -204/+140 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | Verify wipe package when wiping A/B device in recovery. | Yabin Cui | 2016-10-19 | 6 | -204/+140 |
| | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check" am: 06603c76c5 am: d7d7f3c792 | Tianjie Xu | 2016-10-19 | 1 | -0/+5 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check" am: 06603c76c5 | Tianjie Xu | 2016-10-19 | 1 | -0/+5 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check" | Tianjie Xu | 2016-10-19 | 1 | -0/+5 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check" | Treehugger Robot | 2016-10-19 | 1 | -0/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | Add a unit test for applypatch_check | Tianjie Xu | 2016-10-19 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery" am: 94f4494613 am: 7691800c2e | Tianjie Xu | 2016-10-19 | 1 | -29/+13 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery" am: 94f4494613 | Tianjie Xu | 2016-10-19 | 1 | -29/+13 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery" | Tianjie Xu | 2016-10-19 | 1 | -29/+13 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery" | Treehugger Robot | 2016-10-19 | 1 | -29/+13 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Clean up bootloader_message usage in recovery | Tianjie Xu | 2016-10-19 | 1 | -29/+13 |
| | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37 am: ece0b68ca6 | Tianjie Xu | 2016-10-19 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37 | Tianjie Xu | 2016-10-19 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler" | Tianjie Xu | 2016-10-19 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler" | Tianjie Xu | 2016-10-19 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | Fix applypatch_check failure when applying update on angler | Tianjie Xu | 2016-10-18 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | Merge "Fix bootloader_message." am: 7c95fe10de am: 83e4e6d35c | Yabin Cui | 2016-10-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Fix bootloader_message." am: 7c95fe10de | Yabin Cui | 2016-10-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Fix bootloader_message." | Yabin Cui | 2016-10-19 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Fix bootloader_message." | Treehugger Robot | 2016-10-19 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | Fix bootloader_message. | Yabin Cui | 2016-10-19 | 1 | -1/+1 |
| | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of e89bf25 to stage-aosp-master am: 69c117c2ff | Tao Bao | 2016-10-19 | 1 | -5/+6 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of e89bf25 to stage-aosp-master | Tao Bao | 2016-10-19 | 1 | -5/+6 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | resolve merge conflicts of e89bf25 to stage-aosp-master | Tao Bao | 2016-10-19 | 1 | -5/+6 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Create bootloader_message static library." | Tao Bao | 2016-10-18 | 8 | -207/+354 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | Create bootloader_message static library. | Yabin Cui | 2016-10-18 | 8 | -207/+354 |
| | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 434697f to master | Tianjie Xu | 2016-10-19 | 34 | -2342/+472 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 6fba98c to stage-aosp-master | Tianjie Xu | 2016-10-19 | 34 | -2345/+476 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | resolve merge conflicts of 6fba98c to stage-aosp-master | Tianjie Xu | 2016-10-18 | 34 | -2345/+476 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Replace minzip with libziparchive" | Tianjie Xu | 2016-10-18 | 33 | -2322/+448 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Replace minzip with libziparchive | Tianjie Xu | 2016-10-18 | 33 | -2322/+448 |
| | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge "Change StringValue to use std::string" am: 2b17b24ae5 am: 430b7ae469 | Tianjie Xu | 2016-10-18 | 16 | -528/+505 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Change StringValue to use std::string" am: 2b17b24ae5 | Tianjie Xu | 2016-10-18 | 16 | -528/+505 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Change StringValue to use std::string" | Tianjie Xu | 2016-10-18 | 16 | -528/+505 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Change StringValue to use std::string" | Treehugger Robot | 2016-10-18 | 16 | -528/+505 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | Change StringValue to use std::string | Tianjie Xu | 2016-10-15 | 16 | -528/+505 |
* | | | | | | | | | | | | | | | | | | | Merge "init: move healthd to late-init" am: a01ffc73ef am: 4de11bb370 | Tao Bao | 2016-10-17 | 1 | -1/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "init: move healthd to late-init" am: a01ffc73ef | Tao Bao | 2016-10-17 | 1 | -1/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "init: move healthd to late-init" | Tao Bao | 2016-10-17 | 1 | -1/+0 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "init: move healthd to late-init" | Tao Bao | 2016-10-17 | 1 | -1/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | init: move healthd to late-init | Andriy Naborskyy | 2016-10-11 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 08d0ae9 to stage-aosp-master am: ddf293aa0c | Tao Bao | 2016-10-15 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 08d0ae9 to stage-aosp-master | Tao Bao | 2016-10-15 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 08d0ae9 to stage-aosp-master | Tao Bao | 2016-10-15 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "Fix the prefix matching for uncrypt status." | Treehugger Robot | 2016-10-15 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status. | Tao Bao | 2016-10-14 | 1 | -2/+2 |
| | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status. | Tao Bao | 2016-10-14 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status. | Tao Bao | 2016-10-14 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status. | Tao Bao | 2016-10-14 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify." am: c5b4b71913 am: 039e9dc5ca am: bd16939bbf | Tao Bao | 2016-10-13 | 8 | -98/+70 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify." am: c5b4b71913 am: 039e9dc5ca | Tao Bao | 2016-10-13 | 8 | -98/+70 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "edify: Some clean-ups to libedify." am: c5b4b71913 | Tao Bao | 2016-10-13 | 8 | -98/+70 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify." | Tao Bao | 2016-10-13 | 8 | -98/+70 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify." | Tao Bao | 2016-10-13 | 8 | -98/+70 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | edify: Some clean-ups to libedify. | Tao Bao | 2016-10-13 | 8 | -98/+70 |
| | | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 am: 3ac1995cfd am: aa9f017ceb | Tao Bao | 2016-10-12 | 2 | -43/+55 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 am: 3ac1995cfd | Tao Bao | 2016-10-12 | 2 | -43/+55 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 | Tao Bao | 2016-10-12 | 2 | -43/+55 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." | Tao Bao | 2016-10-12 | 2 | -43/+55 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." | Tao Bao | 2016-10-12 | 2 | -43/+55 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | updater: Kill the duplicate PrintSha1() in install.cpp. | Tao Bao | 2016-10-11 | 2 | -43/+55 |
| | | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." am: a7995d7581 am: f2cbf0fbe0 am: 44864a75ed | Tao Bao | 2016-10-11 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." am: a7995d7581 am: f2cbf0fbe0 | Tao Bao | 2016-10-11 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." am: a7995d7581 | Tao Bao | 2016-10-11 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." | Tao Bao | 2016-10-11 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." | Tao Bao | 2016-10-11 | 9 | -85/+196 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. am: 0c7839ac14 am: cf1dbfa854 am: 8ff7cd20ba | Tao Bao | 2016-10-11 | 9 | -85/+196 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. am: 0c7839ac14 am: cf1dbfa854 | Tao Bao | 2016-10-11 | 9 | -85/+196 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. am: 0c7839ac14 | Tao Bao | 2016-10-11 | 9 | -85/+196 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. | Tao Bao | 2016-10-11 | 9 | -85/+196 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. | Tao Bao | 2016-10-11 | 9 | -85/+196 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." am: 2bd94433f8 am: 00a9050815 am: 514dc15399 | Tao Bao | 2016-10-11 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." am: 2bd94433f8 am: 00a9050815 | Tao Bao | 2016-10-11 | 4 | -11/+5 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." am: 2bd94433f8 | Tao Bao | 2016-10-10 | 4 | -11/+5 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." | Tao Bao | 2016-10-10 | 4 | -11/+5 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." | Tao Bao | 2016-10-10 | 4 | -11/+5 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Update the header path for ext4_utils. | Tao Bao | 2016-10-09 | 4 | -11/+5 |
* | | | | | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." | Tao Bao | 2016-10-10 | 4 | -11/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | Update the header path for ext4_utils. | Tao Bao | 2016-10-07 | 4 | -11/+5 |
* | | | | | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfd am: 5ceada5bea | Mark Salyzyn | 2016-10-10 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfd | Mark Salyzyn | 2016-10-10 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" am: b330559fb6 | Mark Salyzyn | 2016-10-10 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" | Mark Salyzyn | 2016-10-10 | 1 | -1/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" | Mark Salyzyn | 2016-10-10 | 1 | -1/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | No longer need android/log.h | Mark Salyzyn | 2016-10-07 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 09ab9a6 to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-10-09 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
| |_|_|_|_|/ / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 09ab9a6 to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-10-09 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "Disable the meaningless parts of the UI for A/B." am: aa4924cab1 | Tao Bao | 2016-10-09 | 2 | -14/+44 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "Disable the meaningless parts of the UI for A/B." | Tao Bao | 2016-10-09 | 2 | -14/+44 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "Disable the meaningless parts of the UI for A/B." | Tao Bao | 2016-10-09 | 2 | -14/+44 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | Disable the meaningless parts of the UI for A/B. | Elliott Hughes | 2016-10-09 | 2 | -14/+44 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 713ad36 to master | Tao Bao | 2016-10-05 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "edify: Move State.script and State.errmsg to std::string." am: 8810634773 am: 6674f22a2f | Tao Bao | 2016-10-05 | 5 | -86/+55 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "edify: Move State.script and State.errmsg to std::string." am: 8810634773 | Tao Bao | 2016-10-05 | 5 | -86/+55 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "edify: Move State.script and State.errmsg to std::string." | Tao Bao | 2016-10-05 | 5 | -86/+55 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "edify: Move State.script and State.errmsg to std::string." | Treehugger Robot | 2016-10-05 | 5 | -86/+55 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | edify: Move State.script and State.errmsg to std::string. | Tao Bao | 2016-10-04 | 5 | -86/+55 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | edify: Move State.script and State.errmsg to std::string. | Tao Bao | 2016-10-05 | 5 | -86/+55 |
* | | | | | | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h" am: 38b923ff6c am: 7cf7e6ce4f am: 0467a905cc | Mark Salyzyn | 2016-10-04 | 2 | -2/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h" am: 38b923ff6c am: 7cf7e6ce4f | Mark Salyzyn | 2016-10-04 | 2 | -2/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h" am: 38b923ff6c | Mark Salyzyn | 2016-10-04 | 2 | -2/+0 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h" | Mark Salyzyn | 2016-10-04 | 2 | -2/+0 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h" | Mark Salyzyn | 2016-10-04 | 2 | -2/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | recovery: drop log/logger.h | Mark Salyzyn | 2016-10-04 | 2 | -2/+0 |
* | | | | | | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest." am: 0bc2df1696 am: 6fbed10fa5 am: bace857dbb | Tao Bao | 2016-10-04 | 5 | -227/+267 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest." am: 0bc2df1696 am: 6fbed10fa5 | Tao Bao | 2016-10-04 | 5 | -227/+267 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest." am: 0bc2df1696 | Tao Bao | 2016-10-04 | 5 | -227/+267 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest." | Tao Bao | 2016-10-04 | 5 | -227/+267 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest." | Tao Bao | 2016-10-04 | 5 | -227/+267 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | edify: Move the testcases to gtest. | Tao Bao | 2016-10-04 | 5 | -227/+267 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" into nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-09-30 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" into nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-09-30 | 11 | -13/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Turn on -Werror for recovery | Tianjie Xu | 2016-09-30 | 11 | -13/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Turn on -Werror for recovery | Tianjie Xu | 2016-09-30 | 11 | -13/+27 |
* | | | | | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" am: 695ef7cacc am: 5269808bb0 am: dbde5cf1d5 -s ours | Tianjie Xu | 2016-09-30 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" am: 695ef7cacc am: 5269808bb0 | Tianjie Xu | 2016-09-30 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| / / / / / / / / / / / / / / / / /
| | |/ / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" am: 695ef7cacc | Tianjie Xu | 2016-09-30 | 10 | -13/+28 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" | Tianjie Xu | 2016-09-30 | 10 | -13/+28 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" | Tianjie Xu | 2016-09-30 | 10 | -13/+28 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Turn on -Werror for recovery | Tianjie Xu | 2016-09-30 | 10 | -13/+28 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" into nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-09-29 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" into nyc-mr1-dev-plus-aosp | TreeHugger Robot | 2016-09-29 | 3 | -25/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Report uncrypt errors in details | Tianjie Xu | 2016-09-29 | 3 | -25/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Report uncrypt errors in details | Tianjie Xu | 2016-09-29 | 3 | -25/+14 |
* | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Report uncrypt errors in details am: 37d7d67ca2 am: 4c53af080d -s ours | Tianjie Xu | 2016-09-29 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | DO NOT MERGE Report uncrypt errors in details am: 37d7d67ca2 | Tianjie Xu | 2016-09-29 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | / / / / / / / / / / / / / /
| | | |_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | DO NOT MERGE Report uncrypt errors in details | Tianjie Xu | 2016-09-29 | 3 | -40/+75 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | DO NOT MERGE Report uncrypt errors in details | Tianjie Xu | 2016-09-29 | 3 | -40/+75 |
* | | | | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" am: af8b9363c6 am: 7582609d61 am: fc887a8fba | Tianjie Xu | 2016-09-27 | 3 | -41/+88 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" am: af8b9363c6 am: 7582609d61 | Tianjie Xu | 2016-09-27 | 3 | -41/+88 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" am: af8b9363c6 | Tianjie Xu | 2016-09-27 | 3 | -41/+88 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" | Tianjie Xu | 2016-09-27 | 3 | -41/+88 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" | Treehugger Robot | 2016-09-27 | 3 | -41/+88 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Report uncrypt errors in details | Tianjie Xu | 2016-09-27 | 3 | -41/+88 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 64b92df to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-09-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 64b92df to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-09-27 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | DO NOT MERGE Duplicate the last_install content into last_log. | Tao Bao | 2016-09-27 | 2 | -39/+41 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | DO NOT MERGE Duplicate the last_install content into last_log. | Tao Bao | 2016-09-27 | 2 | -39/+41 |
* | | | | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." am: 95afc912fb am: 5ac819a51f am: c064b01898 | Tao Bao | 2016-09-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." am: 95afc912fb am: 5ac819a51f | Tao Bao | 2016-09-27 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." am: 95afc912fb | Tao Bao | 2016-09-27 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." | Tao Bao | 2016-09-27 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." | Tao Bao | 2016-09-27 | 2 | -38/+42 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of bfee61b to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-09-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of bfee61b to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-09-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Duplicate the last_install content into last_log. am: f4885adc18 | Tao Bao | 2016-09-27 | 2 | -38/+42 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Duplicate the last_install content into last_log. | Tao Bao | 2016-09-27 | 2 | -38/+42 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Duplicate the last_install content into last_log. | Tao Bao | 2016-09-26 | 2 | -38/+42 |
* | | | | | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." into nyc-mr1-dev-plus-aosp | Tao Bao | 2016-09-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." into nyc-mr1-dev-plus-aosp | Tao Bao | 2016-09-27 | 2 | -38/+41 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Duplicate the last_install content into last_log. | Tao Bao | 2016-09-27 | 2 | -38/+41 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Duplicate the last_install content into last_log. | Tao Bao | 2016-09-26 | 2 | -38/+41 |
* | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5c7d6b to nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-09-26 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5c7d6b to nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-09-26 | 8 | -49/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| / / / / / / / / / / / / / / / / / /
| | |/ / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | Merge "Switch to <android-base/properties.h>." am: cc02f9652f | Elliott Hughes | 2016-09-26 | 8 | -49/+40 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "Switch to <android-base/properties.h>." | Elliott Hughes | 2016-09-26 | 8 | -49/+40 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "Switch to <android-base/properties.h>." | Elliott Hughes | 2016-09-26 | 8 | -49/+40 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | Switch to <android-base/properties.h>. | Elliott Hughes | 2016-09-26 | 8 | -49/+40 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Fail gracefully when we fail to fork the update binary | Matthew Bouyack | 2016-09-26 | 1 | -0/+8 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Fail gracefully when we fail to fork the update binary | Matthew Bouyack | 2016-09-21 | 1 | -0/+8 |
* | | | | | | | | | | | | | | | | | | | Switch to <android-base/properties.h>. | Elliott Hughes | 2016-09-24 | 8 | -49/+40 |
* | | | | | | | | | | | | | | | | | | | Revert "DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067" | Matthew Bouyack | 2016-09-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Revert "DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067" | Matthew Bouyack | 2016-09-21 | 1 | -8/+0 |
* | | | | | | | | | | | | | | | | | | | DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067 | Matthew Bouyack | 2016-09-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | DO NOT MERGE Fail gracefully when we fail to fork the update binary | Matthew Bouyack | 2016-09-20 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | DO NOT MERGE Fail gracefully when we fail to fork the update binary | Matthew Bouyack | 2016-09-20 | 1 | -0/+8 |
* | | | | | | | | | | | | | | | | | | | Check corruption when reading uncrypt_status file am: 41a3fd4e20 am: 914f39d2d3 | Tianjie Xu | 2016-09-14 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Check corruption when reading uncrypt_status file am: 41a3fd4e20 | Tianjie Xu | 2016-09-14 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Check corruption when reading uncrypt_status file | Tianjie Xu | 2016-09-14 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Check corruption when reading uncrypt_status file | Tianjie Xu | 2016-09-13 | 1 | -0/+2 |
* | | | | | | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 am: 40bae5e1c6 am: 1d55666106 | Tianjie Xu | 2016-09-14 | 1 | -0/+2 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 am: 40bae5e1c6 | Tianjie Xu | 2016-09-14 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 | Tianjie Xu | 2016-09-14 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file" | Tianjie Xu | 2016-09-14 | 1 | -0/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file" | Treehugger Robot | 2016-09-14 | 1 | -0/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Check corruption when reading uncrypt_status file | Tianjie Xu | 2016-09-13 | 1 | -0/+2 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "Have gr_init_font alloc memory for the font" into cw-f-dev am: 7a97733f7a | Damien Bargiacchi | 2016-09-13 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Have gr_init_font alloc memory for the font" into cw-f-dev | Damien Bargiacchi | 2016-09-13 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Have gr_init_font alloc memory for the font" into cw-f-dev | Damien Bargiacchi | 2016-09-13 | 2 | -8/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: d00f5eb63a | Damien Bargiacchi | 2016-09-13 | 2 | -8/+16 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font | Damien Bargiacchi | 2016-09-13 | 2 | -8/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font | Damien Bargiacchi | 2016-09-09 | 2 | -8/+16 |
* | | | | | | | | | | | | | | | | | | | | save uncrypt status to last_install am: e16e799dfd am: 4769f209dc | Tianjie Xu | 2016-09-13 | 2 | -0/+34 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | save uncrypt status to last_install am: e16e799dfd | Tianjie Xu | 2016-09-13 | 2 | -0/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | save uncrypt status to last_install | Tianjie Xu | 2016-09-13 | 2 | -0/+34 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | save uncrypt status to last_install | Tianjie Xu | 2016-09-13 | 2 | -0/+34 |
| | | | |_|_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | Merge "save uncrypt status to last_install" am: cdf509cce2 am: 6048138e10 am: 86ea1724ae -s ours | Tianjie Xu | 2016-09-13 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "save uncrypt status to last_install" am: cdf509cce2 am: 6048138e10 | Tianjie Xu | 2016-09-13 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "save uncrypt status to last_install" am: cdf509cce2 | Tianjie Xu | 2016-09-13 | 2 | -1/+34 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "save uncrypt status to last_install" | Tianjie Xu | 2016-09-13 | 2 | -1/+34 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "save uncrypt status to last_install" | Tianjie Xu | 2016-09-13 | 2 | -1/+34 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | save uncrypt status to last_install | Tianjie Xu | 2016-09-13 | 2 | -1/+34 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of ad8b5a6 to nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-09-10 | 2 | -54/+6 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of ad8b5a6 to nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-09-09 | 2 | -54/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Remove duplicate thread loop | Damien Bargiacchi | 2016-09-09 | 2 | -54/+6 |
| | | |_|_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Remove debug log statement; fix build am: 43d186021a | Damien Bargiacchi | 2016-09-08 | 1 | -2/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Remove debug log statement; fix build | Damien Bargiacchi | 2016-09-08 | 1 | -2/+0 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Remove debug log statement; fix build | Damien Bargiacchi | 2016-09-08 | 1 | -2/+0 |
* | | | | | | | | | | | | | | | | | | Remove duplicate methods and variables from WearRecoveryUI am: 5e7cfb9af6 | Damien Bargiacchi | 2016-09-08 | 4 | -334/+148 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Remove duplicate methods and variables from WearRecoveryUI | Damien Bargiacchi | 2016-09-08 | 4 | -334/+148 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Remove duplicate methods and variables from WearRecoveryUI | Damien Bargiacchi | 2016-09-07 | 4 | -334/+148 |
* | | | | | | | | | | | | | | | | | | Merge "Switch recovery to libbase logging" am: 61590bbf0d am: c5becf0ef8 am: ec6a47ae46 -s ours | Tianjie Xu | 2016-09-02 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Switch recovery to libbase logging" am: 61590bbf0d am: c5becf0ef8 | Tianjie Xu | 2016-09-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Switch recovery to libbase logging" am: 61590bbf0d | Tianjie Xu | 2016-09-02 | 22 | -512/+323 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Switch recovery to libbase logging" | Tianjie Xu | 2016-09-02 | 22 | -512/+323 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Switch recovery to libbase logging" | Tianjie Xu | 2016-09-02 | 22 | -512/+323 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Switch recovery to libbase logging | Tianjie Xu | 2016-09-01 | 22 | -512/+323 |
* | | | | | | | | | | | | | | | | | | | Fix a typo of variable name in install.cpp | Tianjie Xu | 2016-09-02 | 1 | -6/+6 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Fix a typo of variable name in install.cpp | Tianjie Xu | 2016-09-02 | 1 | -6/+6 |
* | | | | | | | | | | | | | | | | | | | Switch recovery to libbase logging | Tianjie Xu | 2016-09-02 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Switch recovery to libbase logging | Tianjie Xu | 2016-09-01 | 20 | -546/+352 |
* | | | | | | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4 am: 852ae8d0fb am: 0ae9d80082 | Tianjie Xu | 2016-09-01 | 3 | -8/+12 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4 am: 852ae8d0fb | Tianjie Xu | 2016-09-01 | 3 | -8/+12 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4 | Tianjie Xu | 2016-09-01 | 3 | -8/+12 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0" | Tianjie Xu | 2016-09-01 | 3 | -8/+12 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0" | Treehugger Robot | 2016-09-01 | 3 | -8/+12 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | Check an edge case when read(2) returns 0 | Tianjie Xu | 2016-09-01 | 3 | -8/+12 |
| | | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Switch recovery to libbase logging | Tianjie Xu | 2016-09-01 | 20 | -545/+351 |
* | | | | | | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d am: aad4cef0f3 am: a331d85806 | Josh Gao | 2016-08-30 | 4 | -3/+28 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d am: aad4cef0f3 | Josh Gao | 2016-08-30 | 4 | -3/+28 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d | Josh Gao | 2016-08-30 | 4 | -3/+28 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main." | Josh Gao | 2016-08-30 | 4 | -3/+28 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main." | Josh Gao | 2016-08-30 | 4 | -3/+28 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | minadbd: rename adb_server_main to minadbd_main. | Josh Gao | 2016-08-30 | 4 | -3/+28 |
* | | | | | | | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 am: 9968866e86 am: d987fe1d57 | Chih-Hung Hsieh | 2016-08-27 | 3 | -4/+4 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 am: 9968866e86 | Chih-Hung Hsieh | 2016-08-27 | 3 | -4/+4 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 | Chih-Hung Hsieh | 2016-08-27 | 3 | -4/+4 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery." | Chih-Hung Hsieh | 2016-08-27 | 3 | -4/+4 |
| | | |\| | | | | | | | | | | | | | |
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery." | Treehugger Robot | 2016-08-27 | 3 | -4/+4 |
| | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Fix clang-tidy warnings in bootable/recovery. | Chih-Hung Hsieh | 2016-08-26 | 3 | -4/+4 |
| | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Merge "Support use of custom fonts in miniui" into cw-f-dev am: 929ffefdcc | Damien Bargiacchi | 2016-08-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Support use of custom fonts in miniui" into cw-f-dev | Damien Bargiacchi | 2016-08-24 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Support use of custom fonts in miniui" into cw-f-dev | Damien Bargiacchi | 2016-08-24 | 5 | -65/+83 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | Support use of custom fonts in miniui am: 35fff61b1c | Damien Bargiacchi | 2016-08-24 | 5 | -65/+83 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Support use of custom fonts in miniui | Damien Bargiacchi | 2016-08-24 | 5 | -65/+83 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Support use of custom fonts in miniui | Damien Bargiacchi | 2016-08-19 | 5 | -65/+83 |
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 7f8dc84 to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-08-18 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 7f8dc84 to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-08-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Free mmaped area if keys fail to load" am: f599414aec | Tao Bao | 2016-08-18 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Free mmaped area if keys fail to load" | Tao Bao | 2016-08-18 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Free mmaped area if keys fail to load" | Tao Bao | 2016-08-18 | 1 | -0/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Free mmaped area if keys fail to load | WiZarD | 2016-08-18 | 1 | -0/+1 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.log am: 62ab2a0fbc am: a44d4355ba | Tianjie Xu | 2016-08-18 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.log am: 62ab2a0fbc | Tianjie Xu | 2016-08-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.log | Tianjie Xu | 2016-08-18 | 1 | -31/+36 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.log | Tianjie Xu | 2016-08-18 | 1 | -31/+36 |
* | | | | | | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 am: 4e4474c9c5 am: e254b4e9e4 | Tianjie Xu | 2016-08-18 | 1 | -31/+36 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 am: 4e4474c9c5 | Tianjie Xu | 2016-08-18 | 1 | -31/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 | Tianjie Xu | 2016-08-18 | 1 | -31/+36 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log" | Tianjie Xu | 2016-08-18 | 1 | -31/+36 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log" | Tianjie Xu | 2016-08-18 | 1 | -31/+36 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.log | Tianjie Xu | 2016-08-17 | 1 | -31/+36 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails" am: cb76857147 am: 2f5cfdbb9d am: d7865e81f1 | Johan Harvyl | 2016-08-15 | 1 | -1/+14 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails" am: cb76857147 am: 2f5cfdbb9d | Johan Harvyl | 2016-08-15 | 1 | -1/+14 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails" am: cb76857147 | Johan Harvyl | 2016-08-15 | 1 | -1/+14 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails" | Johan Harvyl | 2016-08-15 | 1 | -1/+14 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails" | Treehugger Robot | 2016-08-15 | 1 | -1/+14 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Format formattable partitions if mount fails | Johan Harvyl | 2016-08-12 | 1 | -1/+14 |
* | | | | | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64. am: 53c107f068 am: 0d345b6731 | Alex Deymo | 2016-08-13 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64. am: 53c107f068 | Alex Deymo | 2016-08-13 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64. | Alex Deymo | 2016-08-13 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64. | Alex Deymo | 2016-08-12 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | | Merge "Add inttypes.h for PRIu64." into nyc-mr1-dev-plus-aosp | Alex Deymo | 2016-08-12 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "Add inttypes.h for PRIu64." into nyc-mr1-dev-plus-aosp | Alex Deymo | 2016-08-12 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Add inttypes.h for PRIu64. | Alex Deymo | 2016-08-12 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64. | Alex Deymo | 2016-08-12 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers." am: e4cf854dbf am: c687a72d9f am: d7067c7fea | Josh Gao | 2016-08-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers." am: e4cf854dbf am: c687a72d9f | Josh Gao | 2016-08-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| | | / / / / / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers." am: e4cf854dbf | Josh Gao | 2016-08-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers." | Josh Gao | 2016-08-12 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers." | Josh Gao | 2016-08-12 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | adb headers now refer to openssl headers. | Elliott Hughes | 2016-08-10 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 66940b9 to nyc-mr1-dev-plus-aosp | Alex Deymo | 2016-08-12 | 2 | -42/+189 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 66940b9 to nyc-mr1-dev-plus-aosp | Alex Deymo | 2016-08-12 | 2 | -42/+189 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Call update_engine_sideload from recovery. | Alex Deymo | 2016-08-12 | 2 | -42/+189 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / / /
| | | |/| | | | / / / / / / / / / / / /
| | | |_|_|_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Call update_engine_sideload from recovery. | Alex Deymo | 2016-08-12 | 2 | -42/+189 |
| | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9 am: a550ee0df7 am: b33a6f8342 | Johan Harvyl | 2016-08-09 | 1 | -4/+6 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9 am: a550ee0df7 | Johan Harvyl | 2016-08-09 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9 | Johan Harvyl | 2016-08-09 | 1 | -4/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery" | Johan Harvyl | 2016-08-09 | 1 | -4/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery" | Treehugger Robot | 2016-08-09 | 1 | -4/+6 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | Handle error from fopen_path in finish_recovery | Johan Harvyl | 2016-08-08 | 1 | -4/+6 |
* | | | | | | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0 am: dc97404346 am: e6a4195bf7 | Josh Gao | 2016-08-08 | 4 | -12/+12 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0 am: dc97404346 | Josh Gao | 2016-08-08 | 4 | -12/+12 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0 | Josh Gao | 2016-08-08 | 4 | -12/+12 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static." | Josh Gao | 2016-08-08 | 4 | -12/+12 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static." | Josh Gao | 2016-08-08 | 4 | -12/+12 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Fix references to libcrypto_utils_static. | Josh Gao | 2016-08-06 | 4 | -12/+12 |
| | | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge "Recovery mode UI flicker" am: 629bde8c6c am: a5734c2ad8 am: 1e324fa459 | xinglong.zhu | 2016-08-08 | 2 | -1/+24 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Recovery mode UI flicker" am: 629bde8c6c am: a5734c2ad8 | xinglong.zhu | 2016-08-08 | 2 | -1/+24 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Recovery mode UI flicker" am: 629bde8c6c | xinglong.zhu | 2016-08-08 | 2 | -1/+24 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Recovery mode UI flicker" | xinglong.zhu | 2016-08-08 | 2 | -1/+24 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Recovery mode UI flicker" | Treehugger Robot | 2016-08-08 | 2 | -1/+24 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | Recovery mode UI flicker | xinglong.zhu | 2016-08-06 | 2 | -1/+24 |
* | | | | | | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng" am: 61240f88ea am: 3e244dc301 am: 5a84cecd26 | Tianjie Xu | 2016-08-03 | 26 | -0/+2 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng" am: 61240f88ea am: 3e244dc301 | Tianjie Xu | 2016-08-03 | 26 | -0/+2 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng" am: 61240f88ea | Tianjie Xu | 2016-08-03 | 26 | -0/+2 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng" | Tianjie Xu | 2016-08-03 | 26 | -0/+2 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng" | Tianjie Xu | 2016-08-03 | 26 | -0/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Further compress the text images with zopflipng | Tianjie Xu | 2016-08-03 | 26 | -0/+2 |
| | | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge \\\"Clean up verifier testcases.\\\" am: e91aef0ee9 am: 717b49254b am: 73d3acf50e | Tao Bao | 2016-08-01 | 21 | -41/+30 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge \\\"Clean up verifier testcases.\\\" am: e91aef0ee9 am: 717b49254b | Tao Bao | 2016-08-01 | 21 | -41/+30 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge \\"Clean up verifier testcases.\\" am: e91aef0ee9 | Tao Bao | 2016-08-01 | 21 | -41/+30 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge \"Clean up verifier testcases.\" | Tao Bao | 2016-08-01 | 21 | -41/+30 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Clean up verifier testcases." | Treehugger Robot | 2016-08-01 | 21 | -41/+30 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Clean up verifier testcases. | Tao Bao | 2016-08-01 | 21 | -41/+30 |
| | | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge \\\\"Add docs on regeneration background text image\\\\" am: 5aa2e104c0 am: b02a58740e am: 698f75467a | Tianjie Xu | 2016-07-29 | 4 | -2/+35 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge \\\"Add docs on regeneration background text image\\\" am: 5aa2e104c0 am: b02a58740e | Tianjie Xu | 2016-07-29 | 4 | -2/+35 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge \\"Add docs on regeneration background text image\\" am: 5aa2e104c0 | Tianjie Xu | 2016-07-29 | 4 | -2/+35 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge \"Add docs on regeneration background text image\" | Tianjie Xu | 2016-07-29 | 4 | -2/+35 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Add docs on regeneration background text image" | Tianjie Xu | 2016-07-29 | 4 | -2/+35 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Add docs on regeneration background text image | Tianjie Xu | 2016-07-29 | 4 | -2/+35 |
* | | | | | | | | | | | | | | | | | | | Merge \\\\"Regenerate the background text with pngcrush\\\\" am: 7b6263960f am: c6d607f6ba am: a26823d96d | Tianjie Xu | 2016-07-29 | 25 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge \\\"Regenerate the background text with pngcrush\\\" am: 7b6263960f am: c6d607f6ba | Tianjie Xu | 2016-07-29 | 25 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge \\"Regenerate the background text with pngcrush\\" am: 7b6263960f | Tianjie Xu | 2016-07-29 | 25 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge \"Regenerate the background text with pngcrush\" | Tianjie Xu | 2016-07-29 | 25 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Regenerate the background text with pngcrush" | Tianjie Xu | 2016-07-29 | 25 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | Regenerate the background text with pngcrush | Tianjie Xu | 2016-07-29 | 25 | -0/+0 |
| | | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Resolve merge conflicts of 286848e to stage-aosp-master am: 9da825940d am: 53c34ebdc4 | Tianjie Xu | 2016-07-28 | 25 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Resolve merge conflicts of 286848e to stage-aosp-master am: 9da825940d | Tianjie Xu | 2016-07-28 | 25 | -0/+0 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Resolve merge conflicts of 286848e to stage-aosp-master | Tianjie Xu | 2016-07-28 | 25 | -0/+0 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Resolve merge conflicts of 286848e to stage-aosp-master | Tianjie Xu | 2016-07-28 | 25 | -0/+0 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Update background text images under recovery" | Tianjie Xu | 2016-07-28 | 25 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Update background text images under recovery | Tianjie Xu | 2016-07-28 | 25 | -0/+0 |
| | | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge \\\\"Fix clang-tidy performance warnings.\\\\" am: 2a3b695168 am: 977903da49 am: fc7cbe465f | Chih-hung Hsieh | 2016-07-27 | 5 | -5/+5 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge \\\"Fix clang-tidy performance warnings.\\\" am: 2a3b695168 am: 977903da49 | Chih-Hung Hsieh | 2016-07-27 | 5 | -5/+5 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge \\"Fix clang-tidy performance warnings.\\" am: 2a3b695168 | Chih-hung Hsieh | 2016-07-27 | 5 | -5/+5 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge \"Fix clang-tidy performance warnings.\" | Chih-Hung Hsieh | 2016-07-27 | 5 | -5/+5 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Fix clang-tidy performance warnings." | Chih-hung Hsieh | 2016-07-27 | 5 | -5/+5 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | Fix clang-tidy performance warnings. | Chih-Hung Hsieh | 2016-07-27 | 5 | -5/+5 |
| | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e49c0d6406 -s ours | Bill Yi | 2016-07-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-07-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-07-21 | 3 | -12/+12 |
* | | | | | | | | | | | | | | | | | Skip update verification if care_map is not found am: da654af606 | Tianjie Xu | 2016-07-16 | 1 | -2/+5 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Skip update verification if care_map is not found | Tianjie Xu | 2016-07-16 | 1 | -2/+5 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Skip update verification if care_map is not found | Tianjie Xu | 2016-07-16 | 1 | -2/+5 |
* | | | | | | | | | | | | | | | | | Fix a typo when comparing the verity mode am: 4bbe0c93c8 | Tianjie Xu | 2016-07-15 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Fix a typo when comparing the verity mode | Tianjie Xu | 2016-07-15 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Fix a typo when comparing the verity mode | Tianjie Xu | 2016-07-15 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | Merge \\"Touch blocks in care_map in update_verifier\\" into nyc-mr1-dev am: 13f44939b1 | Tianjie Xu | 2016-07-15 | 2 | -14/+122 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge \"Touch blocks in care_map in update_verifier\" into nyc-mr1-dev | Tianjie Xu | 2016-07-15 | 2 | -14/+122 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" into nyc-mr1-dev | Tianjie Xu | 2016-07-15 | 2 | -14/+122 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | Touch blocks in care_map in update_verifier | Tianjie Xu | 2016-07-14 | 2 | -14/+122 |
* | | | | | | | | | | | | | | | | | | Skip update-on-boot for bootreason in blacklist am: 27b9fc8a36 | Tianjie Xu | 2016-07-13 | 2 | -10/+38 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Skip update-on-boot for bootreason in blacklist | Tianjie Xu | 2016-07-13 | 2 | -10/+38 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Skip update-on-boot for bootreason in blacklist | Tianjie Xu | 2016-07-12 | 2 | -10/+38 |
| | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Support landscape layouts. am: 6d089a955f | Elliott Hughes | 2016-07-09 | 2 | -15/+31 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Support landscape layouts. | Elliott Hughes | 2016-07-09 | 2 | -15/+31 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Support landscape layouts. | Elliott Hughes | 2016-07-09 | 2 | -15/+31 |
* | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" | Tianjie Xu | 2016-07-08 | 1 | -2/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | Allow uncrypt to work without socket communication | Tianjie Xu | 2016-07-01 | 1 | -2/+18 |
* | | | | | | | | | | | | | | | | | | Fix bootloader_message. am: 9da04d595f | Yabin Cui | 2016-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Fix bootloader_message. | Yabin Cui | 2016-07-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Fix bootloader_message. | Yabin Cui | 2016-07-06 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 34e2854786 -s ours am: 93d2e08ef2 -s ours | Bill Yi | 2016-07-01 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 34e2854786 -s ours | Bill Yi | 2016-07-01 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-07-01 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-07-01 | 78 | -312/+390 |
* | | | | | | | | | | | | | | | | | | updater: Fix the broken ReadFileFn. am: ccb0ba908a | Tao Bao | 2016-07-01 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
| |_|_|_|/ / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | updater: Fix the broken ReadFileFn. | Tao Bao | 2016-07-01 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | updater: Fix the broken ReadFileFn. | Tao Bao | 2016-07-01 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 2f272c0 to nyc-mr1-dev-plus-aosp | Yabin Cui | 2016-07-01 | 10 | -397/+328 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 2f272c0 to nyc-mr1-dev-plus-aosp | Yabin Cui | 2016-07-01 | 10 | -397/+328 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Create bootloader_message static library. | Yabin Cui | 2016-06-30 | 10 | -381/+227 |
* | | | | | | | | | | | | | | | | | Merge \\\\"Fix install.h\\\\'s use of attribute printf.\\\\" am: a82ee456bb am: 691db7ba77 am: 7c4a34195f | Elliott Hughes | 2016-06-30 | 2 | -4/+3 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge \\\"Fix install.h\\\'s use of attribute printf.\\\" am: a82ee456bb am: 691db7ba77 | Elliott Hughes | 2016-06-30 | 2 | -4/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge \\"Fix install.h\\'s use of attribute printf.\\" am: a82ee456bb | Elliott Hughes | 2016-06-30 | 2 | -4/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge \"Fix install.h\'s use of attribute printf.\" | Elliott Hughes | 2016-06-30 | 2 | -4/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge "Fix install.h's use of attribute printf." | Treehugger Robot | 2016-06-30 | 2 | -4/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | Fix install.h's use of attribute printf. | Elliott Hughes | 2016-06-30 | 2 | -4/+3 |
* | | | | | | | | | | | | | | | | | | Merge \\\\"Fix google-explicit-constructor warnings in bootable/recovery.\\\\" am: a9f648f010 am: 8e6e4bc979 am: a4cd854625 | Chih-Hung Hsieh | 2016-06-30 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge \\\"Fix google-explicit-constructor warnings in bootable/recovery.\\\" am: a9f648f010 am: 8e6e4bc979 | Chih-Hung Hsieh | 2016-06-30 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge \\"Fix google-explicit-constructor warnings in bootable/recovery.\\" am: a9f648f010 | Chih-Hung Hsieh | 2016-06-30 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge \"Fix google-explicit-constructor warnings in bootable/recovery.\" | Chih-Hung Hsieh | 2016-06-30 | 1 | -1/+1 |
| | |/| | | | | | | | | | | | | | |
| | | |/ / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings in bootable/recovery." | Treehugger Robot | 2016-06-30 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Fix google-explicit-constructor warnings in bootable/recovery. | Chih-Hung Hsieh | 2016-06-30 | 1 | -1/+1 |
| | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Increase EIO retry count am: c37c5c3410 am: e5c6d47f52 | Tianjie Xu | 2016-06-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Increase EIO retry count am: c37c5c3410 | Tianjie Xu | 2016-06-24 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Increase EIO retry count | Tianjie Xu | 2016-06-24 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | Increase EIO retry count am: c37c5c3410 am: 6074099cb9 | Tianjie Xu | 2016-06-24 | 1 | -1/+2 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Increase EIO retry count am: c37c5c3410 | Tianjie Xu | 2016-06-24 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Increase EIO retry count | Tianjie Xu | 2016-06-24 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Increase EIO retry count | Tianjie Xu | 2016-06-24 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | resolve merge conflicts of ed4c49c to nyc-mr1-dev-plus-aosp | Yabin Cui | 2016-06-21 | 8 | -77/+232 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | resolve merge conflicts of ed4c49c to nyc-mr1-dev-plus-aosp | Yabin Cui | 2016-06-21 | 8 | -77/+232 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." into nyc-mr1-dev | Yabin Cui | 2016-06-21 | 8 | -76/+231 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Verify wipe package when wiping A/B device in recovery. | Yabin Cui | 2016-06-21 | 8 | -76/+231 |
* | | | | | | | | | | | | | | | | | Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 2c709ccef9 -s ours am: bf44cb7363 -s ours | Bill Yi | 2016-06-17 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 2c709ccef9 -s ours | Bill Yi | 2016-06-17 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master | Bill Yi | 2016-06-17 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Import translations. DO NOT MERGE" into stage-aosp-master | Bill Yi | 2016-06-17 | 78 | -312/+390 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-06-16 | 78 | -312/+390 |
* | | | | | | | | | | | | | | | | | | | Merge \\\\"Minor minadbd cleanup.\\\\" am: a49c8a19da am: 98c97c8932 am: aaa7c08cfa | Elliott Hughes | 2016-06-17 | 4 | -8/+3 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge \\\"Minor minadbd cleanup.\\\" am: a49c8a19da am: 98c97c8932 | Elliott Hughes | 2016-06-17 | 4 | -8/+3 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge \\"Minor minadbd cleanup.\\" am: a49c8a19da | Elliott Hughes | 2016-06-17 | 4 | -8/+3 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge \"Minor minadbd cleanup.\" | Elliott Hughes | 2016-06-17 | 4 | -8/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | |/| | | | / / / / / / / / / / /
| | | | | |_|_|/ / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Minor minadbd cleanup." | Treehugger Robot | 2016-06-17 | 4 | -8/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Minor minadbd cleanup. | Elliott Hughes | 2016-06-17 | 4 | -8/+3 |
* | | | | | | | | | | | | | | | | | | | Check the results from applypatch am: 31f8cc84cf am: 93110c767f | Tianjie Xu | 2016-06-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Check the results from applypatch am: 31f8cc84cf | Tianjie Xu | 2016-06-16 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Check the results from applypatch | Tianjie Xu | 2016-06-16 | 1 | -4/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | Check the results from applypatch am: 31f8cc84cf am: d0dcbddd31 | Tianjie Xu | 2016-06-16 | 1 | -4/+10 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Check the results from applypatch am: 31f8cc84cf | Tianjie Xu | 2016-06-16 | 1 | -4/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Check the results from applypatch | Tianjie Xu | 2016-06-16 | 1 | -4/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Check the results from applypatch | Tianjie Xu | 2016-06-16 | 1 | -4/+10 |
* | | | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. am: 7eb60efa8d am: 28a425aa1f | Tao Bao | 2016-06-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. am: 7eb60efa8d | Tao Bao | 2016-06-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. | Tao Bao | 2016-06-16 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. | Tao Bao | 2016-06-16 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. am: ab2fb94bf4 | Tao Bao | 2016-06-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. | Tao Bao | 2016-06-16 | 1 | -1/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. | Tao Bao | 2016-06-16 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. | Tao Bao | 2016-06-16 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | Merge \\\\"Remove an abused global so we can actually see logging.\\\\" am: 37450d7f42 am: 4692e5d8c8 am: d71cf2eee3 | Elliott Hughes | 2016-06-16 | 1 | -19/+11 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge \\\"Remove an abused global so we can actually see logging.\\\" am: 37450d7f42 am: 4692e5d8c8 | Elliott Hughes | 2016-06-16 | 1 | -19/+11 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge \\"Remove an abused global so we can actually see logging.\\" am: 37450d7f42 | Elliott Hughes | 2016-06-16 | 1 | -19/+11 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge \"Remove an abused global so we can actually see logging.\" | Elliott Hughes | 2016-06-16 | 1 | -19/+11 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Remove an abused global so we can actually see logging." | Treehugger Robot | 2016-06-16 | 1 | -19/+11 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Remove an abused global so we can actually see logging. | Elliott Hughes | 2016-06-16 | 1 | -19/+11 |
| | | | | | |_|/ / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | Merge \\\\"init now uses libprocessgroup, so set up /acct.\\\\" am: 279876c932 am: c58d7dda8c am: a087302da7 | Elliott Hughes | 2016-06-16 | 1 | -0/+3 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge \\\"init now uses libprocessgroup, so set up /acct.\\\" am: 279876c932 am: c58d7dda8c | Elliott Hughes | 2016-06-16 | 1 | -0/+3 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge \\"init now uses libprocessgroup, so set up /acct.\\" am: 279876c932 | Elliott Hughes | 2016-06-16 | 1 | -0/+3 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge \"init now uses libprocessgroup, so set up /acct.\" | Elliott Hughes | 2016-06-16 | 1 | -0/+3 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "init now uses libprocessgroup, so set up /acct." | Elliott Hughes | 2016-06-16 | 1 | -0/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | init now uses libprocessgroup, so set up /acct. | Elliott Hughes | 2016-06-16 | 1 | -0/+3 |
| | | | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 179c0d8 to stage-aosp-master am: 274d17dc0f am: eaddde6888 | Elliott Hughes | 2016-06-16 | 16 | -1490/+242 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 179c0d8 to stage-aosp-master am: 274d17dc0f | Elliott Hughes | 2016-06-16 | 16 | -1490/+242 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | resolve merge conflicts of 179c0d8 to stage-aosp-master | Elliott Hughes | 2016-06-16 | 16 | -1490/+242 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | resolve merge conflicts of 179c0d8 to stage-aosp-master | Elliott Hughes | 2016-06-16 | 16 | -1490/+242 |
| | |/| | | | | | | | | | | | | | | |
| | | |/ / / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | | Merge "Remove obsolete MTD support." | Elliott Hughes | 2016-06-15 | 16 | -1490/+242 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Remove obsolete MTD support. | Elliott Hughes | 2016-06-10 | 16 | -1490/+242 |
* | | | | | | | | | | | | | | | | | | Merge \\\\"Add bootloader_message_ab struct.\\\\" am: 59f04b9982 am: f57d7f02c9 am: 2fc7cd69fd | Tao Bao | 2016-06-14 | 1 | -13/+58 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge \\\"Add bootloader_message_ab struct.\\\" am: 59f04b9982 am: f57d7f02c9 | Tao Bao | 2016-06-14 | 1 | -13/+58 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge \\"Add bootloader_message_ab struct.\\" am: 59f04b9982 | Tao Bao | 2016-06-14 | 1 | -13/+58 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | Merge \"Add bootloader_message_ab struct.\" | Tao Bao | 2016-06-14 | 1 | -13/+58 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Add bootloader_message_ab struct." | Tao Bao | 2016-06-14 | 1 | -13/+58 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Add bootloader_message_ab struct. | Tao Bao | 2016-06-10 | 1 | -13/+58 |
| | | | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp am: 38afad46d8 | Tao Bao | 2016-06-14 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp | Tao Bao | 2016-06-14 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp | Tao Bao | 2016-06-14 | 1 | -57/+66 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 2a4386f to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-06-14 | 1 | -57/+66 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 2a4386f to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-06-14 | 1 | -57/+66 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | applypatch: Don\'t call inflate() when it expects zero-length output. | Tao Bao | 2016-06-14 | 1 | -57/+66 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | |/| | | | / / / / / / / / / / /
| | | |_|_|_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | applypatch: Don't call inflate() when it expects zero-length output. | Tao Bao | 2016-06-14 | 1 | -57/+66 |
* | | | | | | | | | | | | | | | | | | Merge \\"recovery: Track the name change for wipe_ab.\\" into nyc-mr1-dev am: dc1393d09b | Tao Bao | 2016-06-13 | 1 | -12/+12 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge \"recovery: Track the name change for wipe_ab.\" into nyc-mr1-dev | Tao Bao | 2016-06-13 | 1 | -12/+12 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "recovery: Track the name change for wipe_ab." into nyc-mr1-dev | Tao Bao | 2016-06-13 | 1 | -12/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | recovery: Track the name change for wipe_ab. | Tao Bao | 2016-06-10 | 1 | -12/+12 |
* | | | | | | | | | | | | | | | | | | | Merge \\\\"updater: Fix the broken ReadFileFn.\\\\" am: 4ddd5edf31 am: 89dfe730d4 am: 1e67422f37 | Tao Bao | 2016-06-11 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge \\\"updater: Fix the broken ReadFileFn.\\\" am: 4ddd5edf31 am: 89dfe730d4 | Tao Bao | 2016-06-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge \\"updater: Fix the broken ReadFileFn.\\" am: 4ddd5edf31 | Tao Bao | 2016-06-11 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge \"updater: Fix the broken ReadFileFn.\" | Tao Bao | 2016-06-11 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "updater: Fix the broken ReadFileFn." | Tao Bao | 2016-06-11 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | updater: Fix the broken ReadFileFn. | Tao Bao | 2016-06-11 | 1 | -1/+1 |
| | | | | | |_|_|/ / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | Log source/target build version to last_install am: b0ddae55e5 am: dcf1089771 | Tianjie Xu | 2016-06-10 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Log source/target build version to last_install am: b0ddae55e5 | Tianjie Xu | 2016-06-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Log source/target build version to last_install | Tianjie Xu | 2016-06-10 | 1 | -0/+55 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / / / / / / / / / / /
| | |/| | | | | / / / / / / / / / / /
| | | | |_|_|_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Log source/target build version to last_install am: b0ddae55e5 am: 9d2657fbb7 | Tianjie Xu | 2016-06-10 | 1 | -0/+55 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Log source/target build version to last_install am: b0ddae55e5 | Tianjie Xu | 2016-06-10 | 1 | -0/+55 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Log source/target build version to last_install | Tianjie Xu | 2016-06-10 | 1 | -0/+55 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Log source/target build version to last_install | Tianjie Xu | 2016-06-10 | 1 | -0/+55 |
* | | | | | | | | | | | | | | | | | | Merge \\\\"Remove etc/META-INF/com/google/android/update-script.\\\\" am: 5b2191a9d6 am: 5be6ae12b5 am: 21c4f4e6e6 | Elliott Hughes | 2016-06-10 | 1 | -8/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge \\\"Remove etc/META-INF/com/google/android/update-script.\\\" am: 5b2191a9d6 am: 5be6ae12b5 | Elliott Hughes | 2016-06-10 | 1 | -8/+0 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge \\"Remove etc/META-INF/com/google/android/update-script.\\" am: 5b2191a9d6 | Elliott Hughes | 2016-06-10 | 1 | -8/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge \"Remove etc/META-INF/com/google/android/update-script.\" | Elliott Hughes | 2016-06-10 | 1 | -8/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Remove etc/META-INF/com/google/android/update-script." | Elliott Hughes | 2016-06-10 | 1 | -8/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | Remove etc/META-INF/com/google/android/update-script. | Elliott Hughes | 2016-06-10 | 1 | -8/+0 |
| | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Merge \"resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 91d78acbd3\" into nyc-mr1-dev-plus-aosp | Alain Vongsouvanh | 2016-06-08 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 91d78acbd3" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-06-08 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 | Alain Vongsouvanh | 2016-06-08 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-dev | Alain Vongsouvanh | 2016-06-08 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 2a697feb39 | Alain Vongsouvanh | 2016-06-08 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 | Alain Vongsouvanh | 2016-06-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | / / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-dev | Alain Vongsouvanh | 2016-06-08 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-dev | Alain Vongsouvanh | 2016-06-08 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | recovery: Make wear recovery more customizable. | Alain Vongsouvanh | 2016-06-08 | 2 | -3/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |_|_|/ / / / / / / / /
| | | | | |/| | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | recovery: Make wear recovery more customizable. | Alain Vongsouvanh | 2016-06-07 | 2 | -3/+4 |
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 1afa4d7 to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-06-04 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 1afa4d7 to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-06-04 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "recovery: Add support to brick a device." into nyc-mr1-dev | Tao Bao | 2016-06-04 | 1 | -1/+91 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | recovery: Add support to brick a device. | Tao Bao | 2016-06-03 | 1 | -1/+91 |
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp am: 64f46fb16c | Tianjie Xu | 2016-06-04 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp | Tianjie Xu | 2016-06-04 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp | Tianjie Xu | 2016-06-04 | 4 | -14/+76 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-06-04 | 4 | -14/+76 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-06-04 | 4 | -14/+76 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Call ioctl before each write on retry | Tianjie Xu | 2016-06-04 | 4 | -14/+76 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| / / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Call ioctl before each write on retry | Tianjie Xu | 2016-06-03 | 4 | -14/+76 |
* | | | | | | | | | | | | | | | | | resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp am: ba33da2884 | Tao Bao | 2016-06-04 | 1 | -1/+91 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp | Tao Bao | 2016-06-04 | 1 | -1/+91 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp | Tao Bao | 2016-06-03 | 1 | -1/+91 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "recovery: Add support to brick a device." | Tao Bao | 2016-06-03 | 1 | -1/+91 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|/ / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge "recovery: Add support to brick a device." | Tao Bao | 2016-06-03 | 1 | -1/+91 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | recovery: Add support to brick a device. | Tao Bao | 2016-06-03 | 1 | -1/+91 |
| | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 am: a7fca9402d am: e13a690c16 | Tao Bao | 2016-06-02 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 am: a7fca9402d | Tao Bao | 2016-06-01 | 1 | -38/+40 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 | Tao Bao | 2016-06-01 | 1 | -38/+40 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" | Tao Bao | 2016-06-01 | 1 | -38/+40 |
| | | |\| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" | Tao Bao | 2016-06-01 | 1 | -38/+40 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." | Tao Bao | 2016-06-01 | 1 | -38/+40 |
| | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" | Tao Bao | 2016-06-01 | 1 | -38/+40 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." | Tao Bao | 2016-06-01 | 1 | -38/+40 |
* | | | | | | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 am: 11c794b1a7 am: 23bb1d210d | Adam Buchbinder | 2016-06-01 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 am: 11c794b1a7 | Adam Buchbinder | 2016-06-01 | 1 | -40/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 | Adam Buchbinder | 2016-06-01 | 1 | -40/+38 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." | Adam Buchbinder | 2016-06-01 | 1 | -40/+38 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." | Treehugger Robot | 2016-06-01 | 1 | -40/+38 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector. | Adam Buchbinder | 2016-06-01 | 1 | -40/+38 |
| | | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb am: fd49adbdaf am: d8a518d711 | Tao Bao | 2016-06-01 | 1 | -2/+1 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb am: fd49adbdaf | Tao Bao | 2016-06-01 | 1 | -2/+1 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb | Tao Bao | 2016-06-01 | 1 | -2/+1 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff."" | Tao Bao | 2016-06-01 | 1 | -2/+1 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff."" | Tao Bao | 2016-06-01 | 1 | -2/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Revert "imgdiff: Generate statically linked imgdiff." | Tao Bao | 2016-06-01 | 1 | -2/+1 |
* | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc am: a83b798c57 am: f90090d429 | Tao Bao | 2016-06-01 | 1 | -1/+2 |
|\| | | | | | | | | | | | | | | | | |
| |_|_|_|_|/ / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc am: a83b798c57 | Tao Bao | 2016-06-01 | 1 | -1/+2 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc | Tao Bao | 2016-06-01 | 1 | -1/+2 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff." | Tao Bao | 2016-06-01 | 1 | -1/+2 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff." | Tao Bao | 2016-06-01 | 1 | -1/+2 |
| | | | |\| | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | imgdiff: Generate statically linked imgdiff. | Tao Bao | 2016-05-31 | 1 | -1/+2 |
| | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector. | Adam Buchbinder | 2016-05-26 | 1 | -40/+38 |
* | | | | | | | | | | | | | | | | | Disable the meaningless parts of the UI for A/B. am: 01fcbe160b | Elliott Hughes | 2016-05-24 | 2 | -14/+44 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Disable the meaningless parts of the UI for A/B. | Elliott Hughes | 2016-05-24 | 2 | -14/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Disable the meaningless parts of the UI for A/B. | Elliott Hughes | 2016-05-24 | 2 | -14/+44 |
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 50f6417 am: 3f6eb86390 | Tianjie Xu | 2016-05-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 50f6417 | Tianjie Xu | 2016-05-24 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | resolve merge conflicts of 50f6417 | Tianjie Xu | 2016-05-23 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c am: 1ae2434c11 am: f5e2831bf3 | Jeremy Compostella | 2016-05-24 | 1 | -1/+4 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c am: 1ae2434c11 | Jeremy Compostella | 2016-05-24 | 1 | -1/+4 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c | Jeremy Compostella | 2016-05-23 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field" | Jeremy Compostella | 2016-05-23 | 1 | -1/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field" | Treehugger Robot | 2016-05-23 | 1 | -1/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | slot_metadata: add verity_corrupted field | Jeremy Compostella | 2016-05-23 | 1 | -1/+4 |
| | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 84478e8 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-05-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 84478e8 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-05-24 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | resolve merge conflicts of 50f6417 to nyc-dev-plus-aosp | Tianjie Xu | 2016-05-23 | 11 | -105/+267 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-05-23 | 11 | -105/+266 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-05-23 | 11 | -105/+266 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Allow recovery to return error codes" into nyc-dev | Tianjie Xu | 2016-05-23 | 11 | -104/+265 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Allow recovery to return error codes" into nyc-dev | Tianjie Xu | 2016-05-23 | 11 | -104/+265 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | Allow recovery to return error codes | Tianjie Xu | 2016-05-20 | 11 | -104/+265 |
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a am: bd43d7e92b | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a am: 8a55c65345 | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | / / / / / / / / / /
| | | | | |_|_|/ / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |_|_|/ / / / / / / / /
| | | | | |/| | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | |_|_|/ / / / / / / /
| | | | | | |/| | | | | | | | | | |
|
| | | | | | * | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | |_|_|/ / / / / / /
| | | | | | | |/| | | | | | | | | |
|
| | | | | | | * | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | | | | | * \ \ \ \ \ \ \ \ \ | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | |_|_|/ / / / / /
| | | | | | | | | |/| | | | | | | | |
|
| | | | | | | | | * | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | |_|_|/ / / / /
| | | | | | | | | | |/| | | | | | | |
|
| | | | | | | | | | * | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | | | | | | |/| | | | | | | |
| | | | | | | | | | | |_|_|/ / / /
| | | | | | | | | | |/| | | | | | |
|
| | | | | | | | | | * | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | |_|_|/ / /
| | | | | | | | | | | |/| | | | | |
|
| | | | | | | | | | | * | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev | Matt Sarett | 2016-05-19 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | |_|_|/ /
| | | | | | | | | | | | |/| | | | |
|
| | | | | | | | | | | | * | | | | | DO NOT MERGE Use updated libpng API | Matt Sarett | 2016-05-19 | 1 | -10/+10 |
| | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | |_|_|/
| | | | | | | | | | | | | |/| | | |
|
| | | | | | | | | | | | | * | | | | DO NOT MERGE Use updated libpng API | Matt Sarett | 2016-05-17 | 1 | -10/+10 |
| | | | | | | | | | | | |/ / / / |
|
* | | | | | | | | | | | | | | | | Add time and I/O info to last_install am: dd874b1c87 am: 142b864ba1 | Tianjie Xu | 2016-05-18 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Add time and I/O info to last_install am: dd874b1c87 | Tianjie Xu | 2016-05-18 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Add time and I/O info to last_install | Tianjie Xu | 2016-05-18 | 2 | -4/+35 |
| | |\| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | Add time and I/O info to last_install am: dd874b1c87 am: 027b403e8a | Tianjie Xu | 2016-05-18 | 2 | -4/+35 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Add time and I/O info to last_install am: dd874b1c87 | Tianjie Xu | 2016-05-18 | 2 | -4/+35 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Add time and I/O info to last_install | Tianjie Xu | 2016-05-18 | 2 | -4/+35 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Add time and I/O info to last_install | Tianjie Xu | 2016-05-16 | 2 | -4/+35 |
* | | | | | | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0 am: 32c2e78726 am: 0cc7e28ffd | Jonathan Hamilton | 2016-05-12 | 1 | -6/+8 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0 am: 32c2e78726 | Jonathan Hamilton | 2016-05-12 | 1 | -6/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0 | Jonathan Hamilton | 2016-05-12 | 1 | -6/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|/ /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend" | Jonathan Hamilton | 2016-05-12 | 1 | -6/+8 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|/
| | | | |/| | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend" | Treehugger Robot | 2016-05-12 | 1 | -6/+8 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | Keep ADF device alive for the lifetime of the minui backend | Jonathan Hamilton | 2016-05-06 | 1 | -6/+8 |
* | | | | | | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 am: d03ee52eb7 am: eef053fda1 | Tao Bao | 2016-05-08 | 2 | -2/+2 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 am: d03ee52eb7 | Alistair Strachan | 2016-05-08 | 2 | -2/+2 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 | Tao Bao | 2016-05-08 | 2 | -2/+2 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags." | Alistair Strachan | 2016-05-08 | 2 | -2/+2 |
| | | |\| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags." | Tao Bao | 2016-05-08 | 2 | -2/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | updater, minzip: Remove unnecessary O_SYNC flags. | Alistair Strachan | 2016-05-06 | 2 | -2/+2 |
| | | | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff." am: 704cac2f99 am: 7caebae682 am: 22431741ce | Sen Jiang | 2016-05-06 | 3 | -425/+10 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff." am: 704cac2f99 am: 7caebae682 | Sen Jiang | 2016-05-06 | 3 | -425/+10 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff." am: 704cac2f99 | Sen Jiang | 2016-05-06 | 3 | -425/+10 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff." | Sen Jiang | 2016-05-06 | 3 | -425/+10 |
| | | |\| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff." | Treehugger Robot | 2016-05-06 | 3 | -425/+10 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | applypatch: Use bsdiff from external/bsdiff. | Sen Jiang | 2016-05-04 | 3 | -425/+10 |
| | | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Merge "recovery: Always log the update attempt." am: ecd6e2af50 am: 88234ad84b am: c66a83dac0 | Tao Bao | 2016-05-03 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "recovery: Always log the update attempt." am: ecd6e2af50 am: 88234ad84b | Tao Bao | 2016-05-03 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "recovery: Always log the update attempt." am: ecd6e2af50 | Tao Bao | 2016-05-03 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "recovery: Always log the update attempt." | Tao Bao | 2016-05-03 | 1 | -0/+4 |
| | | |\| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | Merge "recovery: Always log the update attempt." | Treehugger Robot | 2016-05-03 | 1 | -0/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | recovery: Always log the update attempt. | Tao Bao | 2016-05-03 | 1 | -0/+4 |
| | | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Merge "Make text for recovery larger on angler am: 087c5edd8d am: 26f5ab0e9c" into nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-05-02 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Make text for recovery larger on angler am: 087c5edd8d am: 26f5ab0e9c" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-05-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | Make text for recovery larger on angler am: 087c5edd8d | Tianjie Xu | 2016-05-02 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Make text for recovery larger on angler | Tianjie Xu | 2016-05-02 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Make text for recovery larger on angler am: 087c5edd8d am: ba4e7977e4 | Tianjie Xu | 2016-05-02 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Make text for recovery larger on angler am: 087c5edd8d | Tianjie Xu | 2016-05-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / /
| |/| | | | | / / / / / / / / / /
| | | |_|_|_|/ / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Make text for recovery larger on angler | Tianjie Xu | 2016-05-02 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Make text for recovery larger on angler | Tianjie Xu | 2016-05-02 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp am: cacb47b2a3 | Tianjie Xu | 2016-05-02 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp | Tianjie Xu | 2016-05-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp | Tianjie Xu | 2016-05-02 | 5 | -1/+23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | resolve merge conflicts of 23c7af7 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-05-02 | 5 | -1/+23 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | resolve merge conflicts of 23c7af7 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-05-02 | 5 | -1/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Add ability to show "installing security update"" into nyc-dev | Tianjie Xu | 2016-05-02 | 5 | -1/+23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "Add ability to show "installing security update"" into nyc-dev | Tianjie Xu | 2016-05-02 | 5 | -1/+23 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | Add ability to show "installing security update" | Tianjie Xu | 2016-04-29 | 5 | -1/+23 |
* | | | | | | | | | | | | | | | | | Merge "recovery: Always log the update attempt. am: 5687001895 am: f13662a349" into nyc-mr1-dev-plus-aosp | Tao Bao | 2016-05-02 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "recovery: Always log the update attempt. am: 5687001895 am: f13662a349" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-05-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | recovery: Always log the update attempt. am: 5687001895 | Tao Bao | 2016-05-02 | 1 | -0/+4 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | recovery: Always log the update attempt. | Tao Bao | 2016-05-02 | 1 | -0/+4 |
| | | |\| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | recovery: Always log the update attempt. am: 5687001895 am: e0c8a9bb02 | Tao Bao | 2016-05-02 | 1 | -0/+4 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | recovery: Always log the update attempt. am: 5687001895 | Tao Bao | 2016-05-02 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | | / / / / / / / / / / / /
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | recovery: Always log the update attempt. | Tao Bao | 2016-05-02 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | recovery: Always log the update attempt. | Tao Bao | 2016-04-30 | 1 | -0/+4 |
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings." am: fafa6a6531 am: 77d7cb1d0a am: 8d3b85a320 | Chih-hung Hsieh | 2016-04-30 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings." am: fafa6a6531 am: 77d7cb1d0a | Chih-Hung Hsieh | 2016-04-30 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings." am: fafa6a6531 | Chih-hung Hsieh | 2016-04-30 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings." | Chih-Hung Hsieh | 2016-04-30 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / /
| | | | |/| | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings." | Chih-hung Hsieh | 2016-04-30 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | Fix google-explicit-constructor warnings. | Chih-Hung Hsieh | 2016-04-29 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee am: 4458d3e am: 6bfe76e | Tao Bao | 2016-04-28 | 1 | -2/+1 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee am: 4458d3e | Tao Bao | 2016-04-28 | 1 | -2/+1 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee | Tao Bao | 2016-04-28 | 1 | -2/+1 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "updater: Don\'t zero out CommandParameters with memset(3)." | Tao Bao | 2016-04-28 | 1 | -2/+1 |
| | | |\| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge "updater: Don't zero out CommandParameters with memset(3)." | Tao Bao | 2016-04-28 | 1 | -2/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | updater: Don't zero out CommandParameters with memset(3). | Tao Bao | 2016-04-27 | 1 | -2/+1 |
| | | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Merge "Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: 1dc396f" into nyc-mr1-dev-plus-aosp | TreeHugger Robot | 2016-04-28 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: 1dc396f" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-04-28 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 | TreeHugger Robot | 2016-04-28 | 1 | -8/+10 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev | Elliott Hughes | 2016-04-28 | 1 | -8/+10 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: a7f7e70 | Elliott Hughes | 2016-04-28 | 1 | -8/+10 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 | TreeHugger Robot | 2016-04-28 | 1 | -8/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / /
| |/| | | | | / / / / / / / / / /
| | | |_|_|_|/ / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev | Elliott Hughes | 2016-04-28 | 1 | -8/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev | TreeHugger Robot | 2016-04-28 | 1 | -8/+10 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | Improve the layout-related comments. | Elliott Hughes | 2016-04-28 | 1 | -8/+10 |
* | | | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev am: eeca191 am: e890e19 | Tianjie Xu | 2016-04-28 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev am: eeca191 | Tianjie Xu | 2016-04-28 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev | Tianjie Xu | 2016-04-28 | 25 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev am: 2f1eedd am: 21092a9 | Elliott Hughes | 2016-04-28 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev am: 2f1eedd | Elliott Hughes | 2016-04-28 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev | Elliott Hughes | 2016-04-28 | 502 | -50/+80 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev am: eeca191 am: d57691e | Tianjie Xu | 2016-04-28 | 25 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev am: eeca191 | Tianjie Xu | 2016-04-28 | 25 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev | Tianjie Xu | 2016-04-28 | 25 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev | Tianjie Xu | 2016-04-28 | 25 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Update background text for recovery UI | Tianjie Xu | 2016-04-28 | 25 | -0/+0 |
* | | | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev am: 2f1eedd am: 75191f3 | Elliott Hughes | 2016-04-28 | 502 | -50/+80 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev am: 2f1eedd | Elliott Hughes | 2016-04-28 | 502 | -50/+80 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev | Elliott Hughes | 2016-04-28 | 502 | -50/+80 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev | Elliott Hughes | 2016-04-28 | 502 | -50/+80 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | Update recovery UI. | Elliott Hughes | 2016-04-27 | 502 | -50/+80 |
* | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours am: a42bca8 -s ours | Baligh Uddin | 2016-04-28 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours | Baligh Uddin | 2016-04-28 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev | Baligh Uddin | 2016-04-28 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours am: 06be362 -s ours | Baligh Uddin | 2016-04-28 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours | Baligh Uddin | 2016-04-28 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev | Baligh Uddin | 2016-04-28 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev | Baligh Uddin | 2016-04-27 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2016-04-26 | 3 | -11/+7 |
* | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: abd0988 -s ours | Baligh Uddin | 2016-04-28 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev | Baligh Uddin | 2016-04-27 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev | Baligh Uddin | 2016-04-27 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2016-04-26 | 78 | -312/+312 |
* | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" | Baligh Uddin | 2016-04-27 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2016-04-26 | 3 | -11/+7 |
* | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: ca5003e -s ours am: 97ee2b1 -s ours | Bill Yi | 2016-04-27 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: ca5003e -s ours | Bill Yi | 2016-04-27 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-27 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: ca5003e -s ours am: e84e73a -s ours | Bill Yi | 2016-04-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: ca5003e -s ours | Bill Yi | 2016-04-27 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-27 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-27 | 3 | -11/+7 |
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: a004356 -s ours | Bill Yi | 2016-04-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-27 | 78 | -312/+312 |
| | | |_|_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-27 | 3 | -11/+7 |
| |_|_|_|/ / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e59f5de -s ours am: 29c7a34 -s ours | Bill Yi | 2016-04-25 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e59f5de -s ours | Bill Yi | 2016-04-25 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-25 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e59f5de -s ours am: d210dc0 -s ours | Bill Yi | 2016-04-25 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e59f5de -s ours | Bill Yi | 2016-04-25 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-25 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-25 | 81 | -324/+328 |
* | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-25 | 81 | -324/+328 |
* | | | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089 am: 2f9be55 | Tao Bao | 2016-04-23 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089 | Tao Bao | 2016-04-23 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev | Tao Bao | 2016-04-23 | 2 | -3/+20 |
| | |\| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089 am: 5e3aa78 | Tao Bao | 2016-04-23 | 2 | -3/+20 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089 | Tao Bao | 2016-04-23 | 2 | -3/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev | Tao Bao | 2016-04-23 | 2 | -3/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev | Tao Bao | 2016-04-23 | 2 | -3/+20 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | recovery: Dump the signature in the zip package. | Tao Bao | 2016-04-20 | 2 | -3/+20 |
* | | | | | | | | | | | | | | | | | Merge "Go back to the old ear-wiggling Android animation. am: 692941be79 am: 87b0654f00" into nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-04-22 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Go back to the old ear-wiggling Android animation. am: 692941be79 am: 87b0654f00" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-04-22 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Go back to the old ear-wiggling Android animation. am: 692941be79 | Elliott Hughes | 2016-04-22 | 457 | -15/+48 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation. | Elliott Hughes | 2016-04-22 | 457 | -15/+48 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation. am: 692941be79 am: 17266d9a65 | Elliott Hughes | 2016-04-22 | 457 | -15/+48 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation. am: 692941be79 | Elliott Hughes | 2016-04-22 | 457 | -15/+48 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | / / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation. | Elliott Hughes | 2016-04-22 | 457 | -15/+48 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation. | Elliott Hughes | 2016-04-21 | 457 | -15/+48 |
* | | | | | | | | | | | | | | | | | Merge "Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 4cc6145423" into nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-04-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 4cc6145423" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-04-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 | Tianjie Xu | 2016-04-21 | 25 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-dev | Tianjie Xu | 2016-04-21 | 25 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 8bb3bd9209 | Tianjie Xu | 2016-04-21 | 25 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 | Tianjie Xu | 2016-04-21 | 25 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | / / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-dev | Tianjie Xu | 2016-04-21 | 25 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-dev | Tianjie Xu | 2016-04-21 | 25 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | Regenerate background text imgs in recovery | Tianjie Xu | 2016-04-19 | 25 | -0/+0 |
* | | | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev am: 8b86373 am: 210b0a5 | Tianjie Xu | 2016-04-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev am: 8b86373 | Tianjie Xu | 2016-04-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev | Tianjie Xu | 2016-04-21 | 4 | -14/+44 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev am: 8b86373 am: 45609d3 | Tianjie Xu | 2016-04-21 | 4 | -14/+44 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev am: 8b86373 | Tianjie Xu | 2016-04-21 | 4 | -14/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev | Tianjie Xu | 2016-04-21 | 4 | -14/+44 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev | Tianjie Xu | 2016-04-20 | 4 | -14/+44 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Fix matches_locale function | Tianjie Xu | 2016-04-20 | 4 | -14/+44 |
| | | | | |/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: 0e52921" into nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-04-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: 0e52921" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-04-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Remove trailing punctuation from recovery strings." into nyc-dev | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: c15177b" into nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: c15177b" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-04-20 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Remove trailing punctuation from recovery strings." into nyc-dev | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Remove trailing punctuation from recovery strings." into nyc-dev | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Remove trailing punctuation from recovery strings. | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | | | | | |_|/ / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | Merge "Decrease OTA package verification times further. am: dd895d0 am: 5be36da" into nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-04-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Decrease OTA package verification times further. am: dd895d0 am: 5be36da" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-04-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / /
| |/| | | | / / / / / / / / / / / / /
| | | |_|_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Decrease OTA package verification times further. am: dd895d0 | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Decrease OTA package verification times further. | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| / / / / / / / / / / / /
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Decrease OTA package verification times further. am: dd895d0 am: 1864feb | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Decrease OTA package verification times further. am: dd895d0 | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / /
| |/| | | / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Decrease OTA package verification times further. | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Decrease OTA package verification times further. | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | Merge "Fix google-runtime-int warnings." am: a1f4a1e am: bcad1d1 am: 0231e70 | Chih-hung Hsieh | 2016-04-19 | 12 | -46/+53 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Fix google-runtime-int warnings." am: a1f4a1e am: bcad1d1 | Chih-Hung Hsieh | 2016-04-19 | 12 | -46/+53 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Fix google-runtime-int warnings." am: a1f4a1e | Chih-hung Hsieh | 2016-04-19 | 12 | -46/+53 |
| |/| | | | | | | | | | | | |
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Fix google-runtime-int warnings." | Chih-Hung Hsieh | 2016-04-19 | 12 | -46/+53 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / /
| | | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "Fix google-runtime-int warnings." | Chih-hung Hsieh | 2016-04-19 | 12 | -46/+53 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | Fix google-runtime-int warnings. | Chih-Hung Hsieh | 2016-04-18 | 12 | -46/+53 |
| | | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "Fix IWYU errors." am: 51dcd0d am: 405db92 | David Benjamin | 2016-04-16 | 1 | -0/+1 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Fix IWYU errors." am: 51dcd0d | Treehugger Robot | 2016-04-16 | 1 | -0/+1 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Fix IWYU errors." | David Benjamin | 2016-04-16 | 1 | -0/+1 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "Fix IWYU errors." | Treehugger Robot | 2016-04-16 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | Fix IWYU errors. | David Benjamin | 2016-04-16 | 1 | -0/+1 |
| | | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "Update the system update animation." into nyc-dev am: e8d0ecc | Elliott Hughes | 2016-04-15 | 466 | -73/+164 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Update the system update animation." into nyc-dev | Elliott Hughes | 2016-04-15 | 466 | -73/+164 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Update the system update animation." into nyc-dev | Elliott Hughes | 2016-04-15 | 466 | -73/+164 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Update the system update animation. | Elliott Hughes | 2016-04-15 | 466 | -73/+164 |
* | | | | | | | | | | | | | | | Merge "Define the Bootloader Control A/B structure" am: e6af522 am: b30c6f6 | Jeremy Compostella | 2016-04-15 | 1 | -1/+53 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Define the Bootloader Control A/B structure" am: e6af522 | Tao Bao | 2016-04-15 | 1 | -1/+53 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Define the Bootloader Control A/B structure" | Jeremy Compostella | 2016-04-15 | 1 | -1/+53 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / /
| | | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "Define the Bootloader Control A/B structure" | Tao Bao | 2016-04-15 | 1 | -1/+53 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | Define the Bootloader Control A/B structure | Jeremy Compostella | 2016-04-06 | 1 | -1/+53 |
* | | | | | | | | | | | | | | | | Explicitly set the font face and color. am: 70ae70b | Elliott Hughes | 2016-04-15 | 2 | -7/+6 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Explicitly set the font face and color. | Elliott Hughes | 2016-04-15 | 2 | -7/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Explicitly set the font face and color. | Elliott Hughes | 2016-04-15 | 2 | -7/+6 |
| | | |_|_|/ / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | resolve merge conflicts of 8febafa to nyc-dev-plus-aosp | Elliott Hughes | 2016-04-14 | 2 | -10/+14 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | resolve merge conflicts of 8febafa to nyc-dev-plus-aosp | Elliott Hughes | 2016-04-14 | 2 | -10/+14 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Use BoringSSL instead of mincrypt to speed up package verification. | Elliott Hughes | 2016-04-14 | 10 | -257/+285 |
* | | | | | | | | | | | | | | | resolve merge conflicts of 2bf95ac to nyc-dev-plus-aosp | Mattias Nissler | 2016-04-13 | 11 | -247/+274 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | resolve merge conflicts of 2bf95ac to nyc-dev-plus-aosp | Elliott Hughes | 2016-04-13 | 11 | -247/+274 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Convert recovery to use BoringSSL instead of mincrypt." | Mattias Nissler | 2016-04-13 | 11 | -247/+275 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / /
| | | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "Convert recovery to use BoringSSL instead of mincrypt." | Elliott Hughes | 2016-04-13 | 11 | -247/+275 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | Convert recovery to use BoringSSL instead of mincrypt. | Mattias Nissler | 2016-04-06 | 11 | -247/+275 |
* | | | | | | | | | | | | | | | | resolve merge conflicts of a58a6db to nyc-dev-plus-aosp | Yabin Cui | 2016-04-09 | 4 | -45/+160 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | resolve merge conflicts of a58a6db to nyc-dev-plus-aosp | Yabin Cui | 2016-04-09 | 4 | -45/+160 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | uncrypt: split libbootloader_message_writer for reuse. | Yabin Cui | 2016-04-08 | 4 | -44/+160 |
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-06 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: b162551 -s ours | Bill Yi | 2016-04-05 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev | Bill Yi | 2016-04-05 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev | Bill Yi | 2016-04-05 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-05 | 2 | -2/+2 |
* | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" | Bill Yi | 2016-04-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-05 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | recovery-persist: pick up both pstore console files am: a569727 | Mark Salyzyn | 2016-04-05 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | recovery-persist: pick up both pstore console files | Mark Salyzyn | 2016-04-05 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | recovery-persist: pick up both pstore console files | Mark Salyzyn | 2016-04-05 | 1 | -2/+7 |
| | | |/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Merge "recovery-persist: pick up both pstore console files" am: 901f315 am: 4195388 | Mark Salyzyn | 2016-04-05 | 1 | -2/+7 |
|\| | | | | | | | | | | | | | | |
| |_|/ / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "recovery-persist: pick up both pstore console files" am: 901f315 | Mark Salyzyn | 2016-04-05 | 1 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "recovery-persist: pick up both pstore console files" | Mark Salyzyn | 2016-04-05 | 1 | -2/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "recovery-persist: pick up both pstore console files" | Mark Salyzyn | 2016-04-05 | 1 | -2/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | recovery-persist: pick up both pstore console files | Mark Salyzyn | 2016-04-05 | 1 | -2/+7 |
| | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: f75b6e4 -s ours | Bill Yi | 2016-04-05 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-05 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-05 | 81 | -229/+148 |
* | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-05 | 81 | -229/+148 |
* | | | | | | | | | | | | | | | Merge "Move selinux dependencies out of header files." am: 8124750 am: dc91161 | Elliott Hughes | 2016-04-02 | 8 | -11/+18 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Move selinux dependencies out of header files." am: 8124750 | Elliott Hughes | 2016-04-02 | 8 | -11/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Move selinux dependencies out of header files." | Elliott Hughes | 2016-04-02 | 8 | -11/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / /
| | | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "Move selinux dependencies out of header files." | Elliott Hughes | 2016-04-02 | 8 | -11/+18 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | Move selinux dependencies out of header files. | Elliott Hughes | 2016-04-02 | 8 | -11/+18 |
| | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | recovery: use __android_log_pmsg_file_write for log files am: 13aca59 | Mark Salyzyn | 2016-03-31 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | recovery: use __android_log_pmsg_file_write for log files | Mark Salyzyn | 2016-03-31 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | recovery: use __android_log_pmsg_file_write for log files | Mark Salyzyn | 2016-03-31 | 8 | -12/+548 |
* | | | | | | | | | | | | | | | Merge "recovery: use __android_log_pmsg_file_write for log files" am: 75da771 am: 6f83130 | Mark Salyzyn | 2016-03-31 | 8 | -12/+548 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "recovery: use __android_log_pmsg_file_write for log files" am: 75da771 | Mark Salyzyn | 2016-03-31 | 8 | -12/+548 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "recovery: use __android_log_pmsg_file_write for log files" | Mark Salyzyn | 2016-03-31 | 8 | -12/+548 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / /
| | | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "recovery: use __android_log_pmsg_file_write for log files" | Mark Salyzyn | 2016-03-31 | 8 | -12/+548 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | recovery: use __android_log_pmsg_file_write for log files | Mark Salyzyn | 2016-03-28 | 8 | -12/+548 |
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: f1b2785 -s ours | Bill Yi | 2016-03-31 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-03-31 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-03-31 | 81 | -312/+498 |
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-03-31 | 81 | -312/+498 |
* | | | | | | | | | | | | | | | | Merge "uncrypt: remove --read-bcb option." am: ebd22be am: ecc068c -s ours | Yabin Cui | 2016-03-30 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "uncrypt: remove --read-bcb option." am: ebd22be | Yabin Cui | 2016-03-30 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "uncrypt: remove --read-bcb option." | Yabin Cui | 2016-03-30 | 1 | -32/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "uncrypt: remove --read-bcb option." | Yabin Cui | 2016-03-30 | 1 | -32/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | uncrypt: remove --read-bcb option. | Yabin Cui | 2016-03-30 | 1 | -32/+0 |
| | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Merge "uncrypt: fix call to close()." into nyc-dev am: 912e87e -s ours | Yabin Cui | 2016-03-30 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "uncrypt: fix call to close()." into nyc-dev | Yabin Cui | 2016-03-30 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "uncrypt: fix call to close()." into nyc-dev | Yabin Cui | 2016-03-30 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | uncrypt: fix call to close(). | Yabin Cui | 2016-03-30 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | Merge "Add string for Installing_security_update" am: 3568004 am: 2e21897 | Tianjie Xu | 2016-03-30 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Add string for Installing_security_update" am: 3568004 | Tianjie Xu | 2016-03-30 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Add string for Installing_security_update" | Tianjie Xu | 2016-03-30 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Add string for Installing_security_update" | Tianjie Xu | 2016-03-30 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | Add string for Installing_security_update | Tianjie Xu | 2016-03-29 | 1 | -0/+4 |
| | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 61799ba to nyc-dev-plus-aosp | Yabin Cui | 2016-03-30 | 1 | -32/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 61799ba to nyc-dev-plus-aosp | Yabin Cui | 2016-03-30 | 1 | -32/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | uncrypt: remove --read-bcb option. | Yabin Cui | 2016-03-29 | 1 | -32/+0 |
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | Add string for Installing_security_update am: 1ee0ff3 | Tianjie Xu | 2016-03-29 | 1 | -0/+4 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Add string for Installing_security_update | Tianjie Xu | 2016-03-29 | 1 | -0/+4 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Add string for Installing_security_update | Tianjie Xu | 2016-03-29 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | | Fix uncrypt.cpp unique_fd build breakage. | Elliott Hughes | 2016-03-29 | 1 | -10/+10 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Fix uncrypt.cpp unique_fd build breakage. | Elliott Hughes | 2016-03-29 | 1 | -10/+10 |
* | | | | | | | | | | | | | | | | resolve merge conflicts of 5cf4701 to nyc-dev-plus-aosp | Elliott Hughes | 2016-03-29 | 4 | -128/+56 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | resolve merge conflicts of 5cf4701 to nyc-dev-plus-aosp | Elliott Hughes | 2016-03-29 | 4 | -128/+56 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Switch to <android-base/unique_fd.h>." | Elliott Hughes | 2016-03-29 | 4 | -143/+74 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| / / / / / / / / / / /
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "Switch to <android-base/unique_fd.h>." | Elliott Hughes | 2016-03-29 | 4 | -143/+74 |
| | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Switch to <android-base/unique_fd.h>. | Elliott Hughes | 2016-03-29 | 4 | -143/+74 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Move recovery_l10n here from development/tools. am: cc79490 | Elliott Hughes | 2016-03-26 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Move recovery_l10n here from development/tools. | Elliott Hughes | 2016-03-26 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Move recovery_l10n here from development/tools. | Elliott Hughes | 2016-03-26 | 83 | -0/+1038 |
* | | | | | | | | | | | | | | Merge "Move recovery_l10n here from development/tools." am: 2dbd06c | Elliott Hughes | 2016-03-26 | 83 | -0/+1038 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Move recovery_l10n here from development/tools." | Elliott Hughes | 2016-03-26 | 83 | -0/+1038 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Move recovery_l10n here from development/tools." | Elliott Hughes | 2016-03-26 | 83 | -0/+1038 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Move recovery_l10n here from development/tools. | Elliott Hughes | 2016-03-26 | 83 | -0/+1038 |
* | | | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" am: 3123e5a | Tianjie Xu | 2016-03-25 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" | Tianjie Xu | 2016-03-25 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" | Tianjie Xu | 2016-03-25 | 1 | -8/+46 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | Skip stashing source blocks in verify mode | Tianjie Xu | 2016-03-25 | 1 | -8/+46 |
* | | | | | | | | | | | | | | | | Merge "Clean up intent_file related code in recovery.cpp" am: 7e18ce2 | Tianjie Xu | 2016-03-25 | 1 | -23/+5 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Clean up intent_file related code in recovery.cpp" | Tianjie Xu | 2016-03-25 | 1 | -23/+5 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Clean up intent_file related code in recovery.cpp" | Tianjie Xu | 2016-03-25 | 1 | -23/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Clean up intent_file related code in recovery.cpp | Tianjie Xu | 2016-03-24 | 1 | -23/+5 |
| | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Merge "Correct caching behavior for should_inject_cache" am: 9afbf2a | Jed Estep | 2016-03-25 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Correct caching behavior for should_inject_cache" | Jed Estep | 2016-03-25 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Correct caching behavior for should_inject_cache" | Tao Bao | 2016-03-25 | 2 | -18/+23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Correct caching behavior for should_inject_cache | Jed Estep | 2016-03-25 | 2 | -18/+23 |
| | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" into nyc-dev am: adca297 | Tianjie Xu | 2016-03-24 | 1 | -8/+46 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" into nyc-dev | Tianjie Xu | 2016-03-24 | 1 | -8/+46 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" into nyc-dev | Tianjie Xu | 2016-03-24 | 1 | -8/+46 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | Skip stashing source blocks in verify mode | Tianjie Xu | 2016-03-23 | 1 | -8/+46 |
* | | | | | | | | | | | | | | | | Correct caching behavior for should_inject_cache am: 88dd779 | Jed Estep | 2016-03-24 | 2 | -17/+17 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Correct caching behavior for should_inject_cache | Jed Estep | 2016-03-24 | 2 | -17/+17 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Correct caching behavior for should_inject_cache | Jed Estep | 2016-03-23 | 2 | -17/+17 |
* | | | | | | | | | | | | | | | | Merge "Remove dead tools." am: 4cb6812 | Elliott Hughes | 2016-03-23 | 4 | -398/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Remove dead tools." | Elliott Hughes | 2016-03-23 | 4 | -398/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Remove dead tools." | Elliott Hughes | 2016-03-23 | 4 | -398/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Remove dead tools. | Elliott Hughes | 2016-03-23 | 4 | -398/+0 |
| | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | Control fault injection with config files instead of build flags am: ff6df89 | Jed Estep | 2016-03-21 | 10 | -137/+242 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Control fault injection with config files instead of build flags | Jed Estep | 2016-03-21 | 10 | -137/+242 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Control fault injection with config files instead of build flags | Jed Estep | 2016-03-19 | 10 | -137/+242 |
* | | | | | | | | | | | | | | | Merge "Fix: full ota package larger than 2GB fails to upgrade" am: 867e60d | caozhiyuan | 2016-03-21 | 2 | -12/+14 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Fix: full ota package larger than 2GB fails to upgrade" | caozhiyuan | 2016-03-21 | 2 | -12/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Fix: full ota package larger than 2GB fails to upgrade" | Tao Bao | 2016-03-21 | 2 | -12/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | Fix: full ota package larger than 2GB fails to upgrade | caozhiyuan | 2016-03-21 | 2 | -12/+14 |
| | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | recovery: Move SwipeDetector into common location am: 9020e0f | Prashant Malani | 2016-03-18 | 3 | -0/+236 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | recovery: Move SwipeDetector into common location | Prashant Malani | 2016-03-18 | 3 | -0/+236 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | recovery: Move SwipeDetector into common location | Prashant Malani | 2016-03-18 | 3 | -0/+236 |
* | | | | | | | | | | | | | | | resolve merge conflicts of ce58688 to nyc-dev-plus-aosp | Tao Bao | 2016-03-17 | 10 | -241/+139 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | resolve merge conflicts of ce58688 to nyc-dev-plus-aosp | Tao Bao | 2016-03-17 | 10 | -241/+139 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Revert "DO NOT MERGE Control fault injection with config files instead of build flags" | Tao Bao | 2016-03-17 | 10 | -237/+137 |
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | | resolve merge conflicts of f73abf3 to nyc-dev-plus-aosp | Jed Estep | 2016-03-17 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | resolve merge conflicts of f73abf3 to nyc-dev-plus-aosp | Elliott Hughes | 2016-03-17 | 0 | -0/+0 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | DO NOT MERGE Control fault injection with config files instead of build flags | Jed Estep | 2016-03-16 | 10 | -137/+237 |
* | | | | | | | | | | | | | | Merge "Add include/ to the Makefile include path." am: 38234f4bef | Alex Deymo | 2016-03-14 | 1 | -1/+1 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Add include/ to the Makefile include path." | Alex Deymo | 2016-03-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Add include/ to the Makefile include path." | Alex Deymo | 2016-03-14 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Add include/ to the Makefile include path. | Alex Deymo | 2016-03-14 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | resolve merge conflicts of 0222db01fd to nyc-dev-plus-aosp | Greg Kaiser | 2016-03-14 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | resolve merge conflicts of 0222db01fd to nyc-dev-plus-aosp | Greg Kaiser | 2016-03-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "otafault: Fix setting of have_eio_error." into nyc-dev | Greg Kaiser | 2016-03-14 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | otafault: Fix setting of have_eio_error. | Greg Kaiser | 2016-03-14 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev am: 761653a4ad | Jed Estep | 2016-03-12 | 7 | -7/+428 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev | Jed Estep | 2016-03-12 | 7 | -7/+428 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev | Jed Estep | 2016-03-12 | 7 | -8/+429 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | Port applypatch.sh tests to recovery_component_tests | Jed Estep | 2016-03-12 | 7 | -8/+429 |
* | | | | | | | | | | | | | | | | Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev am: 20df4adead | Prashant Malani | 2016-03-12 | 4 | -72/+31 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev | Prashant Malani | 2016-03-12 | 4 | -72/+31 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev | Prashant Malani | 2016-03-12 | 4 | -72/+31 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | recovery: Remove SetColor, and other refactoring for WearUI | Prashant Malani | 2016-03-12 | 4 | -72/+31 |
| | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | applypatch: use vector to store data in FileContents. am: 1c522df25f -s ours | Yabin Cui | 2016-03-12 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | applypatch: use vector to store data in FileContents. | Yabin Cui | 2016-03-12 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | applypatch: use vector to store data in FileContents. | Yabin Cui | 2016-03-11 | 4 | -127/+78 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | recovery: Remove duplicate variables and functions am: 0ba21cff07 | Prashant Malani | 2016-03-11 | 4 | -18/+6 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | recovery: Remove duplicate variables and functions | Prashant Malani | 2016-03-11 | 4 | -18/+6 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | recovery: Remove duplicate variables and functions | Prashant Malani | 2016-03-11 | 4 | -18/+6 |
* | | | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" into nyc-dev am: d345de66ef -s ours | Tianjie Xu | 2016-03-10 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" into nyc-dev | Tianjie Xu | 2016-03-10 | 0 | -0/+0 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" into nyc-dev | Tianjie Xu | 2016-03-10 | 5 | -12/+119 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Reboot and retry on I/O errors | Tianjie Xu | 2016-03-10 | 5 | -12/+119 |
* | | | | | | | | | | | | | | | Revert "recovery: More refactoring of WearUI" am: f7f9e50528 | Prashant Malani | 2016-03-10 | 4 | -4/+84 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Revert "recovery: More refactoring of WearUI" | Prashant Malani | 2016-03-10 | 4 | -4/+84 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Revert "recovery: More refactoring of WearUI" | Prashant Malani | 2016-03-10 | 4 | -4/+84 |
* | | | | | | | | | | | | | | | recovery: More refactoring of WearUI am: 1c7b2230d8 | Prashant Malani | 2016-03-09 | 4 | -84/+4 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | recovery: More refactoring of WearUI | Prashant Malani | 2016-03-09 | 4 | -84/+4 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | recovery: More refactoring of WearUI | Prashant Malani | 2016-03-09 | 4 | -84/+4 |
* | | | | | | | | | | | | | | | Merge "applypatch: add -fPIC for libimgpatch in Chrome OS." am: 5593342575 | Sen Jiang | 2016-03-09 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "applypatch: add -fPIC for libimgpatch in Chrome OS." | Sen Jiang | 2016-03-09 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "applypatch: add -fPIC for libimgpatch in Chrome OS." | Sen Jiang | 2016-03-09 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | applypatch: add -fPIC for libimgpatch in Chrome OS. | Sen Jiang | 2016-03-09 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | recovery: Begin refactor of WearUI to use ScreenRecoveryUI am: 7d9fd96dc9 | Prashant Malani | 2016-03-09 | 2 | -35/+2 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | recovery: Begin refactor of WearUI to use ScreenRecoveryUI | Prashant Malani | 2016-03-09 | 2 | -35/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | recovery: Begin refactor of WearUI to use ScreenRecoveryUI | Prashant Malani | 2016-03-08 | 2 | -35/+2 |
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" am: 94dc34148c am: 90f01a4203 | Tianjie Xu | 2016-03-08 | 5 | -7/+93 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" am: 94dc34148c | Tianjie Xu | 2016-03-08 | 5 | -7/+93 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" | Tianjie Xu | 2016-03-08 | 5 | -7/+93 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Reboot and retry on I/O errors" | Tianjie Xu | 2016-03-08 | 5 | -7/+93 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | Reboot and retry on I/O errors | Tianjie Xu | 2016-03-03 | 5 | -7/+93 |
| | | | | |/ / / / / / / / / / /
| | | | |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." into nyc-dev am: 1731f2980b | Alex Deymo | 2016-03-05 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." into nyc-dev | Alex Deymo | 2016-03-05 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." into nyc-dev | Alex Deymo | 2016-03-05 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Restore labels on /postinstall during recovery. | Alex Deymo | 2016-03-05 | 1 | -0/+3 |
* | | | | | | | | | | | | | | | | | recovery: Handle devices without /cache partition. am: ae6408d1a2 | Tao Bao | 2016-03-04 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | recovery: Handle devices without /cache partition. | Tao Bao | 2016-03-04 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | recovery: Handle devices without /cache partition. | Tao Bao | 2016-03-04 | 1 | -10/+29 |
| | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Merge "recovery: Handle devices without /cache partition." am: 479d9dc2f2 am: f2726712ea | Tao Bao | 2016-03-04 | 1 | -10/+29 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "recovery: Handle devices without /cache partition." am: 479d9dc2f2 | Tao Bao | 2016-03-04 | 1 | -10/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "recovery: Handle devices without /cache partition." | Tao Bao | 2016-03-04 | 1 | -10/+29 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "recovery: Handle devices without /cache partition." | Tao Bao | 2016-03-04 | 1 | -10/+29 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | recovery: Handle devices without /cache partition. | Tao Bao | 2016-03-03 | 1 | -10/+29 |
* | | | | | | | | | | | | | | | | | Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." am: f639490a51 am: 038c294453 | Tao Bao | 2016-03-04 | 10 | -60/+102 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." am: f639490a51 | Tao Bao | 2016-03-04 | 10 | -60/+102 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." | Tao Bao | 2016-03-04 | 10 | -60/+102 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." | Tao Bao | 2016-03-04 | 10 | -60/+102 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES. | Tao Bao | 2016-03-03 | 10 | -60/+102 |
| | | | | |_|/ / / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." am: 60eae72ac6 am: f6ffefb116 | Alex Deymo | 2016-03-04 | 1 | -0/+3 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." am: 60eae72ac6 | Alex Deymo | 2016-03-04 | 1 | -0/+3 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." | Alex Deymo | 2016-03-04 | 1 | -0/+3 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." | Alex Deymo | 2016-03-04 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Restore labels on /postinstall during recovery. | Alex Deymo | 2016-03-02 | 1 | -0/+3 |
| | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | uncrypt: Communicate via /dev/socket/uncrypt. am: 3a2bb594df | Tao Bao | 2016-03-04 | 2 | -79/+184 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | uncrypt: Communicate via /dev/socket/uncrypt. | Tao Bao | 2016-03-04 | 2 | -79/+184 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | uncrypt: Communicate via /dev/socket/uncrypt. | Tao Bao | 2016-03-03 | 2 | -79/+184 |
* | | | | | | | | | | | | | | | | Merge "Remove dumpkey build guards after completing code move." am: 5ffc038be6 am: ea0e0faae6 | Mattias Nissler | 2016-03-01 | 1 | -10/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Remove dumpkey build guards after completing code move." am: 5ffc038be6 | Mattias Nissler | 2016-03-01 | 1 | -10/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Remove dumpkey build guards after completing code move." | Mattias Nissler | 2016-03-01 | 1 | -10/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "Remove dumpkey build guards after completing code move." | Mattias Nissler | 2016-03-01 | 1 | -10/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | Remove dumpkey build guards after completing code move. | Mattias Nissler | 2016-02-26 | 1 | -10/+0 |
| | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Merge "Fixes to wear recovery for N" into nyc-dev am: 9db7964834 | Prashant Malani | 2016-03-01 | 2 | -0/+35 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Fixes to wear recovery for N" into nyc-dev | Prashant Malani | 2016-02-29 | 2 | -0/+35 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Fixes to wear recovery for N" into nyc-dev | Prashant Malani | 2016-02-29 | 2 | -0/+35 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Fixes to wear recovery for N | Prashant Malani | 2016-02-27 | 2 | -0/+35 |
* | | | | | | | | | | | | | | | | | Merge "uncrypt: Retire pre-recovery service." into nyc-dev am: 65f35b5c35 | Tao Bao | 2016-02-28 | 2 | -19/+2 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "uncrypt: Retire pre-recovery service." into nyc-dev | Tao Bao | 2016-02-28 | 2 | -19/+2 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "uncrypt: Retire pre-recovery service." into nyc-dev | Tao Bao | 2016-02-28 | 2 | -19/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | uncrypt: Retire pre-recovery service. | Tao Bao | 2016-02-23 | 2 | -19/+2 |
* | | | | | | | | | | | | | | | | | Merge "Move dumpkey tool to the recovery repo." am: 5197fde242 am: b652678953 | Mattias Nissler | 2016-02-26 | 3 | -0/+303 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Move dumpkey tool to the recovery repo." am: 5197fde242 | Mattias Nissler | 2016-02-26 | 3 | -0/+303 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Move dumpkey tool to the recovery repo." | Mattias Nissler | 2016-02-26 | 3 | -0/+303 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Move dumpkey tool to the recovery repo." | Mattias Nissler | 2016-02-26 | 3 | -0/+303 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Move dumpkey tool to the recovery repo. | Mattias Nissler | 2016-02-24 | 3 | -0/+303 |
| | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Move recovery\'s convert_fbe folder to /tmp am: 661f8a69f2 | Paul Lawrence | 2016-02-25 | 1 | -4/+7 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Move recovery\'s convert_fbe folder to /tmp | Paul Lawrence | 2016-02-25 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Move recovery's convert_fbe folder to /tmp | Paul Lawrence | 2016-02-25 | 1 | -4/+7 |
* | | | | | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change." into nyc-dev am: 0757a093c1 | Josh Gao | 2016-02-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change." into nyc-dev | Josh Gao | 2016-02-24 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change." into nyc-dev | Josh Gao | 2016-02-24 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | minadbd: update for adb_thread_create signature change. | Josh Gao | 2016-02-23 | 1 | -2/+1 |
| | | | |_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | recovery: check battery level before installing package. am: 99281df8e2 | Yabin Cui | 2016-02-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | recovery: check battery level before installing package. | Yabin Cui | 2016-02-24 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | recovery: check battery level before installing package. | Yabin Cui | 2016-02-23 | 3 | -16/+89 |
* | | | | | | | | | | | | | | | | Merge "Surpress warnings in minzip/Zip.c" am: 4b3cdce702 am: 0d63468171 | Tianjie Xu | 2016-02-23 | 1 | -4/+1 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Surpress warnings in minzip/Zip.c" am: 4b3cdce702 | Tianjie Xu | 2016-02-23 | 1 | -4/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Surpress warnings in minzip/Zip.c" | Tianjie Xu | 2016-02-23 | 1 | -4/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "Surpress warnings in minzip/Zip.c" | Tianjie Xu | 2016-02-23 | 1 | -4/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | Surpress warnings in minzip/Zip.c | Tianjie Xu | 2016-02-23 | 1 | -4/+1 |
* | | | | | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 am: ae68f02272 am: a3604da6e1 am: 089fe38ac5 | Yabin Cui | 2016-02-23 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 am: ae68f02272 am: a3604da6e1 | Yabin Cui | 2016-02-23 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 am: ae68f02272 | Yabin Cui | 2016-02-23 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|/ / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 | Yabin Cui | 2016-02-23 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|/ / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 | Yabin Cui | 2016-02-23 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |_|_|_|_|/ / / / / / /
| | | | | |/| | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 | Yabin Cui | 2016-02-23 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | |_|_|_|_|/ / / / / /
| | | | | | |/| | | | | | | | | | |
|
| | | | | | * | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a | Yabin Cui | 2016-02-23 | 1 | -15/+54 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | |_|_|_|_|/ / / / /
| | | | | | | |/| | | | | | | | | |
|
| | | | | | | * | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 | Yabin Cui | 2016-02-23 | 1 | -15/+54 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | |_|_|_|_|/ / / /
| | | | | | | | |/| | | | | | | | |
|
| | | | | | | | * | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 | Yabin Cui | 2016-02-23 | 1 | -15/+54 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | * \ \ \ \ \ \ \ \ | Fix integer overflows in recovery procedure. | Yabin Cui | 2016-02-23 | 1 | -15/+54 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | |_|_|_|_|/ / /
| | | | | | | | | | |/| | | | | | | |
|
| | | | | | | | | | * | | | | | | | | Fix integer overflows in recovery procedure. | Yabin Cui | 2016-02-23 | 1 | -15/+54 |
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of e5d3d15cd2 to nyc-dev am: 0d28ba452f | Yabin Cui | 2016-02-23 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of e5d3d15cd2 to nyc-dev | Yabin Cui | 2016-02-23 | 1 | -15/+52 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | resolve merge conflicts of e5d3d15cd2 to nyc-dev | Yabin Cui | 2016-02-23 | 1 | -15/+52 |
| | |\| | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|_|/ / / /
| | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 4f2df162c6 | Yabin Cui | 2016-02-23 | 1 | -15/+54 |
| | | |\| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Fix integer overflows in recovery procedure. | Yabin Cui | 2016-02-23 | 1 | -15/+54 |
| | | | |\| | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | Fix integer overflows in recovery procedure. | Yabin Cui | 2016-02-22 | 1 | -15/+54 |
* | | | | | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags" am: ed796b046d am: 24b3622933 | Tao Bao | 2016-02-23 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags" am: ed796b046d | Tao Bao | 2016-02-23 | 10 | -121/+242 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|/ / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags" | Tao Bao | 2016-02-23 | 10 | -121/+242 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|/ / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags" | Tao Bao | 2016-02-23 | 10 | -121/+242 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|/ / / /
| | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Control fault injection with config files instead of build flags | Jed Estep | 2016-02-23 | 10 | -121/+242 |
* | | | | | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags" | Jed Estep | 2016-02-23 | 10 | -121/+242 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | Control fault injection with config files instead of build flags | Jed Estep | 2016-02-20 | 10 | -121/+242 |
* | | | | | | | | | | | | | | | | | | Merge "recovery: check battery level before installing package." am: 16d0a18514 am: d1b66ad6a1 | Yabin Cui | 2016-02-23 | 3 | -16/+89 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "recovery: check battery level before installing package." am: 16d0a18514 | Yabin Cui | 2016-02-23 | 3 | -16/+89 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "recovery: check battery level before installing package." | Yabin Cui | 2016-02-23 | 3 | -16/+89 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "recovery: check battery level before installing package." | Yabin Cui | 2016-02-22 | 3 | -16/+89 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | recovery: check battery level before installing package. | Yabin Cui | 2016-02-20 | 3 | -16/+89 |
* | | | | | | | | | | | | | | | | | | Fix verifier test base testdata directory after merge conflict am: e1305768f6 | Jed Estep | 2016-02-22 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Fix verifier test base testdata directory after merge conflict | Jed Estep | 2016-02-22 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Fix verifier test base testdata directory after merge conflict | Jed Estep | 2016-02-22 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Merge "Check each value read from block map file." | Yabin Cui | 2016-02-22 | 1 | -15/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | Check each value read from block map file. | Yabin Cui | 2016-02-20 | 1 | -15/+31 |
* | | | | | | | | | | | | | | | | | | | Merge "Fix minui cleanup path on error." am: fa9af7dae6 am: af38cd9330 | Elliott Hughes | 2016-02-20 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Fix minui cleanup path on error." am: fa9af7dae6 | Elliott Hughes | 2016-02-20 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Fix minui cleanup path on error." | Elliott Hughes | 2016-02-20 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Fix minui cleanup path on error." | Elliott Hughes | 2016-02-20 | 1 | -3/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Fix minui cleanup path on error. | Elliott Hughes | 2016-02-19 | 1 | -3/+3 |
| | | |/ / / / / / / / / / / / / / / |
|
* | | | / / / / / / / / / / / / / / | DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b -s ours am: 52991c4639 -s ours am: a4436f7b25 -s ours | Tao Bao | 2016-02-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
| |_|_|/ / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b -s ours am: 52991c4639 -s ours | Tao Bao | 2016-02-19 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b -s ours | Tao Bao | 2016-02-19 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. | Tao Bao | 2016-02-19 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. | Tao Bao | 2016-02-19 | 1 | -7/+22 |
| | | |/ / / / / / / / / / / / / |
|
* | | / / / / / / / / / / / / / | Fix integer overflows in recovery procedure. | Yabin Cui | 2016-02-18 | 2 | -12/+33 |
|/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | Merge commit \'ce46828e08281dc507d4e40ba9e8b770bc21cf0b\' into HEAD | Bill Yi | 2016-02-17 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|/ / / / / / / / / / / /
| |/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge commit 'ce46828e08281dc507d4e40ba9e8b770bc21cf0b' into HEAD | Bill Yi | 2016-02-17 | 1 | -12/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|/ / / / / / / / / / /
| |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | Merge "applypatch: Add libimgpatch.pc" | Sen Jiang | 2016-02-17 | 1 | -0/+6 |
|\| | | | | | | | | | | | | |
| |_|_|_|/ / / / / / / / / /
|/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "applypatch: Add libimgpatch.pc" | Sen Jiang | 2016-02-17 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | applypatch: Add libimgpatch.pc | Sen Jiang | 2016-02-16 | 1 | -0/+6 |
| |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change." | Josh Gao | 2016-02-13 | 1 | -2/+1 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change." | Josh Gao | 2016-02-13 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | minadbd: update for adb_thread_create signature change. | Josh Gao | 2016-02-13 | 1 | -2/+1 |
| | | |_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | | Merge "imgdiff: don\'t fail if gzip is corrupted." | Sen Jiang | 2016-02-13 | 1 | -12/+10 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "imgdiff: don't fail if gzip is corrupted." | Sen Jiang | 2016-02-12 | 1 | -12/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | imgdiff: don't fail if gzip is corrupted. | Sen Jiang | 2016-02-12 | 1 | -12/+10 |
| |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "applypatch: use vector to store data in FileContents." | Yabin Cui | 2016-02-12 | 4 | -126/+77 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "applypatch: use vector to store data in FileContents." | Yabin Cui | 2016-02-12 | 4 | -126/+77 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | applypatch: use vector to store data in FileContents. | Yabin Cui | 2016-02-12 | 4 | -126/+77 |
* | | | | | | | | | | | | | | Merge "Fix some memory leaks." | Yabin Cui | 2016-02-11 | 4 | -60/+35 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Fix some memory leaks." | Yabin Cui | 2016-02-11 | 4 | -60/+35 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Fix some memory leaks. | Yabin Cui | 2016-02-11 | 4 | -60/+35 |
* | | | | | | | | | | | | | | resolve merge conflicts of 7043206503 to nyc-dev-plus-aosp. | Tao Bao | 2016-02-10 | 4 | -20/+18 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "IO fault injection for OTA packages" | Tao Bao | 2016-02-10 | 10 | -62/+365 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | IO fault injection for OTA packages | Jed Estep | 2016-02-10 | 10 | -62/+365 |
| |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "applypatch: Add a Makefile to build imgdiff in Chrome OS." | Sen Jiang | 2016-02-10 | 6 | -4/+39 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "applypatch: Add a Makefile to build imgdiff in Chrome OS." | Sen Jiang | 2016-02-10 | 6 | -4/+39 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | applypatch: Add a Makefile to build imgdiff in Chrome OS. | Sen Jiang | 2016-02-10 | 6 | -4/+39 |
| |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "verifier_test: Suppress the unused parameter warnings." | Tao Bao | 2016-02-09 | 1 | -8/+9 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "verifier_test: Suppress the unused parameter warnings." | Tao Bao | 2016-02-09 | 1 | -8/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | verifier_test: Suppress the unused parameter warnings. | Tao Bao | 2016-02-05 | 1 | -8/+9 |
* | | | | | | | | | | | | | | Merge "Change on-device directory for recovery test data" | Tao Bao | 2016-02-08 | 2 | -2/+2 |
|\| | | | | | | | | | | | |
| |_|_|/ / / / / / / / / /
|/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "Change on-device directory for recovery test data" | Tao Bao | 2016-02-08 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | Change on-device directory for recovery test data | Jed Estep | 2016-02-05 | 2 | -2/+2 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | resolve merge conflicts of 715d8a203a to master. | Yabin Cui | 2016-02-06 | 7 | -303/+204 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Merge "applypatch: fix memory leaks reported by static analysis." | Yabin Cui | 2016-02-05 | 7 | -303/+202 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "applypatch: fix memory leaks reported by static analysis." | Yabin Cui | 2016-02-05 | 7 | -303/+202 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | applypatch: fix memory leaks reported by static analysis. | Yabin Cui | 2016-02-05 | 7 | -303/+202 |
* | | | | | | | | | | | | | | Merge "Refactor existing tests to use gtest" am: 38b02cc6a0 | Tao Bao | 2016-02-05 | 25 | -215/+145 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Refactor existing tests to use gtest" | Tao Bao | 2016-02-05 | 25 | -215/+145 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Refactor existing tests to use gtest" | Tao Bao | 2016-02-05 | 25 | -215/+145 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Refactor existing tests to use gtest | Jed Estep | 2016-02-04 | 25 | -215/+145 |
* | | | | | | | | | | | | | | | Merge "updater: fix memory leak based on static analysis." am: e50d447692 | Yabin Cui | 2016-02-05 | 1 | -44/+39 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "updater: fix memory leak based on static analysis." | Yabin Cui | 2016-02-05 | 1 | -44/+39 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "updater: fix memory leak based on static analysis." | Yabin Cui | 2016-02-05 | 1 | -44/+39 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | updater: fix memory leak based on static analysis. | Yabin Cui | 2016-02-04 | 1 | -44/+39 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | resolve merge conflicts of 7b6027dde4 to master. | Tao Bao | 2016-02-04 | 10 | -61/+59 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Switch from mincrypt to BoringSSL in applypatch and updater." | Tao Bao | 2016-02-04 | 10 | -61/+59 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Switch from mincrypt to BoringSSL in applypatch and updater." | Tao Bao | 2016-02-04 | 10 | -61/+59 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Switch from mincrypt to BoringSSL in applypatch and updater. | Sen Jiang | 2016-02-04 | 10 | -61/+59 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "uncrypt: add options to setup bcb and clear bcb." am: e3434279c8 | Yabin Cui | 2016-02-03 | 2 | -104/+198 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "uncrypt: add options to setup bcb and clear bcb." | Yabin Cui | 2016-02-03 | 2 | -104/+198 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "uncrypt: add options to setup bcb and clear bcb." | Yabin Cui | 2016-02-03 | 2 | -104/+198 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | uncrypt: add options to setup bcb and clear bcb. | Yabin Cui | 2016-02-03 | 2 | -104/+198 |
* | | | | | | | | | | | | | | Merge "recovery: Refactor verifier and verifier_test." am: 351ddbbc0a | Tao Bao | 2016-02-03 | 4 | -193/+168 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "recovery: Refactor verifier and verifier_test." | Tao Bao | 2016-02-03 | 4 | -193/+168 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "recovery: Refactor verifier and verifier_test." | Tao Bao | 2016-02-03 | 4 | -193/+168 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | recovery: Refactor verifier and verifier_test. | Tao Bao | 2016-02-03 | 4 | -193/+168 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "uncrypt: generate map file by renaming tmp file." am: 4c07a7ec05 | Yabin Cui | 2016-02-02 | 1 | -75/+93 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "uncrypt: generate map file by renaming tmp file." | Yabin Cui | 2016-02-02 | 1 | -75/+93 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "uncrypt: generate map file by renaming tmp file." | Yabin Cui | 2016-02-02 | 1 | -75/+93 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | uncrypt: generate map file by renaming tmp file. | Yabin Cui | 2016-02-01 | 1 | -75/+93 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "Fix build." am: 9d72d4175b | Tao Bao | 2016-01-29 | 1 | -0/+2 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "Fix build." | Tao Bao | 2016-01-29 | 1 | -0/+2 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "Fix build." | Tao Bao | 2016-01-29 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | Fix build. | Tao Bao | 2016-01-29 | 1 | -0/+2 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | resolve merge conflicts of 725833e024 to master. | Tao Bao | 2016-01-29 | 4 | -2/+69 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "applypatch: Compile libimgpatch for target and host." | Sen Jiang | 2016-01-29 | 4 | -2/+69 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "applypatch: Compile libimgpatch for target and host." | Sen Jiang | 2016-01-29 | 4 | -2/+69 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | applypatch: Compile libimgpatch for target and host. | Sen Jiang | 2016-01-28 | 4 | -2/+69 |
* | | | | | | | | | | | | | | Merge "edify: accept long string literal." am: d379b4410b | Yabin Cui | 2016-01-28 | 2 | -13/+16 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "edify: accept long string literal." | Yabin Cui | 2016-01-28 | 2 | -13/+16 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "edify: accept long string literal." | Yabin Cui | 2016-01-28 | 2 | -13/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | edify: accept long string literal. | Yabin Cui | 2016-01-27 | 2 | -13/+16 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "Change BCB to perform synchronous writes." am: 5797bf9c90 | Tao Bao | 2016-01-22 | 1 | -59/+74 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "Change BCB to perform synchronous writes." | Tao Bao | 2016-01-22 | 1 | -59/+74 |
| |\| | | | | | | | | | |
| | |/ / / / / / / / / /
| |/| | | | | | | | | | |
|
| | * | | | | | | | | | | Merge "Change BCB to perform synchronous writes." | Tao Bao | 2016-01-22 | 1 | -59/+74 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | Change BCB to perform synchronous writes. | Tao Bao | 2016-01-21 | 1 | -59/+74 |
| | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | Merge "recovery: Fork a process for fuse when sideloading from SD card." am: 37e3c71da3 | Tao Bao | 2016-01-14 | 3 | -69/+69 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | Merge "recovery: Fork a process for fuse when sideloading from SD card." | Tao Bao | 2016-01-14 | 3 | -69/+69 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | Merge "recovery: Fork a process for fuse when sideloading from SD card." | Tao Bao | 2016-01-14 | 3 | -69/+69 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | recovery: Fork a process for fuse when sideloading from SD card. | Tao Bao | 2016-01-14 | 3 | -69/+69 |
* | | | | | | | | | | | | | Merge "uncrypt: avoid use-after-free" am: 0305fcecc5 | Tao Bao | 2016-01-14 | 1 | -3/+4 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "uncrypt: avoid use-after-free" | Tao Bao | 2016-01-14 | 1 | -3/+4 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "uncrypt: avoid use-after-free" | Tao Bao | 2016-01-14 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | uncrypt: avoid use-after-free | Daniel Micay | 2016-01-12 | 1 | -3/+4 |
* | | | | | | | | | | | | | Revert "Byte swap to support BGRA in recovery mode" am: a5d5082222 am: 40cce13094 | Andriy Naborskyy | 2016-01-13 | 1 | -12/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Revert "Byte swap to support BGRA in recovery mode" am: a5d5082222 | Andriy Naborskyy | 2016-01-12 | 1 | -12/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ | Revert "Byte swap to support BGRA in recovery mode" | Andriy Naborskyy | 2016-01-12 | 1 | -12/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / /
| | | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | | Revert "Byte swap to support BGRA in recovery mode" | Andriy Naborskyy | 2016-01-08 | 1 | -12/+0 |
* | | | | | | | | | | | | | | Merge "Rename .l/.y to .ll/.yy" am: ab9db5284e | Ying Wang | 2016-01-13 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Rename .l/.y to .ll/.yy" | Ying Wang | 2016-01-12 | 3 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Rename .l/.y to .ll/.yy" | Ying Wang | 2016-01-12 | 3 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Rename .l/.y to .ll/.yy | Ying Wang | 2016-01-12 | 3 | -2/+2 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Rename .l/.y to .ll/.yy | Ying Wang | 2016-01-13 | 3 | -2/+2 |
* | | | | | | | | | | | | | Merge "IO fault injection for OTA packages" | Jed Estep | 2016-01-09 | 10 | -45/+348 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | IO fault injection for OTA packages | Jed Estep | 2016-01-06 | 10 | -45/+348 |
* | | | | | | | | | | | | | | Merge "updater: Add a function to check first block" am: 6f8b9b60db | Tianjie Xu | 2016-01-08 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "updater: Add a function to check first block" | Tianjie Xu | 2016-01-08 | 2 | -0/+58 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "updater: Add a function to check first block" | Tianjie Xu | 2016-01-08 | 2 | -0/+58 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | updater: Add a function to check first block | Tianjie Xu | 2016-01-07 | 2 | -0/+58 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "updater: Add a function to check first block" | Tianjie Xu | 2016-01-07 | 2 | -0/+58 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|/ / / / / / / / / / /
|/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | updater: Add a function to check first block | Tianjie Xu | 2015-12-18 | 2 | -0/+58 |
* | | | | | | | | | | | | | | Merge "imgdiff: skip spurious gzip headers in image files" am: 8e150a5b24 | David Riley | 2016-01-04 | 1 | -6/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "imgdiff: skip spurious gzip headers in image files" | David Riley | 2016-01-04 | 1 | -6/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "imgdiff: skip spurious gzip headers in image files" | David Riley | 2016-01-04 | 1 | -6/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | imgdiff: skip spurious gzip headers in image files | David Riley | 2015-12-23 | 1 | -6/+13 |
| | |/ / / / / / / / / / / / |
|
* | | / / / / / / / / / / / | Merge "res: Embed FPS into icon_installing.png." am: 29b0fbe160 | Tao Bao | 2015-12-18 | 12 | -42/+82 |
|\| | | | | | | | | | | | |
| |_|/ / / / / / / / / / /
|/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "res: Embed FPS into icon_installing.png." | Tao Bao | 2015-12-18 | 12 | -42/+82 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "res: Embed FPS into icon_installing.png." | Tao Bao | 2015-12-18 | 12 | -42/+82 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | res: Embed FPS into icon_installing.png. | Tao Bao | 2015-12-16 | 12 | -42/+82 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "updater: Use O_SYNC and fsync() for package_extract_file()." am: 4e72d1a81e | Tao Bao | 2015-12-15 | 1 | -6/+13 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "updater: Use O_SYNC and fsync() for package_extract_file()." | Tao Bao | 2015-12-15 | 1 | -6/+13 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "updater: Use O_SYNC and fsync() for package_extract_file()." | Tao Bao | 2015-12-15 | 1 | -6/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | updater: Use O_SYNC and fsync() for package_extract_file(). | Tao Bao | 2015-12-15 | 1 | -6/+13 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "update_verifier: Track the API change for isSlotBootable()." am: e062645efa | Tao Bao | 2015-12-11 | 1 | -5/+6 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "update_verifier: Track the API change for isSlotBootable()." | Tao Bao | 2015-12-11 | 1 | -5/+6 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "update_verifier: Track the API change for isSlotBootable()." | Tao Bao | 2015-12-11 | 1 | -5/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | update_verifier: Track the API change for isSlotBootable(). | Tao Bao | 2015-12-09 | 1 | -5/+6 |
* | | | | | | | | | | | | | | Merge "uncrypt: Suppress the compiler warnings on LP64." am: ca18526760 | Tao Bao | 2015-12-11 | 1 | -10/+12 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "uncrypt: Suppress the compiler warnings on LP64." | Tao Bao | 2015-12-11 | 1 | -10/+12 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "uncrypt: Suppress the compiler warnings on LP64." | Tao Bao | 2015-12-11 | 1 | -10/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | uncrypt: Suppress the compiler warnings on LP64. | Tao Bao | 2015-12-09 | 1 | -10/+12 |
| | | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "updater: Output msg when recovery is called" am: 32f6298742 | Tianjie Xu | 2015-12-11 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "updater: Output msg when recovery is called" | Tianjie Xu | 2015-12-11 | 1 | -1/+4 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "updater: Output msg when recovery is called" | Tianjie Xu | 2015-12-11 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | updater: Output msg when recovery is called | Tianjie Xu | 2015-12-11 | 1 | -1/+4 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "updater: Output msg when recovery is called" | Tianjie Xu | 2015-12-11 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | updater: Output msg when recovery is called | Tianjie Xu | 2015-12-10 | 1 | -1/+4 |
* | | | | | | | | | | | | | | Merge changes If00669a7,Ia5504ed2 am: ddde4676b6 | Tao Bao | 2015-12-08 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge changes If00669a7,Ia5504ed2 | Tao Bao | 2015-12-08 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge changes If00669a7,Ia5504ed2 | Tao Bao | 2015-12-08 | 3 | -0/+105 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | update_verifier: Log to logd instead of kernel log. | Tao Bao | 2015-12-08 | 2 | -12/+8 |
| | | * | | | | | | | | | | | | Add update_verifier for A/B OTA update. | Tao Bao | 2015-12-08 | 3 | -0/+109 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "updater: Replace strtok() with android::base::Split()." am: d0acbb56ed | Tao Bao | 2015-12-08 | 1 | -133/+144 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "updater: Replace strtok() with android::base::Split()." | Tao Bao | 2015-12-08 | 1 | -133/+144 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "updater: Replace strtok() with android::base::Split()." | Tao Bao | 2015-12-08 | 1 | -133/+144 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | updater: Replace strtok() with android::base::Split(). | Tao Bao | 2015-12-07 | 1 | -133/+144 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | update_verifier: Log to logd instead of kernel log. am: 45eac58ef1 | Tao Bao | 2015-12-08 | 2 | -12/+8 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | update_verifier: Log to logd instead of kernel log. | Tao Bao | 2015-12-08 | 2 | -12/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | update_verifier: Log to logd instead of kernel log. | Tao Bao | 2015-12-08 | 2 | -12/+8 |
* | | | | | | | | | | | | | | Add update_verifier for A/B OTA update. am: 1171d3a12b | Tao Bao | 2015-12-08 | 3 | -0/+109 |
|\| | | | | | | | | | | | |
| |_|_|/ / / / / / / / / /
|/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Add update_verifier for A/B OTA update. | Tao Bao | 2015-12-08 | 3 | -0/+109 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Add update_verifier for A/B OTA update. | Tao Bao | 2015-12-07 | 3 | -0/+109 |
* | | | | | | | | | | | | | Merge "Track rename from base/ to android-base/." am: 06ca938ce2 | Elliott Hughes | 2015-12-05 | 7 | -13/+13 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "Track rename from base/ to android-base/." | Elliott Hughes | 2015-12-05 | 7 | -13/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "Track rename from base/ to android-base/." | Elliott Hughes | 2015-12-05 | 7 | -13/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | Track rename from base/ to android-base/. | Elliott Hughes | 2015-12-05 | 7 | -13/+13 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "Remove the building rules for applypatch_static." am: fc23a50cef | Tao Bao | 2015-12-05 | 1 | -13/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "Remove the building rules for applypatch_static." | Tao Bao | 2015-12-03 | 1 | -13/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "Remove the building rules for applypatch_static." | Tao Bao | 2015-12-02 | 1 | -13/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | Remove the building rules for applypatch_static. | Tao Bao | 2015-12-02 | 1 | -13/+0 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "Track name change from adb_main to adb_server_main." am: ee5c87eea7 | Elliott Hughes | 2015-11-20 | 2 | -2/+2 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "Track name change from adb_main to adb_server_main." | Elliott Hughes | 2015-11-20 | 2 | -2/+2 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "Track name change from adb_main to adb_server_main." | Elliott Hughes | 2015-11-20 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | Track name change from adb_main to adb_server_main. | Elliott Hughes | 2015-11-20 | 2 | -2/+2 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Add slot_suffix field to struct bootloader_message. am: 846c094fee | David Zeuthen | 2015-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Add slot_suffix field to struct bootloader_message. | David Zeuthen | 2015-11-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | Add slot_suffix field to struct bootloader_message. | David Zeuthen | 2015-11-16 | 1 | -1/+9 |
* | | | | | | | | | | | | | Merge commit \'8f90389966fabf532b24741d49245215279533e1\' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge commit '8f90389966fabf532b24741d49245215279533e1' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | recovery: Allow "Mount /system" for system_root_image. | Tao Bao | 2015-11-16 | 3 | -19/+39 |
* | | | | | | | | | | | | | Merge commit \'32ac97675bade3681203c46d001f76b11a359fd5\' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge commit '32ac97675bade3681203c46d001f76b11a359fd5' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | applypatch: Fix the checking in WriteToPartition(). | Tao Bao | 2015-11-16 | 1 | -3/+4 |
* | | | | | | | | | | | | | Merge commit \'f47259b18492c921445d9e437a9f9ed11c52fac6\' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge commit 'f47259b18492c921445d9e437a9f9ed11c52fac6' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | applypatch: Support flash mode. | Tao Bao | 2015-11-16 | 3 | -16/+97 |
* | | | | | | | | | | | | | Merge commit \'3b199267d6d4c279cbef3286a74e16bf92dd8d8a\' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge commit '3b199267d6d4c279cbef3286a74e16bf92dd8d8a' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | updater: libapplypatch needs libbase now. | Tao Bao | 2015-11-16 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge commit \'27604fcbee0010b800bfc16b5bf7a48c365c2cf3\' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge commit '27604fcbee0010b800bfc16b5bf7a48c365c2cf3' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | applypatch: Refactor strtok(). | Tao Bao | 2015-11-16 | 2 | -86/+56 |
* | | | | | | | | | | | | | DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp. am: 818fa781d1 -s ours | Tao Bao | 2015-11-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp. | Tao Bao | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp. | Tao Bao | 2015-11-16 | 15 | -300/+304 |
* | | | | | | | | | | | | | Add error and range checks to parse_range am: 806f72f9e6 -s ours | Sami Tolvanen | 2015-11-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Add error and range checks to parse_range | Sami Tolvanen | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Add error and range checks to parse_range | Sami Tolvanen | 2015-11-16 | 1 | -10/+71 |
* | | | | | | | | | | | | | Stop using libstdc++. am: 56deefba73 -s ours | Dan Albert | 2015-11-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Stop using libstdc++. | Dan Albert | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Stop using libstdc++. | Dan Albert | 2015-11-16 | 3 | -5/+3 |
* | | | | | | | | | | | | | recovery: Switch to clang am: 7101b2e285 -s ours | Tao Bao | 2015-11-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | recovery: Switch to clang | Tao Bao | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | |
| | |/ / / / / / / / / /
| |/| | | | | | | | | | |
|
| | * | | | | | | | | | | recovery: Switch to clang | Tao Bao | 2015-11-16 | 13 | -11/+38 |
| | |/ / / / / / / / / |
|
* | | | | | | | | | | | Merge "Create convert_fbe breadcrumb file to support conversion to FBE" | Paul Lawrence | 2015-11-13 | 3 | -3/+35 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Create convert_fbe breadcrumb file to support conversion to FBE | Paul Lawrence | 2015-11-13 | 3 | -3/+35 |
* | | | | | | | | | | | | Merge "We can use fclose directly in std::unique_ptr." | Elliott Hughes | 2015-11-13 | 2 | -16/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / /
|/| / / / / / / / / / /
| |/ / / / / / / / / / |
|
| * | | | | | | | | | | Merge "We can use fclose directly in std::unique_ptr." | Elliott Hughes | 2015-11-13 | 2 | -16/+5 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | We can use fclose directly in std::unique_ptr. | Elliott Hughes | 2015-11-13 | 2 | -16/+5 |
| |/ / / / / / / / / / |
|
* | | | | | | | | | | | Merge "uncrypt: remove O_SYNC to avoid time-out failures" | Tao Bao | 2015-11-05 | 1 | -1/+1 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge "uncrypt: remove O_SYNC to avoid time-out failures" | Tao Bao | 2015-11-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | uncrypt: remove O_SYNC to avoid time-out failures | Jaegeuk Kim | 2015-11-04 | 1 | -1/+1 |
| |/ / / / / / / / / / |
|
* | | | | | | | | | | | Merge "recovery: Depend on mkfs.f2fs only if needed." am: a412198699 | Tao Bao | 2015-10-28 | 1 | -0/+2 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge "recovery: Depend on mkfs.f2fs only if needed." | Tao Bao | 2015-10-28 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ | Merge "recovery: Depend on mkfs.f2fs only if needed." | Tao Bao | 2015-10-28 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | recovery: Depend on mkfs.f2fs only if needed. | Tao Bao | 2015-10-28 | 1 | -0/+2 |
| | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | Merge "updater: Bump up the BBOTA version to 4." am: f204185f71 | Tao Bao | 2015-10-23 | 1 | -1/+1 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | Merge "updater: Bump up the BBOTA version to 4." | Tao Bao | 2015-10-23 | 1 | -1/+1 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | Merge "updater: Bump up the BBOTA version to 4." | Tao Bao | 2015-10-23 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | updater: Bump up the BBOTA version to 4. | Tao Bao | 2015-10-23 | 1 | -1/+1 |
| | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | am 339ec2ef: am 78615fa5: Merge "Error correction: Use libfec in blockimg.cpp for recovery" | Sami Tolvanen | 2015-10-19 | 2 | -1/+78 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 78615fa5: Merge "Error correction: Use libfec in blockimg.cpp for recovery" | Sami Tolvanen | 2015-10-19 | 2 | -1/+78 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | Merge "Error correction: Use libfec in blockimg.cpp for recovery" | Sami Tolvanen | 2015-10-19 | 2 | -1/+78 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | Error correction: Use libfec in blockimg.cpp for recovery | Sami Tolvanen | 2015-10-19 | 2 | -1/+78 |
| | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | am 4c6c96a5: am 245b2da1: am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file." | Tao Bao | 2015-10-01 | 1 | -0/+4 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 245b2da1: am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file." | Tao Bao | 2015-10-01 | 1 | -0/+4 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file." | Tao Bao | 2015-10-01 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ | Merge "updater: Skip empty lines in the transfer list file." | Tao Bao | 2015-10-01 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | updater: Skip empty lines in the transfer list file. | Tao Bao | 2015-09-26 | 1 | -0/+4 |
* | | | | | | | | | | | | | | am 6eb2668d: am aa59a989: am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread." | Yabin Cui | 2015-09-30 | 1 | -2/+4 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am aa59a989: am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread." | Yabin Cui | 2015-09-30 | 1 | -2/+4 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread." | Yabin Cui | 2015-09-30 | 1 | -2/+4 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "minadbd: use strdup() to create argument for sideload thread." | Yabin Cui | 2015-09-30 | 1 | -2/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / /
| | | |/| | | | | | | | | | |
|
| | | | * | | | | | | | | | | minadbd: use strdup() to create argument for sideload thread. | Yabin Cui | 2015-09-30 | 1 | -2/+4 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am d7156748: am f61eec3e: am 2bdac629: Merge changes Ic769eafc,I63f28b3b | Tao Bao | 2015-09-25 | 3 | -57/+42 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am f61eec3e: am 2bdac629: Merge changes Ic769eafc,I63f28b3b | Tao Bao | 2015-09-25 | 3 | -57/+42 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | am 2bdac629: Merge changes Ic769eafc,I63f28b3b | Tao Bao | 2015-09-25 | 3 | -57/+42 |
| | |\| | | | | | | | | | |
|
| | | * | | | | | | | | | | Merge changes Ic769eafc,I63f28b3b | Tao Bao | 2015-09-25 | 3 | -57/+42 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | updater: Use android::base::ParseInt() to parse integers. | Tao Bao | 2015-09-24 | 2 | -52/+37 |
| | | | * | | | | | | | | | | Suppress some compiler warnings due to signedness. | Tao Bao | 2015-09-24 | 2 | -5/+5 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am 7c7d876d: am f7319f4d: am 3317d501: Merge "minadbd: move from D() to VLOG()." | Yabin Cui | 2015-09-24 | 2 | -5/+2 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am f7319f4d: am 3317d501: Merge "minadbd: move from D() to VLOG()." | Yabin Cui | 2015-09-24 | 2 | -5/+2 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | am 3317d501: Merge "minadbd: move from D() to VLOG()." | Yabin Cui | 2015-09-24 | 2 | -5/+2 |
| | |\| | | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "minadbd: move from D() to VLOG()." | Yabin Cui | 2015-09-24 | 2 | -5/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | minadbd: move from D() to VLOG(). | Yabin Cui | 2015-09-24 | 2 | -5/+2 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am c66b9ead: am cd3c8c4e: am b739a32b: Merge "recovery: Add timestamps in update logs." | Tao Bao | 2015-09-18 | 1 | -16/+98 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am cd3c8c4e: am b739a32b: Merge "recovery: Add timestamps in update logs." | Tao Bao | 2015-09-18 | 1 | -16/+98 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | am b739a32b: Merge "recovery: Add timestamps in update logs." | Tao Bao | 2015-09-18 | 1 | -16/+98 |
| | |\| | | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "recovery: Add timestamps in update logs." | Tao Bao | 2015-09-18 | 1 | -16/+98 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | recovery: Add timestamps in update logs. | Tao Bao | 2015-09-17 | 1 | -16/+98 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am 53cfad08: (-s ours) am cde72079: am 838768ca: am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am cde72079: am 838768ca: am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | am 838768ca: am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / /
| | | |/| | | | | | | | | |
|
| | | * | | | | | | | | | | am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / /
| | | | |/| | | | | | | | |
|
| | | | * | | | | | | | | | am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \
| | | | | | |_|/ / / / / /
| | | | | |/| | | | | | | |
|
| | | | | * | | | | | | | | am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \
| | | | | | | |_|/ / / / /
| | | | | | |/| | | | | | |
|
| | | | | | * | | | | | | | am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \
| | | | | | | | |_|/ / / /
| | | | | | | |/| | | | | |
|
| | | | | | | * | | | | | | am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-12 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \
| | | | | | | | | |_|/ / /
| | | | | | | | |/| | | | |
|
| | | | | | | | * | | | | | am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-10 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \
| | | | | | | | | | |_|/ /
| | | | | | | | | |/| | | |
|
| | | | | | | | | * | | | | am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-10 | 1 | -0/+1 |
| | | | | | | | | |\ \ \ \
| | | | | | | | | | | |_|/
| | | | | | | | | | |/| | |
|
| | | | | | | | | | * | | | Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-09 | 1 | -0/+1 |
* | | | | | | | | | | | | | am 6e9f726f: am f66e08a2: am a42a322d: Merge "updater: Manage buffers with std::vector." | Tao Bao | 2015-09-16 | 1 | -228/+168 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am f66e08a2: am a42a322d: Merge "updater: Manage buffers with std::vector." | Tao Bao | 2015-09-16 | 1 | -228/+168 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | am a42a322d: Merge "updater: Manage buffers with std::vector." | Tao Bao | 2015-09-16 | 1 | -228/+168 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|/
| | | |/| | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "updater: Manage buffers with std::vector." | Tao Bao | 2015-09-16 | 1 | -228/+168 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | updater: Manage buffers with std::vector. | Tao Bao | 2015-09-10 | 1 | -228/+168 |
* | | | | | | | | | | | | | | am cd3a68ce: am 49a49e4f: am ee17242f: Merge "minadbd: update service_to_fd() signature." | David Pursell | 2015-09-14 | 1 | -1/+1 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am 49a49e4f: am ee17242f: Merge "minadbd: update service_to_fd() signature." | David Pursell | 2015-09-14 | 1 | -1/+1 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am ee17242f: Merge "minadbd: update service_to_fd() signature." | David Pursell | 2015-09-14 | 1 | -1/+1 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "minadbd: update service_to_fd() signature." | David Pursell | 2015-09-14 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | minadbd: update service_to_fd() signature. | David Pursell | 2015-09-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | am 8b2dcfb1: am 60524198: am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()." | Tao Bao | 2015-09-12 | 2 | -4/+1 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | am 60524198: am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()." | Tao Bao | 2015-09-12 | 2 | -4/+1 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()." | Tao Bao | 2015-09-12 | 2 | -4/+1 |
| | |\| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "recovery: Remove redirect_stdio() when calling ShowFile()." | Tao Bao | 2015-09-12 | 2 | -4/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | recovery: Remove redirect_stdio() when calling ShowFile(). | Tao Bao | 2015-09-10 | 2 | -4/+1 |
| | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | am 7c3d09c2: am 0cf19d9b: am 7a677807: Merge "updater: Fix the line breaks in ui_print commands." | Tao Bao | 2015-09-10 | 1 | -26/+32 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | am 0cf19d9b: am 7a677807: Merge "updater: Fix the line breaks in ui_print commands." | Tao Bao | 2015-09-10 | 1 | -26/+32 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | am 7a677807: Merge "updater: Fix the line breaks in ui_print commands." | Tao Bao | 2015-09-10 | 1 | -26/+32 |
| | |\| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "updater: Fix the line breaks in ui_print commands." | Tao Bao | 2015-09-10 | 1 | -26/+32 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / /
| | | |/| | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | updater: Fix the line breaks in ui_print commands. | Tao Bao | 2015-09-10 | 1 | -26/+32 |
| | | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | | am 272d268c: am 50828f58: am e520f1d4: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter." | Tao Bao | 2015-09-09 | 1 | -29/+26 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am 50828f58: am e520f1d4: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter." | Tao Bao | 2015-09-09 | 1 | -29/+26 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am e520f1d4: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter." | Tao Bao | 2015-09-09 | 1 | -29/+26 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter." | Tao Bao | 2015-09-09 | 1 | -29/+26 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter. | Tao Bao | 2015-09-08 | 1 | -29/+26 |
| | | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | | am d4547c1d: am e5571a0f: am 585a50ce: Merge "imgdiff: fix file descriptor leak" | Tao Bao | 2015-09-08 | 1 | -1/+9 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am e5571a0f: am 585a50ce: Merge "imgdiff: fix file descriptor leak" | Tao Bao | 2015-09-08 | 1 | -1/+9 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am 585a50ce: Merge "imgdiff: fix file descriptor leak" | Tao Bao | 2015-09-08 | 1 | -1/+9 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "imgdiff: fix file descriptor leak" | Tao Bao | 2015-09-08 | 1 | -1/+9 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | imgdiff: fix file descriptor leak | Jeremy Compostella | 2015-09-08 | 1 | -1/+9 |
| | | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | | am 1e8e6a83: am cf11a160: am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc" | Tom Cherry | 2015-09-04 | 2 | -0/+11 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am cf11a160: am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc" | Tom Cherry | 2015-09-04 | 2 | -0/+11 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc" | Tom Cherry | 2015-09-04 | 2 | -0/+11 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "move uncrypt from init.rc to uncrypt.rc" | Tom Cherry | 2015-09-04 | 2 | -0/+11 |
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / /
| | | |/| | | | | | | | | | |
|
| | | | * | | | | | | | | | | move uncrypt from init.rc to uncrypt.rc | Tom Cherry | 2015-09-04 | 2 | -0/+11 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am 834c92b7: am 8e9c6801: recovery: Fix the bug that truncates menu entries. | Tao Bao | 2015-09-03 | 1 | -1/+6 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 8e9c6801: recovery: Fix the bug that truncates menu entries. | Tao Bao | 2015-09-03 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | recovery: Fix the bug that truncates menu entries. | Tao Bao | 2015-09-02 | 1 | -1/+6 |
* | | | | | | | | | | | | | am ceb81e49: am 1b3195cb: am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message." | David Zeuthen | 2015-09-03 | 1 | -1/+9 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 1b3195cb: am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message." | David Zeuthen | 2015-09-03 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message." | David Zeuthen | 2015-09-03 | 1 | -1/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / /
| | | |/| | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "Add slot_suffix field to struct bootloader_message." | David Zeuthen | 2015-09-03 | 1 | -1/+9 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | Add slot_suffix field to struct bootloader_message. | David Zeuthen | 2015-09-02 | 1 | -1/+9 |
* | | | | | | | | | | | | | | am 31dde162: am 6f1f2062: am 6997c287: Merge "updater: Clean up C codes." | Tao Bao | 2015-09-03 | 1 | -602/+429 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am 6f1f2062: am 6997c287: Merge "updater: Clean up C codes." | Tao Bao | 2015-09-03 | 1 | -602/+429 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am 6997c287: Merge "updater: Clean up C codes." | Tao Bao | 2015-09-03 | 1 | -602/+429 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "updater: Clean up C codes." | Tao Bao | 2015-09-02 | 1 | -602/+429 |
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / /
| | | |/| | | | | | | | | | |
|
| | | | * | | | | | | | | | | updater: Clean up C codes. | Tao Bao | 2015-09-01 | 1 | -602/+429 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am d845a2d1: am 73468ee8: (-s ours) am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 73468ee8: (-s ours) am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()." | Tao Bao | 2015-08-26 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | am 5e3a40f9: am 304c65b8: (-s ours) am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am 304c65b8: (-s ours) am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" | Tao Bao | 2015-08-26 | 1 | -46/+48 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | am 1a42ebc1: am 822685a8: (-s ours) am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | am 822685a8: (-s ours) am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++." | Tao Bao | 2015-08-21 | 5 | -37/+27 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | am b13fe892: am a9a50fef: (-s ours) am 4854e292: am ad509fd4: Merge "Fix potential crash" | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | am a9a50fef: (-s ours) am 4854e292: am ad509fd4: Merge "Fix potential crash" | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | am 4854e292: am ad509fd4: Merge "Fix potential crash" | Tao Bao | 2015-08-11 | 1 | -5/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | am dffdd5eb: am 06e6ccb9: (-s ours) am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | am 06e6ccb9: (-s ours) am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs." | Tao Bao | 2015-08-10 | 3 | -16/+91 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | am 85afda17: am b65a9023: (-s ours) am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | am b65a9023: (-s ours) am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string." | Tao Bao | 2015-08-10 | 5 | -288/+185 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | am 85a77d2a: am c2e91625: (-s ours) am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." | Dan Albert | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | am c2e91625: (-s ours) am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." | Dan Albert | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." | Dan Albert | 2015-08-08 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | am 34fa6d38: am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build." | Elliott Hughes | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build." | Elliott Hughes | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | am a9390df6: am 06689dc5: Merge "Fix recovery image build." | Elliott Hughes | 2015-08-07 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | am 371ab905: am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp | Tao Bao | 2015-08-04 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | | |/| | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | am ea5d8f0a: am 0e2efab3: (-s ours) am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | am 0e2efab3: (-s ours) am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." | Tao Bao | 2015-08-04 | 1 | -0/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | am 3fd097f8: am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." | Tao Bao | 2015-07-31 | 3 | -19/+39 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | am 77de4783: am f3f27990: (-s ours) am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | am f3f27990: (-s ours) am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." | Tao Bao | 2015-07-28 | 1 | -6/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | am 05c4b53e: am cb0e7f2d: (-s ours) am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | am cb0e7f2d: (-s ours) am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." | Tao Bao | 2015-07-25 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | am f6bebbd7: am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." | Tao Bao | 2015-07-24 | 3 | -16/+97 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | am d37f91d1: am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." | Tao Bao | 2015-07-24 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am c73e18f0: am 7665d443: (-s ours) am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 7665d443: (-s ours) am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." | Tao Bao | 2015-07-24 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f075f9a1: am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()." | Tao Bao | 2015-07-24 | 2 | -86/+56 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ca66fc1c: am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++." | Tao Bao | 2015-07-24 | 5 | -29/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d33e21a7: am 0e7368a5: (-s ours) am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0e7368a5: (-s ours) am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions." | Tao Bao | 2015-07-17 | 3 | -20/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 9da33c67: am 3231c7ca: (-s ours) am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3231c7ca: (-s ours) am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp." | Tao Bao | 2015-07-15 | 15 | -300/+304 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f0e341b4: am 5391dfdb: (-s ours) am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD"" | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5391dfdb: (-s ours) am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD"" | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD"" | Tao Bao | 2015-07-11 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3ac4765a: am 1915dd56: (-s ours) am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev | Paul Lawrence | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1915dd56: (-s ours) am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev | Paul Lawrence | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev | Paul Lawrence | 2015-07-07 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b3f4921c: am 2fc4d435: (-s ours) am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions" | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2fc4d435: (-s ours) am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions" | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions" | Tao Bao | 2015-07-07 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 04d9b850: am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev | Paul Lawrence | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev | Paul Lawrence | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev | Paul Lawrence | 2015-07-06 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 165c6ad3: am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()." | Tao Bao | 2015-08-26 | 1 | -3/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()." | Tao Bao | 2015-08-26 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()." | Tao Bao | 2015-08-26 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | / / / / / / / / /
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove the unused isunresumable in SaveStash()." | Tao Bao | 2015-08-26 | 1 | -3/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Remove the unused isunresumable in SaveStash(). | Tao Bao | 2015-08-26 | 1 | -3/+3 |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1a3ccc88: am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" | Tao Bao | 2015-08-26 | 1 | -46/+48 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" | Tao Bao | 2015-08-26 | 1 | -46/+48 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" | Tao Bao | 2015-08-26 | 1 | -46/+48 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" | Tao Bao | 2015-08-26 | 1 | -46/+48 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GOOGLEGMS-749 Fix integer overflow while applying block based OTA package | Shrinivas Sahukar | 2015-08-22 | 1 | -46/+48 |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ba781587: am 337db14f: recovery: Factor out wear_ui.{cpp,h} into bootable/recovery. | Tao Bao | 2015-08-25 | 3 | -0/+788 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 337db14f: recovery: Factor out wear_ui.{cpp,h} into bootable/recovery. | Tao Bao | 2015-08-25 | 3 | -0/+788 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Factor out wear_ui.{cpp,h} into bootable/recovery. | Tao Bao | 2015-08-25 | 3 | -0/+788 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f0355aeb: am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++." | Tao Bao | 2015-08-21 | 5 | -37/+27 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++." | Tao Bao | 2015-08-21 | 5 | -37/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 93fa4b67: Merge "edify: Switch to C++." | Tao Bao | 2015-08-21 | 5 | -37/+27 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | / / / / / / /
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Switch to C++." | Tao Bao | 2015-08-21 | 5 | -37/+27 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edify: Switch to C++. | Tao Bao | 2015-08-20 | 5 | -37/+27 |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e57ca0ec: am 4854e292: am ad509fd4: Merge "Fix potential crash" | Tao Bao | 2015-08-11 | 1 | -5/+9 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4854e292: am ad509fd4: Merge "Fix potential crash" | Tao Bao | 2015-08-11 | 1 | -5/+9 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ad509fd4: Merge "Fix potential crash" | Tao Bao | 2015-08-11 | 1 | -5/+9 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix potential crash" | Tao Bao | 2015-08-11 | 1 | -5/+9 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix potential crash | Jeremy Compostella | 2015-08-05 | 1 | -5/+9 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0d42440e: am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs." | Tao Bao | 2015-08-10 | 3 | -16/+91 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs." | Tao Bao | 2015-08-10 | 3 | -16/+91 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs." | Tao Bao | 2015-08-10 | 3 | -16/+91 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use unique_ptr and unique_fd to manager FDs." | Tao Bao | 2015-08-10 | 3 | -16/+91 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use unique_ptr and unique_fd to manager FDs. | Tao Bao | 2015-08-10 | 3 | -16/+91 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 36ca3800: am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string." | Tao Bao | 2015-08-10 | 5 | -288/+185 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string." | Tao Bao | 2015-08-10 | 5 | -288/+185 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7c511184: Merge "updater: Clean up char* with std::string." | Tao Bao | 2015-08-10 | 5 | -288/+185 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up char* with std::string." | Tao Bao | 2015-08-10 | 5 | -288/+185 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Clean up char* with std::string. | Tao Bao | 2015-08-06 | 5 | -288/+185 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f2a23a94: am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." | Dan Albert | 2015-08-08 | 1 | -4/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." | Dan Albert | 2015-08-08 | 1 | -4/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." | Dan Albert | 2015-08-08 | 1 | -4/+4 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use CPPFLAGS instead of CFLAGS." | Dan Albert | 2015-08-08 | 1 | -4/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Use CPPFLAGS instead of CFLAGS. | Dan Albert | 2015-08-08 | 1 | -4/+4 |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2496489c: am a9390df6: am 06689dc5: Merge "Fix recovery image build." | Elliott Hughes | 2015-08-08 | 2 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a9390df6: am 06689dc5: Merge "Fix recovery image build." | Elliott Hughes | 2015-08-07 | 2 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 06689dc5: Merge "Fix recovery image build." | Elliott Hughes | 2015-08-07 | 2 | -2/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix recovery image build." | Elliott Hughes | 2015-08-07 | 2 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Fix recovery image build. | Elliott Hughes | 2015-08-07 | 2 | -2/+2 |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 68e77434: resolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aosp | Tao Bao | 2015-08-04 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aosp | Tao Bao | 2015-08-04 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am be19dce8: udpater: Call fsync() after rename(). | Tao Bao | 2015-08-04 | 1 | -0/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | udpater: Call fsync() after rename(). | Tao Bao | 2015-08-04 | 1 | -0/+20 |
| | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am ddbfdf79: am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." | Tao Bao | 2015-08-04 | 1 | -0/+20 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." | Tao Bao | 2015-08-04 | 1 | -0/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 27c1ab20: Merge "udpater: Call fsync() after rename()." | Tao Bao | 2015-08-04 | 1 | -0/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | / / / / / / /
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge "udpater: Call fsync() after rename()." | Tao Bao | 2015-08-04 | 1 | -0/+20 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | udpater: Call fsync() after rename(). | Tao Bao | 2015-08-04 | 1 | -0/+20 |
| | | |/ / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | am 414c576c: am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." | Tao Bao | 2015-08-01 | 3 | -19/+39 |
|\| | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." | Tao Bao | 2015-08-01 | 3 | -19/+39 |
| |\| | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." | Tao Bao | 2015-07-31 | 3 | -19/+39 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Allow "Mount /system" for system_root_image." | Tao Bao | 2015-07-31 | 3 | -19/+39 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | recovery: Allow "Mount /system" for system_root_image. | Tao Bao | 2015-07-31 | 3 | -19/+39 |
| | | |/ / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | am 7d71725d: am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." | Tao Bao | 2015-07-28 | 1 | -6/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." | Tao Bao | 2015-07-28 | 1 | -6/+5 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | am 62e19231: Merge "updater: Hoist fsync() to outer loop." | Tao Bao | 2015-07-28 | 1 | -6/+5 |
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Hoist fsync() to outer loop." | Tao Bao | 2015-07-28 | 1 | -6/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | updater: Hoist fsync() to outer loop. | Tao Bao | 2015-07-27 | 1 | -6/+5 |
| | | |/ / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | am 4b3ad009: am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." | Tao Bao | 2015-07-25 | 1 | -3/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." | Tao Bao | 2015-07-25 | 1 | -3/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." | Tao Bao | 2015-07-25 | 1 | -3/+4 |
| | |\| | | | | | | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the checking in WriteToPartition()." | Tao Bao | 2015-07-25 | 1 | -3/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | applypatch: Fix the checking in WriteToPartition(). | Tao Bao | 2015-07-25 | 1 | -3/+4 |
| | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | am 6a06034d: am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." | Tao Bao | 2015-07-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." | Tao Bao | 2015-07-24 | 3 | -16/+97 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | am dd738c11: Merge "applypatch: Support flash mode." | Tao Bao | 2015-07-24 | 3 | -16/+97 |
| | |\| | | | | | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Support flash mode." | Tao Bao | 2015-07-24 | 3 | -16/+97 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | applypatch: Support flash mode. | Tao Bao | 2015-07-24 | 3 | -16/+97 |
* | | | | | | | | | | | | | | | | | | | | | | am e657f0fb: am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." | Tao Bao | 2015-07-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." | Tao Bao | 2015-07-24 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | am afb8f320: Merge "uncrypt: Support file level encryption." | Tao Bao | 2015-07-24 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "uncrypt: Support file level encryption." | Tao Bao | 2015-07-24 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | uncrypt: Support file level encryption. | Tao Bao | 2015-07-24 | 1 | -1/+1 |
| | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | am 3f640620: am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." | Tao Bao | 2015-07-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." | Tao Bao | 2015-07-24 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | am cc3c3414: Merge "updater: libapplypatch needs libbase now." | Tao Bao | 2015-07-24 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "updater: libapplypatch needs libbase now." | Tao Bao | 2015-07-24 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | updater: libapplypatch needs libbase now. | Tao Bao | 2015-07-24 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 49a24460 to master | Tao Bao | 2015-07-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()." | Tao Bao | 2015-07-24 | 2 | -86/+56 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | am cfd9d9c7: Merge "applypatch: Refactor strtok()." | Tao Bao | 2015-07-24 | 2 | -86/+56 |
| | |\| | | | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "applypatch: Refactor strtok()." | Tao Bao | 2015-07-24 | 2 | -86/+56 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | applypatch: Refactor strtok(). | Tao Bao | 2015-07-24 | 2 | -86/+56 |
| | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | am 052796ea: am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++." | Tao Bao | 2015-07-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++." | Tao Bao | 2015-07-24 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | am 85090d0c: Merge "recovery: Switch fuse_* to C++." | Tao Bao | 2015-07-20 | 5 | -29/+14 |
| | |\| | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "recovery: Switch fuse_* to C++." | Tao Bao | 2015-07-20 | 5 | -29/+14 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | recovery: Switch fuse_* to C++. | Tao Bao | 2015-07-20 | 5 | -29/+14 |
| | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | am 0d4e0026: recovery: Switch fuse_* to C++. | Tao Bao | 2015-07-24 | 5 | -29/+14 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | recovery: Switch fuse_* to C++. | Tao Bao | 2015-07-24 | 5 | -29/+14 |
* | | | | | | | | | | | | | | | | | applypatch: Support flash mode. | Tao Bao | 2015-07-22 | 3 | -16/+97 |
* | | | | | | | | | | | | | | | | | Merge "updater: libapplypatch needs libbase now." | Tao Bao | 2015-07-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | updater: libapplypatch needs libbase now. | Tao Bao | 2015-07-17 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | applypatch: Refactor strtok(). | Tao Bao | 2015-07-17 | 2 | -86/+56 |
|/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | am f2c4e4ce: am 6e9dda70: uncrypt: Support file level encryption. | Tao Bao | 2015-07-17 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | am 6e9dda70: uncrypt: Support file level encryption. | Tao Bao | 2015-07-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | uncrypt: Support file level encryption. | Tao Bao | 2015-07-17 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | am ac780c90: am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions." | Tao Bao | 2015-07-17 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions." | Tao Bao | 2015-07-17 | 3 | -20/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | am 025c0e79: Merge "Clean up LOG functions." | Tao Bao | 2015-07-17 | 3 | -20/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | / / / / / / /
| | | |_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "Clean up LOG functions." | Tao Bao | 2015-07-17 | 3 | -20/+20 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | Clean up LOG functions. | Tao Bao | 2015-07-17 | 3 | -20/+20 |
| | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Clean up LOG functions. | Tao Bao | 2015-07-16 | 3 | -20/+20 |
* | | | | | | | | | | | | | | | | am 48248273: am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp." | Tao Bao | 2015-07-14 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp." | Tao Bao | 2015-07-14 | 15 | -300/+304 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp." | Tao Bao | 2015-07-14 | 15 | -300/+304 |
| | |\| | | | | | | | | | | | |
| | | |_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "recovery: Switch applypatch/ and updater/ to cpp." | Tao Bao | 2015-07-14 | 15 | -300/+304 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | recovery: Switch applypatch/ and updater/ to cpp. | Tao Bao | 2015-07-14 | 15 | -300/+304 |
| | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | recovery: Switch applypatch/ and updater/ to cpp. | Tao Bao | 2015-07-14 | 15 | -300/+304 |
* | | | | | | | | | | | | | | | am a91335ae: am 90c75b0b: Change init sequence to support file level encryption | Paul Lawrence | 2015-07-14 | 1 | -3/+3 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | am 90c75b0b: Change init sequence to support file level encryption | Paul Lawrence | 2015-07-13 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Change init sequence to support file level encryption | Paul Lawrence | 2015-07-07 | 1 | -3/+3 |
| | | |_|/ / / / / / / / / /
| | |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | | am 79e95b2d: am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD"" | Tao Bao | 2015-07-11 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD"" | Tao Bao | 2015-07-11 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD"" | Tao Bao | 2015-07-11 | 1 | -17/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / /
| | | |/| | | / / / / / / /
| | | |_|_|_|/ / / / / / /
| | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "Revert "Zero blocks before BLKDISCARD"" | Tao Bao | 2015-07-11 | 1 | -17/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | Revert "Zero blocks before BLKDISCARD" | Tao Bao | 2015-07-11 | 1 | -17/+1 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am b6b31549: am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev | Paul Lawrence | 2015-07-07 | 1 | -3/+3 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev | Paul Lawrence | 2015-07-07 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev | Paul Lawrence | 2015-07-07 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / /
| | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | Revert "Change init sequence to support file level encryption" | Paul Lawrence | 2015-07-07 | 1 | -3/+3 |
* | | | | | | | | | | | | | am e93fa6b7: am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions" | Tao Bao | 2015-07-07 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions" | Tao Bao | 2015-07-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | am 2490dbc9: Merge "Allow mounting squashfs partitions" | Tao Bao | 2015-07-07 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / /
| | | |/| | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "Allow mounting squashfs partitions" | Tao Bao | 2015-07-07 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | Allow mounting squashfs partitions | Mohamad Ayyash | 2015-07-07 | 1 | -0/+1 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am 3cc51480: am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev | Paul Lawrence | 2015-07-07 | 1 | -3/+3 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev | Paul Lawrence | 2015-07-06 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / /
| | |/| | | / / / / / / /
| | |_|_|_|/ / / / / / /
| |/| | | | | | | | | | |
|
| | * | | | | | | | | | | Merge "Change init sequence to support file level encryption" into mnc-dev | Paul Lawrence | 2015-07-06 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / /
| | | |/| | | | | | | | |
|
| | | * | | | | | | | | | Change init sequence to support file level encryption | Paul Lawrence | 2015-07-06 | 1 | -3/+3 |
* | | | | | | | | | | | | am 08b63396: am 501282a4: am b4b41daa: am 0ddfa329: Allow mounting squashfs partitions | Mohamad Ayyash | 2015-07-03 | 1 | -0/+1 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 501282a4: am b4b41daa: am 0ddfa329: Allow mounting squashfs partitions | Mohamad Ayyash | 2015-07-02 | 1 | -0/+1 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | am b4b41daa: am 0ddfa329: Allow mounting squashfs partitions | Mohamad Ayyash | 2015-07-02 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / /
| | | |/| | | | | | | | |
|
| | | * | | | | | | | | | am 0ddfa329: Allow mounting squashfs partitions | Mohamad Ayyash | 2015-07-02 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | Allow mounting squashfs partitions | Mohamad Ayyash | 2015-07-01 | 1 | -0/+1 |
| | | | | |_|_|/ / / / /
| | | | |/| | | | | | | |
|
* | | | | | | | | | | | | am 6284431d: am 8409b088: Merge "Add drm support to minui" into mnc-dev | Vincent Palatin | 2015-07-03 | 4 | -0/+484 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 8409b088: Merge "Add drm support to minui" into mnc-dev | Vincent Palatin | 2015-07-02 | 4 | -0/+484 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | Merge "Add drm support to minui" into mnc-dev | Vincent Palatin | 2015-07-02 | 4 | -0/+484 |
| | |\ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / /
| | |/| | | | | | | | | |
|
| | | * | | | | | | | | | Add drm support to minui | Stéphane Marchesin | 2015-07-02 | 4 | -0/+484 |
* | | | | | | | | | | | | am c4b6f87f: am 7125f959: Revert "Zero blocks before BLKDISCARD" | Tao Bao | 2015-07-03 | 1 | -17/+1 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 7125f959: Revert "Zero blocks before BLKDISCARD" | Tao Bao | 2015-07-01 | 1 | -17/+1 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | Revert "Zero blocks before BLKDISCARD" | Tao Bao | 2015-07-01 | 1 | -17/+1 |
| | |/ / / / / / / / / |
|
* | | | | | | | | | | | am 2b3c599c: am c3dddce2: More accurate checking for overlapped ranges. | Tao Bao | 2015-06-27 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am c3dddce2: More accurate checking for overlapped ranges. | Tao Bao | 2015-06-26 | 0 | -0/+0 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | More accurate checking for overlapped ranges. | Tao Bao | 2015-06-26 | 1 | -1/+1 |
* | | | | | | | | | | | am b102404d: am cb9450e1: Use f_bavail to calculate free space | caozhiyuan | 2015-06-26 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am cb9450e1: Use f_bavail to calculate free space | caozhiyuan | 2015-06-26 | 0 | -0/+0 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Use f_bavail to calculate free space | caozhiyuan | 2015-06-26 | 1 | -1/+1 |
* | | | | | | | | | | | am f90651e4: am 89d3634f: am b36d9c3f: Merge "More accurate checking for overlapped ranges." | Tao Bao | 2015-06-26 | 1 | -1/+1 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 89d3634f: am b36d9c3f: Merge "More accurate checking for overlapped ranges." | Tao Bao | 2015-06-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | am b36d9c3f: Merge "More accurate checking for overlapped ranges." | Tao Bao | 2015-06-26 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / /
| | | |/| | | | | | | |
|
| | | * | | | | | | | | Merge "More accurate checking for overlapped ranges." | Tao Bao | 2015-06-26 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | More accurate checking for overlapped ranges. | Tao Bao | 2015-06-26 | 1 | -1/+1 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am 8f7a2afe: am 1572820c: am ec18d495: Merge "recovery: Use xxhdpi resources for 560dpi devices" | Tao Bao | 2015-06-24 | 1 | -0/+1 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 1572820c: am ec18d495: Merge "recovery: Use xxhdpi resources for 560dpi devices" | Tao Bao | 2015-06-24 | 1 | -0/+1 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | am ec18d495: Merge "recovery: Use xxhdpi resources for 560dpi devices" | Tao Bao | 2015-06-24 | 1 | -0/+1 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "recovery: Use xxhdpi resources for 560dpi devices" | Tao Bao | 2015-06-24 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | recovery: Use xxhdpi resources for 560dpi devices | Tao Bao | 2015-06-24 | 1 | -0/+1 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am 2c7fa669: am 4b619469: am 719e4e5d: Merge "Just use fstat in sysMapFile." | Elliott Hughes | 2015-06-24 | 3 | -71/+24 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 4b619469: am 719e4e5d: Merge "Just use fstat in sysMapFile." | Elliott Hughes | 2015-06-24 | 3 | -71/+24 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | am 719e4e5d: Merge "Just use fstat in sysMapFile." | Elliott Hughes | 2015-06-24 | 3 | -71/+24 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "Just use fstat in sysMapFile." | Elliott Hughes | 2015-06-24 | 3 | -71/+24 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Just use fstat in sysMapFile. | Elliott Hughes | 2015-06-23 | 3 | -71/+24 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am 997534d0: am c35f3ce3: Allow sideloading without authentication. | Elliott Hughes | 2015-06-24 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am c35f3ce3: Allow sideloading without authentication. | Elliott Hughes | 2015-06-23 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | Allow sideloading without authentication. | Elliott Hughes | 2015-06-23 | 1 | -1/+5 |
* | | | | | | | | | | | am 687bf071: am 6dd443fd: am ea13fe23: Merge "Allow sideloading without authentication." | Elliott Hughes | 2015-06-23 | 1 | -1/+5 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 6dd443fd: am ea13fe23: Merge "Allow sideloading without authentication." | Elliott Hughes | 2015-06-23 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | am ea13fe23: Merge "Allow sideloading without authentication." | Elliott Hughes | 2015-06-23 | 1 | -1/+5 |
| | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | |/| | | | | | | |
|
| | | * | | | | | | | | Merge "Allow sideloading without authentication." | Elliott Hughes | 2015-06-23 | 1 | -1/+5 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Allow sideloading without authentication. | Elliott Hughes | 2015-06-23 | 1 | -1/+5 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am deb4ebb2: am d2a59288: am 22ccc87a: Merge "Unmount sdcard if no package file is selected." | Elliott Hughes | 2015-06-11 | 1 | -0/+1 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am d2a59288: am 22ccc87a: Merge "Unmount sdcard if no package file is selected." | Elliott Hughes | 2015-06-11 | 1 | -0/+1 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | am 22ccc87a: Merge "Unmount sdcard if no package file is selected." | Elliott Hughes | 2015-06-11 | 1 | -0/+1 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "Unmount sdcard if no package file is selected." | Elliott Hughes | 2015-06-11 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Unmount sdcard if no package file is selected. | caozhiyuan | 2015-06-10 | 1 | -0/+1 |
* | | | | | | | | | | | | am 7ccec497: am d7c9bf41: Merge "Zero blocks before BLKDISCARD" into mnc-dev | Sami Tolvanen | 2015-06-11 | 0 | -0/+0 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am d7c9bf41: Merge "Zero blocks before BLKDISCARD" into mnc-dev | Sami Tolvanen | 2015-06-11 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / /
| | |/| | | | | | | | | |
|
| | * | | | | | | | | | | Merge "Zero blocks before BLKDISCARD" into mnc-dev | Sami Tolvanen | 2015-06-10 | 1 | -1/+17 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | Zero blocks before BLKDISCARD | Sami Tolvanen | 2015-06-10 | 1 | -1/+17 |
* | | | | | | | | | | | | | am 1e8bc40b: am 0005f89c: Split WipeData into PreWipeData and PostWipeData. | Elliott Hughes | 2015-06-11 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 0005f89c: Split WipeData into PreWipeData and PostWipeData. | Elliott Hughes | 2015-06-11 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Split WipeData into PreWipeData and PostWipeData. | Elliott Hughes | 2015-06-10 | 2 | -24/+22 |
| | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | am 12c8ea68: am e21ff08e: am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData." | Elliott Hughes | 2015-06-11 | 2 | -24/+22 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am e21ff08e: am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData." | Elliott Hughes | 2015-06-11 | 2 | -24/+22 |
| |\ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / /
| | |/| | | | | | | | | |
|
| | * | | | | | | | | | | am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData." | Elliott Hughes | 2015-06-10 | 2 | -24/+22 |
| | |\ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / /
| | | |/| | | | | | | | |
|
| | | * | | | | | | | | | Merge "Split WipeData into PreWipeData and PostWipeData." | Elliott Hughes | 2015-06-10 | 2 | -24/+22 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | Split WipeData into PreWipeData and PostWipeData. | Elliott Hughes | 2015-06-10 | 2 | -24/+22 |
* | | | | | | | | | | | | | am a66cdf40: am 915fc970: am 280cb6e9: Merge "Zero blocks before BLKDISCARD" | Sami Tolvanen | 2015-06-10 | 1 | -1/+17 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 915fc970: am 280cb6e9: Merge "Zero blocks before BLKDISCARD" | Sami Tolvanen | 2015-06-10 | 1 | -1/+17 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | am 280cb6e9: Merge "Zero blocks before BLKDISCARD" | Sami Tolvanen | 2015-06-10 | 1 | -1/+17 |
| | |\| | | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "Zero blocks before BLKDISCARD" | Sami Tolvanen | 2015-06-10 | 1 | -1/+17 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | Zero blocks before BLKDISCARD | Sami Tolvanen | 2015-06-10 | 1 | -1/+17 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am 11cad65d: am 059e391f: am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD"" | Sami Tolvanen | 2015-06-10 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 059e391f: am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD"" | Sami Tolvanen | 2015-06-10 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD"" | Sami Tolvanen | 2015-06-10 | 1 | -5/+9 |
| | |\| | | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "Revert "Zero blocks before BLKDISCARD"" | Sami Tolvanen | 2015-06-10 | 1 | -5/+9 |
| | | |\ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / /
| | | |/| | | | | | | | | |
|
| | | | * | | | | | | | | | Revert "Zero blocks before BLKDISCARD" | Sami Tolvanen | 2015-06-10 | 1 | -5/+9 |
* | | | | | | | | | | | | | am 758f56ef: am 6abd52f6: Revert "Zero blocks before BLKDISCARD" | Sami Tolvanen | 2015-06-10 | 1 | -5/+9 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 6abd52f6: Revert "Zero blocks before BLKDISCARD" | Sami Tolvanen | 2015-06-10 | 1 | -5/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | Revert "Zero blocks before BLKDISCARD" | Sami Tolvanen | 2015-06-10 | 1 | -5/+9 |
* | | | | | | | | | | | | | am 8ee89e7b: am b89452ef: am 1a03b400: Merge "uncrypt: Write status when it reboots to factory reset" | Tao Bao | 2015-06-10 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am b89452ef: am 1a03b400: Merge "uncrypt: Write status when it reboots to factory reset" | Tao Bao | 2015-06-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | am 1a03b400: Merge "uncrypt: Write status when it reboots to factory reset" | Tao Bao | 2015-06-10 | 1 | -7/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / /
| | | |/| | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "uncrypt: Write status when it reboots to factory reset" | Tao Bao | 2015-06-10 | 1 | -7/+10 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | uncrypt: Write status when it reboots to factory reset | Tao Bao | 2015-06-10 | 1 | -7/+10 |
* | | | | | | | | | | | | | | am 5a1aa4c7: am 2880e0fc: (-s ours) am 2cf180f6: Merge "Separate uncrypt into two modes" | Tao Bao | 2015-06-10 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am 2880e0fc: (-s ours) am 2cf180f6: Merge "Separate uncrypt into two modes" | Tao Bao | 2015-06-10 | 0 | -0/+0 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am 2cf180f6: Merge "Separate uncrypt into two modes" | Tao Bao | 2015-06-10 | 2 | -95/+92 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "Separate uncrypt into two modes" | Tao Bao | 2015-06-10 | 2 | -95/+92 |
| | | |\| | | | | | | | | | |
|
| | | | * | | | | | | | | | | Separate uncrypt into two modes | Tao Bao | 2015-06-10 | 2 | -95/+92 |
| | | | | |_|/ / / / / / /
| | | | |/| | | | | | | | |
|
* | | | | | | | | | | | | | am 9df159da: am 604c583c: Zero blocks before BLKDISCARD | Sami Tolvanen | 2015-06-10 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 604c583c: Zero blocks before BLKDISCARD | Sami Tolvanen | 2015-06-09 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | Zero blocks before BLKDISCARD | Sami Tolvanen | 2015-06-09 | 1 | -9/+5 |
* | | | | | | | | | | | | | am 1692fc8b: am 2fd12979: am 69608fe7: Merge "Zero blocks before BLKDISCARD" | Sami Tolvanen | 2015-06-09 | 1 | -9/+5 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 2fd12979: am 69608fe7: Merge "Zero blocks before BLKDISCARD" | Sami Tolvanen | 2015-06-09 | 1 | -9/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | am 69608fe7: Merge "Zero blocks before BLKDISCARD" | Sami Tolvanen | 2015-06-09 | 1 | -9/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / /
| | | |/| | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "Zero blocks before BLKDISCARD" | Sami Tolvanen | 2015-06-09 | 1 | -9/+5 |
| | | |\ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / /
| | | |/| | / / / / / / /
| | | | | |/ / / / / / /
| | | | |/| | | | | | | |
|
| | | | * | | | | | | | | Zero blocks before BLKDISCARD | Sami Tolvanen | 2015-06-09 | 1 | -9/+5 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am db553d5d: am 7baa13f6: am 3f9db6af: Merge "recovery: Switch to clang" | Tao Bao | 2015-06-04 | 13 | -11/+38 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 7baa13f6: am 3f9db6af: Merge "recovery: Switch to clang" | Tao Bao | 2015-06-04 | 13 | -11/+38 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | am 3f9db6af: Merge "recovery: Switch to clang" | Tao Bao | 2015-06-04 | 13 | -11/+38 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "recovery: Switch to clang" | Tao Bao | 2015-06-04 | 13 | -11/+38 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | recovery: Switch to clang | Tao Bao | 2015-06-03 | 13 | -11/+38 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am 3ed20cff: am 028d216c: am 227069d7: Merge "Fix build: fprintf without modifier" | Tao Bao | 2015-06-03 | 1 | -2/+1 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 028d216c: am 227069d7: Merge "Fix build: fprintf without modifier" | Tao Bao | 2015-06-03 | 1 | -2/+1 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | am 227069d7: Merge "Fix build: fprintf without modifier" | Tao Bao | 2015-06-03 | 1 | -2/+1 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "Fix build: fprintf without modifier" | Tao Bao | 2015-06-03 | 1 | -2/+1 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Fix build: fprintf without modifier | Tao Bao | 2015-06-03 | 1 | -2/+1 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am 5393149d: am d107e6dc: am a69e608a: Merge "Log update outputs in order" | Tao Bao | 2015-06-03 | 6 | -13/+44 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am d107e6dc: am a69e608a: Merge "Log update outputs in order" | Tao Bao | 2015-06-03 | 6 | -13/+44 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | am a69e608a: Merge "Log update outputs in order" | Tao Bao | 2015-06-03 | 6 | -13/+44 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "Log update outputs in order" | Tao Bao | 2015-06-03 | 6 | -13/+44 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Log update outputs in order | Tao Bao | 2015-06-03 | 6 | -13/+44 |
* | | | | | | | | | | | | am 2c51ec95: am 02b64725: Merge "uncrypt: Write status when it reboots to factory reset" into mnc-dev | Tao Bao | 2015-06-01 | 1 | -7/+10 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 02b64725: Merge "uncrypt: Write status when it reboots to factory reset" into mnc-dev | Tao Bao | 2015-06-01 | 1 | -7/+10 |
| |\ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / /
| | |/| | | | | | | | | |
|
| | * | | | | | | | | | | Merge "uncrypt: Write status when it reboots to factory reset" into mnc-dev | Tao Bao | 2015-05-30 | 1 | -7/+10 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | uncrypt: Write status when it reboots to factory reset | Tao Bao | 2015-05-29 | 1 | -7/+10 |
* | | | | | | | | | | | | | am 7132e792: am b5dabd25: Really don\'t use TEMP_FAILURE_RETRY with close in recovery. | Elliott Hughes | 2015-06-01 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am b5dabd25: Really don\'t use TEMP_FAILURE_RETRY with close in recovery. | Elliott Hughes | 2015-06-01 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Really don't use TEMP_FAILURE_RETRY with close in recovery. | Elliott Hughes | 2015-05-29 | 1 | -1/+1 |
| | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | am 07ec625a: am 92eea1bc: Handle BLKDISCARD failures | Sami Tolvanen | 2015-06-01 | 0 | -0/+0 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 92eea1bc: Handle BLKDISCARD failures | Sami Tolvanen | 2015-06-01 | 0 | -0/+0 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | Handle BLKDISCARD failures | Sami Tolvanen | 2015-05-29 | 1 | -2/+1 |
* | | | | | | | | | | | | am 8339bc67: am 5944bcd8: am 1441a965: Merge "Really don\'t use TEMP_FAILURE_RETRY with close in recovery." | Elliott Hughes | 2015-05-29 | 1 | -1/+1 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 5944bcd8: am 1441a965: Merge "Really don\'t use TEMP_FAILURE_RETRY with close in recovery." | Elliott Hughes | 2015-05-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / /
| | |/| | | | | | | | | |
|
| | * | | | | | | | | | | am 1441a965: Merge "Really don\'t use TEMP_FAILURE_RETRY with close in recovery." | Elliott Hughes | 2015-05-29 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / /
| | | |/| | | | | | | | |
|
| | | * | | | | | | | | | Merge "Really don't use TEMP_FAILURE_RETRY with close in recovery." | Elliott Hughes | 2015-05-29 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | Really don't use TEMP_FAILURE_RETRY with close in recovery. | Elliott Hughes | 2015-05-29 | 1 | -1/+1 |
* | | | | | | | | | | | | | am f827034f: am eec204be: am 74f5e0e0: Merge "Use f_bavail to calculate free space" | Tao Bao | 2015-05-29 | 1 | -1/+1 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am eec204be: am 74f5e0e0: Merge "Use f_bavail to calculate free space" | Tao Bao | 2015-05-29 | 1 | -1/+1 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | am 74f5e0e0: Merge "Use f_bavail to calculate free space" | Tao Bao | 2015-05-29 | 1 | -1/+1 |
| | |\| | | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "Use f_bavail to calculate free space" | Tao Bao | 2015-05-29 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | Use f_bavail to calculate free space | caozhiyuan | 2015-05-29 | 1 | -1/+1 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am 127ab1fc: resolved conflicts for merge of 158e11d6 to mnc-dev-plus-aosp | Tao Bao | 2015-05-29 | 2 | -95/+92 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | resolved conflicts for merge of 158e11d6 to mnc-dev-plus-aosp | Tao Bao | 2015-05-29 | 2 | -95/+92 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | Separate uncrypt into two modes | Tao Bao | 2015-05-28 | 2 | -98/+95 |
* | | | | | | | | | | | | | am e938682e: am cd391c23: am aa4df5c4: Merge "Handle BLKDISCARD failures" | Sami Tolvanen | 2015-05-28 | 1 | -2/+1 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am cd391c23: am aa4df5c4: Merge "Handle BLKDISCARD failures" | Sami Tolvanen | 2015-05-28 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | am aa4df5c4: Merge "Handle BLKDISCARD failures" | Sami Tolvanen | 2015-05-28 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / /
| | | |/| | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "Handle BLKDISCARD failures" | Sami Tolvanen | 2015-05-28 | 1 | -2/+1 |
| | | |\ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / /
| | | |/| | | | | | | | | |
|
| | | | * | | | | | | | | | Handle BLKDISCARD failures | Sami Tolvanen | 2015-05-28 | 1 | -2/+1 |
| | | |/ / / / / / / / / |
|
* | | | | | | | | | | | | am d026a28c: am 9a5e2a26: am f272b9e7: Merge "Clean up the sleep()\'s after poking init services" | Tao Bao | 2015-05-28 | 3 | -13/+20 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 9a5e2a26: am f272b9e7: Merge "Clean up the sleep()\'s after poking init services" | Tao Bao | 2015-05-28 | 3 | -13/+20 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | am f272b9e7: Merge "Clean up the sleep()\'s after poking init services" | Tao Bao | 2015-05-28 | 3 | -13/+20 |
| | |\| | | | | | | | | |
|
| | | * | | | | | | | | | Merge "Clean up the sleep()'s after poking init services" | Tao Bao | 2015-05-28 | 3 | -13/+20 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | Clean up the sleep()'s after poking init services | Tao Bao | 2015-05-27 | 3 | -13/+20 |
| | | |/ / / / / / / / / |
|
* | | | | | | | | | | | | am e6f54e74: am 7b126d77: am 73151b51: Merge "recovery: change the way of rebooting when using power key combo" | Tao Bao | 2015-05-28 | 1 | -1/+3 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 7b126d77: am 73151b51: Merge "recovery: change the way of rebooting when using power key combo" | Tao Bao | 2015-05-28 | 1 | -1/+3 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | am 73151b51: Merge "recovery: change the way of rebooting when using power key combo" | Tao Bao | 2015-05-27 | 1 | -1/+3 |
| | |\| | | | | | | | | |
|
| | | * | | | | | | | | | Merge "recovery: change the way of rebooting when using power key combo" | Tao Bao | 2015-05-27 | 1 | -1/+3 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | recovery: change the way of rebooting when using power key combo | Gaelle Nassiet | 2015-05-27 | 1 | -1/+3 |
| | | | | |/ / / / / / /
| | | | |/| | | | | | | |
|
* | | | | | | | | | | | | am 8af11cff: am 6f6e5bb8: am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo"" | Nick Kralevich | 2015-05-27 | 1 | -2/+1 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 6f6e5bb8: am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo"" | Nick Kralevich | 2015-05-27 | 1 | -2/+1 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo"" | Nick Kralevich | 2015-05-27 | 1 | -2/+1 |
| | |\| | | | | | | | | |
|
| | | * | | | | | | | | | Merge "Revert "recovery: change the way of rebooting when using power key combo"" | Nick Kralevich | 2015-05-27 | 1 | -2/+1 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | Revert "recovery: change the way of rebooting when using power key combo" | Nick Kralevich | 2015-05-27 | 1 | -2/+1 |
* | | | | | | | | | | | | | am f0e2927d: am 6d1d7ffa: am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo" | Nick Kralevich | 2015-05-27 | 1 | -1/+2 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 6d1d7ffa: am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo" | Nick Kralevich | 2015-05-27 | 1 | -1/+2 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo" | Nick Kralevich | 2015-05-27 | 1 | -1/+2 |
| | |\| | | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "recovery: change the way of rebooting when using power key combo" | Nick Kralevich | 2015-05-27 | 1 | -1/+2 |
| | | |\| | | | | | | | |
| | | | |/ / / / / / / /
| | | |/| | | | | | | | |
|
| | | | * | | | | | | | | recovery: change the way of rebooting when using power key combo | Gaelle Nassiet | 2015-05-27 | 1 | -1/+2 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am 9e9cbc9b: am 0b1d1574: am a8cd96ad: Merge "Stop using libstdc++." | Dan Albert | 2015-05-20 | 3 | -5/+3 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 0b1d1574: am a8cd96ad: Merge "Stop using libstdc++." | Dan Albert | 2015-05-20 | 3 | -5/+3 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | am a8cd96ad: Merge "Stop using libstdc++." | Dan Albert | 2015-05-20 | 3 | -5/+3 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "Stop using libstdc++." | Dan Albert | 2015-05-20 | 3 | -5/+3 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Stop using libstdc++. | Dan Albert | 2015-05-19 | 3 | -5/+3 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am b135645c: am 6dc1e6a6: am 6253753a: Merge "Add error and range checks to parse_range" | Sami Tolvanen | 2015-05-18 | 1 | -10/+71 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 6dc1e6a6: am 6253753a: Merge "Add error and range checks to parse_range" | Sami Tolvanen | 2015-05-18 | 1 | -10/+71 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | am 6253753a: Merge "Add error and range checks to parse_range" | Sami Tolvanen | 2015-05-18 | 1 | -10/+71 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "Add error and range checks to parse_range" | Sami Tolvanen | 2015-05-18 | 1 | -10/+71 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Add error and range checks to parse_range | Sami Tolvanen | 2015-05-15 | 1 | -10/+71 |
* | | | | | | | | | | | | am 621fa7aa: am 1857a7f5: Don\'t use TEMP_FAILURE_RETRY on close in recovery. | Elliott Hughes | 2015-05-16 | 0 | -0/+0 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 1857a7f5: Don\'t use TEMP_FAILURE_RETRY on close in recovery. | Elliott Hughes | 2015-05-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / /
| | |/| | | | | | | | | |
|
| | * | | | | | | | | | | Don't use TEMP_FAILURE_RETRY on close in recovery. | Elliott Hughes | 2015-05-16 | 1 | -2/+2 |
* | | | | | | | | | | | | am 0b1e527a: am 09050fc9: am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery." | Elliott Hughes | 2015-05-16 | 1 | -2/+2 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 09050fc9: am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery." | Elliott Hughes | 2015-05-16 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / /
| | |/| | | | | | | | | |
|
| | * | | | | | | | | | | am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery." | Elliott Hughes | 2015-05-16 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / /
| | | |/| | | | | | | | |
|
| | | * | | | | | | | | | Merge "Don't use TEMP_FAILURE_RETRY on close in recovery." | Elliott Hughes | 2015-05-16 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / /
| | | |/| | | | | | | | |
|
| | | | * | | | | | | | | Don't use TEMP_FAILURE_RETRY on close in recovery. | Elliott Hughes | 2015-05-16 | 1 | -2/+2 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am 1fce2426: am 5bb8d551: am 3badd563: Merge "init sets the default PATH itself, better." | Elliott Hughes | 2015-05-13 | 1 | -1/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 5bb8d551: am 3badd563: Merge "init sets the default PATH itself, better." | Elliott Hughes | 2015-05-13 | 1 | -1/+0 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | am 3badd563: Merge "init sets the default PATH itself, better." | Elliott Hughes | 2015-05-12 | 1 | -1/+0 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "init sets the default PATH itself, better." | Elliott Hughes | 2015-05-12 | 1 | -1/+0 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | init sets the default PATH itself, better. | Elliott Hughes | 2015-05-12 | 1 | -1/+0 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am 9cd94f87: am cfe46542: am 3128176e: Merge "Fix build following adb change." | Dan Albert | 2015-05-08 | 1 | -5/+1 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am cfe46542: am 3128176e: Merge "Fix build following adb change." | Dan Albert | 2015-05-08 | 1 | -5/+1 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | am 3128176e: Merge "Fix build following adb change." | Dan Albert | 2015-05-08 | 1 | -5/+1 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "Fix build following adb change." | Dan Albert | 2015-05-08 | 1 | -5/+1 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Fix build following adb change. | Dan Albert | 2015-05-08 | 1 | -5/+1 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am 81ad2bf8: am 3257155e: am 77a2c883: Merge "Add an alternate screen for viewing recovery logs." | Elliott Hughes | 2015-05-07 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 3257155e: am 77a2c883: Merge "Add an alternate screen for viewing recovery logs." | Elliott Hughes | 2015-05-07 | 0 | -0/+0 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | am 77a2c883: Merge "Add an alternate screen for viewing recovery logs." | Elliott Hughes | 2015-05-07 | 3 | -55/+79 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "Add an alternate screen for viewing recovery logs." | Elliott Hughes | 2015-05-07 | 3 | -55/+79 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Add an alternate screen for viewing recovery logs. | Elliott Hughes | 2015-05-07 | 3 | -55/+79 |
* | | | | | | | | | | | | am 92a13f56: am 25a67fde: am 7ff339ea: Merge "uncrypt: Switch to C++" | Tao Bao | 2015-05-07 | 0 | -0/+0 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 25a67fde: am 7ff339ea: Merge "uncrypt: Switch to C++" | Tao Bao | 2015-05-07 | 0 | -0/+0 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | am 7ff339ea: Merge "uncrypt: Switch to C++" | Tao Bao | 2015-05-06 | 2 | -42/+40 |
| | |\| | | | | | | | | |
|
| | | * | | | | | | | | | Merge "uncrypt: Switch to C++" | Tao Bao | 2015-05-06 | 2 | -42/+40 |
| | | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / /
| | | |/| | | | | | | | |
|
| | | | * | | | | | | | | uncrypt: Switch to C++ | Tao Bao | 2015-05-06 | 2 | -42/+40 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am 11342f78: am df52e1e1: Add an alternate screen for viewing recovery logs. | Elliott Hughes | 2015-05-07 | 3 | -55/+79 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am df52e1e1: Add an alternate screen for viewing recovery logs. | Elliott Hughes | 2015-05-07 | 3 | -55/+79 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | Add an alternate screen for viewing recovery logs. | Elliott Hughes | 2015-05-07 | 3 | -55/+79 |
* | | | | | | | | | | | am 2ab0a572: resolved conflicts for merge of 550bd340 to mnc-dev-plus-aosp | Tao Bao | 2015-05-07 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | resolved conflicts for merge of 550bd340 to mnc-dev-plus-aosp | Tao Bao | 2015-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | am aeb980bd: Merge "uncrypt: package on non-data partition should follow the right path" | Tao Bao | 2015-05-06 | 1 | -20/+41 |
| | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | |/| | | | | | | |
|
| | | * | | | | | | | | Merge "uncrypt: package on non-data partition should follow the right path" | Tao Bao | 2015-05-06 | 1 | -20/+41 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | uncrypt: package on non-data partition should follow the right path | Tao Bao | 2015-05-06 | 1 | -20/+41 |
* | | | | | | | | | | | | am a6fb5418: am 48150842: am 41c7ef54: Merge "Track adb_thread_create API change." | Elliott Hughes | 2015-05-07 | 1 | -4/+2 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 48150842: am 41c7ef54: Merge "Track adb_thread_create API change." | Elliott Hughes | 2015-05-07 | 1 | -4/+2 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | am 41c7ef54: Merge "Track adb_thread_create API change." | Elliott Hughes | 2015-05-05 | 1 | -4/+2 |
| | |\| | | | | | | | | |
|
| | | * | | | | | | | | | Merge "Track adb_thread_create API change." | Elliott Hughes | 2015-05-05 | 1 | -4/+2 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | Track adb_thread_create API change. | Elliott Hughes | 2015-05-05 | 1 | -4/+2 |
| | | | |/ / / / / / / / |
|
* | | | | | | | | | | | | am d5148f35: am 185e8204: am c7f64fdf: Merge "Keep multiple kernel logs" | Tao Bao | 2015-05-07 | 0 | -0/+0 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 185e8204: am c7f64fdf: Merge "Keep multiple kernel logs" | Tao Bao | 2015-05-07 | 0 | -0/+0 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | am c7f64fdf: Merge "Keep multiple kernel logs" | Tao Bao | 2015-05-05 | 1 | -82/+73 |
| | |\| | | | | | | | | |
|
| | | * | | | | | | | | | Merge "Keep multiple kernel logs" | Tao Bao | 2015-05-05 | 1 | -82/+73 |
| | | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / /
| | | |/| | | | | | | | |
|
| | | | * | | | | | | | | Keep multiple kernel logs | Tao Bao | 2015-05-05 | 1 | -82/+73 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am c017c597: am 3e8d28b5: uncrypt: Switch to C++ | Tao Bao | 2015-05-06 | 2 | -42/+40 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 3e8d28b5: uncrypt: Switch to C++ | Tao Bao | 2015-05-06 | 2 | -42/+40 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | uncrypt: Switch to C++ | Tao Bao | 2015-05-06 | 2 | -42/+40 |
* | | | | | | | | | | | am 8d312ed6: am 8853cb2f: uncrypt: package on non-data partition should follow the right path | Tao Bao | 2015-05-06 | 1 | -20/+41 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 8853cb2f: uncrypt: package on non-data partition should follow the right path | Tao Bao | 2015-05-06 | 1 | -20/+41 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | uncrypt: package on non-data partition should follow the right path | Tao Bao | 2015-05-06 | 1 | -20/+41 |
* | | | | | | | | | | | am 38fcdfe0: am 93cec9a0: Keep multiple kernel logs | Tao Bao | 2015-05-06 | 1 | -82/+73 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 93cec9a0: Keep multiple kernel logs | Tao Bao | 2015-05-05 | 1 | -82/+73 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Keep multiple kernel logs | Tao Bao | 2015-05-05 | 1 | -82/+73 |
* | | | | | | | | | | | am 6c3b7634: am 6d820f2c: Turn on text display for debuggable builds | Tao Bao | 2015-05-04 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 6d820f2c: Turn on text display for debuggable builds | Tao Bao | 2015-05-04 | 0 | -0/+0 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Turn on text display for debuggable builds | Tao Bao | 2015-05-04 | 1 | -0/+7 |
* | | | | | | | | | | | am e9ce252c: am 0a7b9276: am f8f88321: Merge "Turn on text display for debuggable builds" | Tao Bao | 2015-05-04 | 1 | -0/+7 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 0a7b9276: am f8f88321: Merge "Turn on text display for debuggable builds" | Tao Bao | 2015-05-04 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | am f8f88321: Merge "Turn on text display for debuggable builds" | Tao Bao | 2015-05-04 | 1 | -0/+7 |
| | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | |/| | | | | | | |
|
| | | * | | | | | | | | Merge "Turn on text display for debuggable builds" | Tao Bao | 2015-05-04 | 1 | -0/+7 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Turn on text display for debuggable builds | Tao Bao | 2015-05-04 | 1 | -0/+7 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am 759febda: am 4cf34d5d: Fix mips64 minadbd_test build. | Elliott Hughes | 2015-05-02 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 4cf34d5d: Fix mips64 minadbd_test build. | Elliott Hughes | 2015-05-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | Fix mips64 minadbd_test build. | Elliott Hughes | 2015-05-02 | 1 | -1/+1 |
* | | | | | | | | | | | am 007a7141: am 4b3004a6: am 59e1e3e7: Merge "Fix mips64 minadbd_test build." | Elliott Hughes | 2015-05-02 | 1 | -1/+1 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 4b3004a6: am 59e1e3e7: Merge "Fix mips64 minadbd_test build." | Elliott Hughes | 2015-05-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | am 59e1e3e7: Merge "Fix mips64 minadbd_test build." | Elliott Hughes | 2015-05-02 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | |/| | | | | | | |
|
| | | * | | | | | | | | Merge "Fix mips64 minadbd_test build." | Elliott Hughes | 2015-05-02 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Fix mips64 minadbd_test build. | Elliott Hughes | 2015-05-02 | 1 | -1/+1 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am 227dcf8a: am 15931924: Move minadb over to new API. | Elliott Hughes | 2015-05-02 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 15931924: Move minadb over to new API. | Elliott Hughes | 2015-05-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | Move minadb over to new API. | Elliott Hughes | 2015-05-02 | 2 | -13/+9 |
* | | | | | | | | | | | am 0cd8f5b4: am 87ec73a2: Fix minadb_test build breakage. | Elliott Hughes | 2015-05-02 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 87ec73a2: Fix minadb_test build breakage. | Elliott Hughes | 2015-05-02 | 0 | -0/+0 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Fix minadb_test build breakage. | Elliott Hughes | 2015-05-02 | 1 | -1/+1 |
* | | | | | | | | | | | am 41e4f5ae: am c0537d68: am 6bc2d538: Merge "Move minadb over to new API." | Elliott Hughes | 2015-05-02 | 2 | -13/+9 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am c0537d68: am 6bc2d538: Merge "Move minadb over to new API." | Elliott Hughes | 2015-05-02 | 2 | -13/+9 |
| |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | am 6bc2d538: Merge "Move minadb over to new API." | Elliott Hughes | 2015-05-02 | 2 | -13/+9 |
| | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | |/| | | | | | | |
|
| | | * | | | | | | | | Merge "Move minadb over to new API." | Elliott Hughes | 2015-05-02 | 2 | -13/+9 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Move minadb over to new API. | Elliott Hughes | 2015-05-02 | 2 | -14/+10 |
* | | | | | | | | | | | | am ea874f8f: am c67e89ad: am 30cea3dc: Merge "Fix minadb_test build breakage." | Elliott Hughes | 2015-05-02 | 1 | -1/+1 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am c67e89ad: am 30cea3dc: Merge "Fix minadb_test build breakage." | Elliott Hughes | 2015-05-02 | 1 | -1/+1 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | am 30cea3dc: Merge "Fix minadb_test build breakage." | Elliott Hughes | 2015-05-02 | 1 | -1/+1 |
| | |\| | | | | | | | | |
|
| | | * | | | | | | | | | Merge "Fix minadb_test build breakage." | Elliott Hughes | 2015-05-02 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / /
| | | |/| | | | | | | | |
|
| | | | * | | | | | | | | Fix minadb_test build breakage. | Elliott Hughes | 2015-05-02 | 1 | -1/+1 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am 073e3381: am 2f5feedf: Check all lseek calls succeed. | Elliott Hughes | 2015-04-30 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 2f5feedf: Check all lseek calls succeed. | Elliott Hughes | 2015-04-30 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | Check all lseek calls succeed. | Elliott Hughes | 2015-04-30 | 14 | -128/+112 |
* | | | | | | | | | | | am f6c7af28: am 34d3a3d0: am 34c7731a: Merge "Check all lseek calls succeed." | Elliott Hughes | 2015-04-30 | 14 | -128/+112 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am 34d3a3d0: am 34c7731a: Merge "Check all lseek calls succeed." | Elliott Hughes | 2015-04-30 | 14 | -128/+112 |
| |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | am 34c7731a: Merge "Check all lseek calls succeed." | Elliott Hughes | 2015-04-30 | 14 | -128/+112 |
| | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | |/| | | | | | | |
|
| | | * | | | | | | | | Merge "Check all lseek calls succeed." | Elliott Hughes | 2015-04-30 | 14 | -128/+112 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Check all lseek calls succeed. | Elliott Hughes | 2015-04-30 | 14 | -128/+112 |
| | | |/ / / / / / / / |
|
* | | | | | | | | | | | am 15a2e46b: am f7466f9f: Stop using adb_strtok, and check argument validity. | Elliott Hughes | 2015-04-28 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am f7466f9f: Stop using adb_strtok, and check argument validity. | Elliott Hughes | 2015-04-28 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | Stop using adb_strtok, and check argument validity. | Elliott Hughes | 2015-04-28 | 1 | -9/+10 |
* | | | | | | | | | | | am b1195d1c: am bc4e69fc: am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity." | Elliott Hughes | 2015-04-28 | 1 | -9/+10 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | am bc4e69fc: am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity." | Elliott Hughes | 2015-04-28 | 1 | -9/+10 |
| |\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / /
| |/| / / / / / / / /
| | |/ / / / / / / / |
|
| | * | | | | | | | | am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity." | Elliott Hughes | 2015-04-28 | 1 | -9/+10 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "Stop using adb_strtok, and check argument validity." | Elliott Hughes | 2015-04-28 | 1 | -9/+10 |
| | | |\ \ \ \ \ \ \ |
|
| | | | * | | | | | | | Stop using adb_strtok, and check argument validity. | Elliott Hughes | 2015-04-28 | 1 | -9/+10 |
| | | |/ / / / / / / |
|
* | | | | | | | | | | am 5c025ac5: (-s ours) am 599fc2c0: (-s ours) am c94fa0b0: (-s ours) DO NOT MERGE Revert "Erase PST partition if its marked to be erased." | Andres Morales | 2015-04-27 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | am 599fc2c0: (-s ours) am c94fa0b0: (-s ours) DO NOT MERGE Revert "Erase PST partition if its marked to be erased." | Andres Morales | 2015-04-27 | 0 | -0/+0 |
|/| | | | | | | | |
| | |_|/ / / / / /
| |/| | | | | | | |
|
| * | | | | | | | | am c94fa0b0: (-s ours) DO NOT MERGE Revert "Erase PST partition if its marked to be erased." | Andres Morales | 2015-04-26 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | / / / / /
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | DO NOT MERGE Revert "Erase PST partition if its marked to be erased." | Andres Morales | 2015-04-02 | 3 | -44/+0 |
* | | | | | | | | am 5a95719b: am 6725ebc7: Merge "Revert "Revert "init re-execs to set its security context now.""" | Elliott Hughes | 2015-04-24 | 1 | -7/+0 |
|\| | | | | | | |
|
| * | | | | | | | am 6725ebc7: Merge "Revert "Revert "init re-execs to set its security context now.""" | Elliott Hughes | 2015-04-24 | 1 | -7/+0 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | Merge "Revert "Revert "init re-execs to set its security context now.""" | Elliott Hughes | 2015-04-24 | 1 | -7/+0 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Revert "Revert "init re-execs to set its security context now."" | Elliott Hughes | 2015-04-24 | 1 | -7/+0 |
| | |/ / / / / / |
|
* | | | | | | | | am f6c03a80: am c690332c: Merge "Revert "init re-execs to set its security context now."" | Nick Kralevich | 2015-04-24 | 1 | -0/+7 |
|\| | | | | | | |
|
| * | | | | | | | am c690332c: Merge "Revert "init re-execs to set its security context now."" | Nick Kralevich | 2015-04-24 | 1 | -0/+7 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Revert "init re-execs to set its security context now."" | Nick Kralevich | 2015-04-24 | 1 | -0/+7 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Revert "init re-execs to set its security context now." | Nick Kralevich | 2015-04-24 | 1 | -0/+7 |
* | | | | | | | | | am 7058b89f: am 38a82cac: Merge "init re-execs to set its security context now." | Elliott Hughes | 2015-04-24 | 1 | -7/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | am 38a82cac: Merge "init re-execs to set its security context now." | Elliott Hughes | 2015-04-24 | 1 | -7/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "init re-execs to set its security context now." | Elliott Hughes | 2015-04-24 | 1 | -7/+0 |
| | |\| | | | | | |
|
| | | * | | | | | | init re-execs to set its security context now. | Elliott Hughes | 2015-04-24 | 1 | -7/+0 |
| | |/ / / / / / |
|
* | | | | | | | | am 0391820c: am 0de2351e: Merge "Don\'t remove existing explicitly stashed blocks" | Sami Tolvanen | 2015-04-17 | 1 | -10/+28 |
|\| | | | | | | |
|
| * | | | | | | | am 0de2351e: Merge "Don\'t remove existing explicitly stashed blocks" | Sami Tolvanen | 2015-04-17 | 1 | -10/+28 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Don't remove existing explicitly stashed blocks" | Sami Tolvanen | 2015-04-17 | 1 | -10/+28 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Don't remove existing explicitly stashed blocks | Sami Tolvanen | 2015-04-17 | 1 | -10/+28 |
| | |/ / / / / / |
|
* | | | | | | | | am 51f42b2d: am 4381767a: Merge "imgdiff: Avoid infinite loop if inflate fails" | Tao Bao | 2015-04-16 | 1 | -0/+9 |
|\| | | | | | | |
|
| * | | | | | | | am 4381767a: Merge "imgdiff: Avoid infinite loop if inflate fails" | Tao Bao | 2015-04-16 | 1 | -0/+9 |
| |\| | | | | | |
|
| | * | | | | | | Merge "imgdiff: Avoid infinite loop if inflate fails" | Tao Bao | 2015-04-16 | 1 | -0/+9 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | imgdiff: Avoid infinite loop if inflate fails | Johan Redestig | 2015-04-15 | 1 | -0/+9 |
* | | | | | | | | | am 0a557b6b: am 7176a617: Merge "Don\'t use typedefs that hide *s." | Elliott Hughes | 2015-04-15 | 8 | -59/+54 |
|\| | | | | | | | |
|
| * | | | | | | | | am 7176a617: Merge "Don\'t use typedefs that hide *s." | Elliott Hughes | 2015-04-15 | 8 | -59/+54 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Don't use typedefs that hide *s." | Elliott Hughes | 2015-04-15 | 8 | -59/+54 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | Don't use typedefs that hide *s. | Elliott Hughes | 2015-04-15 | 8 | -59/+54 |
| | |/ / / / / / / |
|
* | | | | | | | | | am 98bfb6f7: am 6e435abf: Merge "Move the menu header out of the menu." | Elliott Hughes | 2015-04-15 | 8 | -66/+72 |
|\| | | | | | | | |
|
| * | | | | | | | | am 6e435abf: Merge "Move the menu header out of the menu." | Elliott Hughes | 2015-04-15 | 8 | -66/+72 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Move the menu header out of the menu." | Elliott Hughes | 2015-04-15 | 8 | -66/+72 |
| | |\ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | | * | | | | | | Move the menu header out of the menu. | Elliott Hughes | 2015-04-14 | 8 | -66/+72 |
| | |/ / / / / / |
|
* | | | | | | | | am cbdc7e84: am 17b032e1: Merge "Add missing \n after "Mounting /system." message." | Elliott Hughes | 2015-04-13 | 1 | -1/+1 |
|\| | | | | | | |
|
| * | | | | | | | am 17b032e1: Merge "Add missing \n after "Mounting /system." message." | Elliott Hughes | 2015-04-13 | 1 | -1/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Add missing \n after "Mounting /system." message." | Elliott Hughes | 2015-04-13 | 1 | -1/+1 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Add missing \n after "Mounting /system." message. | Elliott Hughes | 2015-04-13 | 1 | -1/+1 |
| | |/ / / / / / |
|
* | | | | | | | | am d7823c5d: am eab12de7: Merge "Remove unnecessary globals." | Elliott Hughes | 2015-04-13 | 4 | -64/+55 |
|\| | | | | | | |
|
| * | | | | | | | am eab12de7: Merge "Remove unnecessary globals." | Elliott Hughes | 2015-04-13 | 4 | -64/+55 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Remove unnecessary globals." | Elliott Hughes | 2015-04-13 | 4 | -64/+55 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Remove unnecessary globals. | Elliott Hughes | 2015-04-13 | 4 | -64/+55 |
* | | | | | | | | | am 507630e9: am b68c4fc4: Merge "Treat KEY_ENTER the same as KEY_POWER in the pager." | Elliott Hughes | 2015-04-13 | 1 | -1/+1 |
|\| | | | | | | | |
|
| * | | | | | | | | am b68c4fc4: Merge "Treat KEY_ENTER the same as KEY_POWER in the pager." | Elliott Hughes | 2015-04-13 | 1 | -1/+1 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Treat KEY_ENTER the same as KEY_POWER in the pager." | Elliott Hughes | 2015-04-13 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | | * | | | | | | Treat KEY_ENTER the same as KEY_POWER in the pager. | Elliott Hughes | 2015-04-13 | 1 | -1/+1 |
| | |/ / / / / / |
|
* | | | | | | | | am d56e0f37: am 0e3781ef: Merge "Rewritten file pager." | Elliott Hughes | 2015-04-11 | 2 | -65/+88 |
|\| | | | | | | |
|
| * | | | | | | | am 0e3781ef: Merge "Rewritten file pager." | Elliott Hughes | 2015-04-11 | 2 | -65/+88 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Rewritten file pager." | Elliott Hughes | 2015-04-11 | 2 | -65/+88 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Rewritten file pager. | Elliott Hughes | 2015-04-11 | 2 | -65/+88 |
* | | | | | | | | | am dd4d48be: am 558ba1ba: Merge "Revert "Append kernel logs to last_log file"" | Tao Bao | 2015-04-11 | 1 | -46/+42 |
|\| | | | | | | | |
|
| * | | | | | | | | am 558ba1ba: Merge "Revert "Append kernel logs to last_log file"" | Tao Bao | 2015-04-11 | 1 | -46/+42 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Revert "Append kernel logs to last_log file"" | Tao Bao | 2015-04-11 | 1 | -46/+42 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | Revert "Append kernel logs to last_log file" | Tao Bao | 2015-04-11 | 1 | -46/+42 |
* | | | | | | | | | | am fa51b50a: am 464c3e71: Merge "Append kernel logs to last_log file" | Tao Bao | 2015-04-11 | 1 | -42/+46 |
|\| | | | | | | | | |
|
| * | | | | | | | | | am 464c3e71: Merge "Append kernel logs to last_log file" | Tao Bao | 2015-04-11 | 1 | -42/+46 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Append kernel logs to last_log file" | Tao Bao | 2015-04-11 | 1 | -42/+46 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Append kernel logs to last_log file | Tao Bao | 2015-04-11 | 1 | -42/+46 |
* | | | | | | | | | | am 57ca725d: am 6d1bd3d3: Merge "Update the comments for package installer commands" | Tao Bao | 2015-04-11 | 1 | -1/+13 |
|\| | | | | | | | | |
|
| * | | | | | | | | | am 6d1bd3d3: Merge "Update the comments for package installer commands" | Tao Bao | 2015-04-11 | 1 | -1/+13 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Update the comments for package installer commands" | Tao Bao | 2015-04-11 | 1 | -1/+13 |
| | |\ \ \ \ \ \ \ \
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
| | | * | | | | | | | Update the comments for package installer commands | Tao Bao | 2015-04-11 | 1 | -1/+13 |
| | | |/ / / / / / |
|
* | | | | | | | | | am 34bbc7d4: am f19007a5: Merge "Auto-detect whether to use the long-press UI." | Elliott Hughes | 2015-04-11 | 6 | -41/+56 |
|\| | | | | | | | |
|
| * | | | | | | | | am f19007a5: Merge "Auto-detect whether to use the long-press UI." | Elliott Hughes | 2015-04-11 | 6 | -41/+56 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Auto-detect whether to use the long-press UI." | Elliott Hughes | 2015-04-11 | 6 | -41/+56 |
| | |\ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | | * | | | | | | Auto-detect whether to use the long-press UI. | Elliott Hughes | 2015-04-11 | 6 | -41/+56 |
| | |/ / / / / / |
|
* | | | | | | | | am a90ba39b: am 51697d27: Merge "Switch minadb over to C++." | Elliott Hughes | 2015-04-10 | 9 | -31/+24 |
|\| | | | | | | |
|
| * | | | | | | | am 51697d27: Merge "Switch minadb over to C++." | Elliott Hughes | 2015-04-10 | 9 | -31/+24 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Switch minadb over to C++." | Elliott Hughes | 2015-04-10 | 9 | -31/+24 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Switch minadb over to C++. | Elliott Hughes | 2015-04-10 | 9 | -31/+24 |
| | |/ / / / / / |
|
* | | | | | | | | am 53b8ca4b: am 23017c5d: Merge "Switch minui over to C++." | Elliott Hughes | 2015-04-10 | 8 | -102/+82 |
|\| | | | | | | |
|
| * | | | | | | | am 23017c5d: Merge "Switch minui over to C++." | Elliott Hughes | 2015-04-10 | 8 | -102/+82 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Switch minui over to C++." | Elliott Hughes | 2015-04-10 | 8 | -102/+82 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Switch minui over to C++. | Elliott Hughes | 2015-04-10 | 8 | -102/+82 |
| | |/ / / / / / |
|
* | | | | | | | | am 9b0ebf99: am 5d1630a9: Merge "Fix ScreenRecoveryUI to handle devices without power/up/down." | Elliott Hughes | 2015-04-10 | 7 | -48/+96 |
|\| | | | | | | |
|
| * | | | | | | | am 5d1630a9: Merge "Fix ScreenRecoveryUI to handle devices without power/up/down." | Elliott Hughes | 2015-04-10 | 7 | -48/+96 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Fix ScreenRecoveryUI to handle devices without power/up/down." | Elliott Hughes | 2015-04-10 | 7 | -48/+96 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Fix ScreenRecoveryUI to handle devices without power/up/down. | Elliott Hughes | 2015-04-10 | 7 | -48/+96 |
| | |/ / / / / / |
|
* | | | | | | | | am c22f5774: am 6b0dd1d7: Merge "Move "Mount /system" to the main menu." | Elliott Hughes | 2015-04-10 | 6 | -55/+42 |
|\| | | | | | | |
|
| * | | | | | | | am 6b0dd1d7: Merge "Move "Mount /system" to the main menu." | Elliott Hughes | 2015-04-10 | 6 | -55/+42 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Move "Mount /system" to the main menu." | Elliott Hughes | 2015-04-10 | 6 | -55/+42 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Move "Mount /system" to the main menu. | Elliott Hughes | 2015-04-10 | 6 | -55/+42 |
| | |/ / / / / / |
|
* | | | | | | | | am 10dacbce: am 18eaa0cf: Merge "Add ev_iterate_available_keys to minui." | Elliott Hughes | 2015-04-10 | 3 | -94/+126 |
|\| | | | | | | |
|
| * | | | | | | | am 18eaa0cf: Merge "Add ev_iterate_available_keys to minui." | Elliott Hughes | 2015-04-10 | 3 | -94/+126 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Add ev_iterate_available_keys to minui." | Elliott Hughes | 2015-04-10 | 3 | -94/+126 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Add ev_iterate_available_keys to minui. | Elliott Hughes | 2015-04-10 | 3 | -94/+126 |
| | |/ / / / / / |
|
* | | | | | | | | am 5f3dee94: am f471861e: Merge "Move the recovery image version out of the menu header." | Elliott Hughes | 2015-04-10 | 1 | -21/+7 |
|\| | | | | | | |
|
| * | | | | | | | am f471861e: Merge "Move the recovery image version out of the menu header." | Elliott Hughes | 2015-04-10 | 1 | -21/+7 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Move the recovery image version out of the menu header." | Elliott Hughes | 2015-04-10 | 1 | -21/+7 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Move the recovery image version out of the menu header. | Elliott Hughes | 2015-04-10 | 1 | -21/+7 |
| | |/ / / / / / |
|
* | | | | | | | | am 7b66aaeb: am e001074f: Merge "Move default implementations into Device." | Elliott Hughes | 2015-04-10 | 4 | -84/+99 |
|\| | | | | | | |
|
| * | | | | | | | am e001074f: Merge "Move default implementations into Device." | Elliott Hughes | 2015-04-10 | 4 | -84/+99 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Move default implementations into Device." | Elliott Hughes | 2015-04-10 | 4 | -84/+99 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Move default implementations into Device. | Elliott Hughes | 2015-04-09 | 4 | -84/+99 |
* | | | | | | | | | am 0c23c97c: am 06522ef5: Merge "Remove some commented-out code." | Elliott Hughes | 2015-04-09 | 1 | -10/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | am 06522ef5: Merge "Remove some commented-out code." | Elliott Hughes | 2015-04-09 | 1 | -10/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Remove some commented-out code." | Elliott Hughes | 2015-04-09 | 1 | -10/+0 |
| | |\ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | | * | | | | | | Remove some commented-out code. | Elliott Hughes | 2015-04-09 | 1 | -10/+0 |
| | |/ / / / / / |
|
* | | | | | | | | am 382ec478: am 52222a58: Merge "Move file paging into ScreenRecoveryUI." | Elliott Hughes | 2015-04-09 | 5 | -95/+104 |
|\| | | | | | | |
|
| * | | | | | | | am 52222a58: Merge "Move file paging into ScreenRecoveryUI." | Elliott Hughes | 2015-04-09 | 5 | -95/+104 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Move file paging into ScreenRecoveryUI." | Elliott Hughes | 2015-04-09 | 5 | -95/+104 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Move file paging into ScreenRecoveryUI. | Elliott Hughes | 2015-04-09 | 5 | -95/+104 |
| | |/ / / / / / |
|
* | | | | | | | | am 36640972: am fbde407e: Merge "Enable printf format argument checking." | Elliott Hughes | 2015-04-09 | 4 | -5/+5 |
|\| | | | | | | |
|
| * | | | | | | | am fbde407e: Merge "Enable printf format argument checking." | Elliott Hughes | 2015-04-09 | 4 | -5/+5 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Enable printf format argument checking." | Elliott Hughes | 2015-04-09 | 4 | -5/+5 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Enable printf format argument checking. | Elliott Hughes | 2015-04-09 | 4 | -5/+5 |
| | |/ / / / / / |
|
* | | | | | | | | am 0d4f2b6d: am 900c9a61: Merge "Remove the fixed screen size assumptions." | Elliott Hughes | 2015-04-09 | 2 | -32/+37 |
|\| | | | | | | |
|
| * | | | | | | | am 900c9a61: Merge "Remove the fixed screen size assumptions." | Elliott Hughes | 2015-04-09 | 2 | -32/+37 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Remove the fixed screen size assumptions." | Elliott Hughes | 2015-04-09 | 2 | -32/+37 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Remove the fixed screen size assumptions. | Elliott Hughes | 2015-04-09 | 2 | -32/+37 |
* | | | | | | | | | am 72ba6264: am 64346eae: Merge "Remove a couple of unused inlines from minzip/Zip.h." | Elliott Hughes | 2015-04-09 | 1 | -10/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | am 64346eae: Merge "Remove a couple of unused inlines from minzip/Zip.h." | Elliott Hughes | 2015-04-09 | 1 | -10/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Remove a couple of unused inlines from minzip/Zip.h." | Elliott Hughes | 2015-04-09 | 1 | -10/+0 |
| | |\ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | | * | | | | | | Remove a couple of unused inlines from minzip/Zip.h. | Elliott Hughes | 2015-04-08 | 1 | -10/+0 |
| | |/ / / / / / |
|
* | | | | | | | | am 0a7c1694: am ca7bf531: Merge "Rotate logs only when there are actual operations" | Tao Bao | 2015-04-08 | 4 | -9/+33 |
|\| | | | | | | |
|
| * | | | | | | | am ca7bf531: Merge "Rotate logs only when there are actual operations" | Tao Bao | 2015-04-08 | 4 | -9/+33 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Rotate logs only when there are actual operations" | Tao Bao | 2015-04-08 | 4 | -9/+33 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Rotate logs only when there are actual operations | Tao Bao | 2015-04-08 | 4 | -9/+33 |
| | |/ / / / / / |
|
* | | | | | | | | am 575e3739: am 6896f9d4: Merge "always use volume mount option when mounting a partition" | Tao Bao | 2015-04-01 | 1 | -1/+1 |
|\| | | | | | | |
|
| * | | | | | | | am 6896f9d4: Merge "always use volume mount option when mounting a partition" | Tao Bao | 2015-04-01 | 1 | -1/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "always use volume mount option when mounting a partition" | Tao Bao | 2015-04-01 | 1 | -1/+1 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | always use volume mount option when mounting a partition | Gaelle Nassiet | 2015-03-24 | 1 | -1/+1 |
* | | | | | | | | | am 8cd389c8: am ccc82eca: Merge "Refactor the codes to call wipe_data/wipe_cache functions" | Tao Bao | 2015-04-01 | 1 | -22/+36 |
|\| | | | | | | | |
|
| * | | | | | | | | am ccc82eca: Merge "Refactor the codes to call wipe_data/wipe_cache functions" | Tao Bao | 2015-04-01 | 1 | -22/+36 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Refactor the codes to call wipe_data/wipe_cache functions" | Tao Bao | 2015-04-01 | 1 | -22/+36 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | Refactor the codes to call wipe_data/wipe_cache functions | Tao Bao | 2015-03-31 | 1 | -22/+36 |
| | |/ / / / / / / |
|
* | | | | | | | | | am 9e1bba1f: am 9295980a: Merge "Revert "Erase PST partition if its marked to be erased."" | Tao Bao | 2015-03-31 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | am 9295980a: Merge "Revert "Erase PST partition if its marked to be erased."" | Tao Bao | 2015-03-31 | 3 | -44/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Revert "Erase PST partition if its marked to be erased."" | Tao Bao | 2015-03-31 | 3 | -44/+0 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | Revert "Erase PST partition if its marked to be erased." | Andres Morales | 2015-03-31 | 3 | -44/+0 |
| | |/ / / / / / / |
|
* | | | | | | | | | resolved conflicts for merge of 5472176c to master | Tao Bao | 2015-03-31 | 1 | -26/+49 |
|\| | | | | | | | |
|
| * | | | | | | | | am 20e82d4f: Merge "Add support to enter sideload mode directly" | Tao Bao | 2015-03-31 | 1 | -26/+49 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Add support to enter sideload mode directly" | Tao Bao | 2015-03-31 | 1 | -26/+49 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | Add support to enter sideload mode directly | Tao Bao | 2015-03-30 | 1 | -26/+49 |
| | |/ / / / / / / |
|
* | / / / / / / / | Revert "Erase PST partition if its marked to be erased." | Andres Morales | 2015-03-30 | 3 | -44/+0 |
|/ / / / / / / / |
|
* | | | | | | | | am dac24865: Merge "Factor out the "yes/no" menu and use it for "Wipe cache" too." | Elliott Hughes | 2015-03-26 | 1 | -60/+35 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Factor out the "yes/no" menu and use it for "Wipe cache" too." | Elliott Hughes | 2015-03-26 | 1 | -60/+35 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Factor out the "yes/no" menu and use it for "Wipe cache" too. | Elliott Hughes | 2015-03-26 | 1 | -60/+35 |
| |/ / / / / / / |
|
* | | | | | | | | am 43b80810: Merge "Factor out option variables from int to bool types" | Tao Bao | 2015-03-26 | 5 | -14/+16 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Factor out option variables from int to bool types" | Tao Bao | 2015-03-26 | 5 | -14/+16 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Factor out option variables from int to bool types | Tao Bao | 2015-03-25 | 5 | -14/+16 |
| |/ / / / / / / |
|
* | | | | | | | | am e31f9565: Merge "Remove support for Cupcake kernels." | Elliott Hughes | 2015-03-25 | 1 | -17/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Remove support for Cupcake kernels." | Elliott Hughes | 2015-03-25 | 1 | -17/+0 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Remove support for Cupcake kernels. | Elliott Hughes | 2015-03-24 | 1 | -17/+0 |
| |/ / / / / / / |
|
* | | | | | | | | am 9460bb2c: Merge "Fix recovery image text rendering." | Elliott Hughes | 2015-03-24 | 3 | -32/+25 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Fix recovery image text rendering." | Elliott Hughes | 2015-03-24 | 3 | -32/+25 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Fix recovery image text rendering. | Elliott Hughes | 2015-03-24 | 3 | -32/+25 |
| |/ / / / / / / |
|
* | | | | | | | | am 47733eaf: Merge "Fix wipe command when using sideload in recovery" | Elliott Hughes | 2015-03-24 | 1 | -52/+47 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Fix wipe command when using sideload in recovery" | Elliott Hughes | 2015-03-24 | 1 | -52/+47 |
| |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| | * | | | | | | Fix wipe command when using sideload in recovery | Christian Poetzsch | 2015-03-24 | 1 | -52/+47 |
| |/ / / / / / |
|
* | | | | | | | am 733deb26: Merge "Make the recovery menus wrap." | Elliott Hughes | 2015-03-24 | 1 | -2/+5 |
|\| | | | | | |
|
| * | | | | | | Merge "Make the recovery menus wrap." | Elliott Hughes | 2015-03-24 | 1 | -2/+5 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Make the recovery menus wrap. | Elliott Hughes | 2015-03-23 | 1 | -2/+5 |
* | | | | | | | | am 31e47876: Merge "Always use strerror to report errno in recovery." | Elliott Hughes | 2015-03-23 | 3 | -26/+27 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Always use strerror to report errno in recovery." | Elliott Hughes | 2015-03-23 | 3 | -26/+27 |
| |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| | * | | | | | | Always use strerror to report errno in recovery. | Elliott Hughes | 2015-03-23 | 3 | -26/+27 |
| |/ / / / / / |
|
* | | | | | | | am e944944f: Merge "Add "Apply update from sdcard" to default recovery image." | Elliott Hughes | 2015-03-23 | 3 | -20/+44 |
|\| | | | | | |
|
| * | | | | | | Merge "Add "Apply update from sdcard" to default recovery image." | Elliott Hughes | 2015-03-23 | 3 | -20/+44 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Add "Apply update from sdcard" to default recovery image. | Elliott Hughes | 2015-03-23 | 3 | -20/+44 |
| |/ / / / / / |
|
* | | | | | | | am 8c637903: Merge "Remove unused libutils references." | Dan Albert | 2015-03-14 | 2 | -2/+1 |
|\| | | | | | |
|
| * | | | | | | Merge "Remove unused libutils references." | Dan Albert | 2015-03-14 | 2 | -2/+1 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Remove unused libutils references. | Dan Albert | 2015-03-14 | 2 | -2/+1 |
| |/ / / / / / |
|
* | | | | | | | git commit -m "resolved conflicts for merge of d29f641b to stage-aosp-master" | Dan Albert | 2015-03-12 | 5 | -462/+1553 |
|\| | | | | | |
|
| * | | | | | | am d5369e5d: (-s ours) am 18f371d8: updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch | Tao Bao | 2015-03-12 | 0 | -0/+0 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | am 18f371d8: updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch | Tao Bao | 2015-03-11 | 2 | -14/+29 |
| | |\| | | | | |
|
| | | * | | | | | updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch | Tao Bao | 2015-03-11 | 2 | -14/+29 |
| * | | | | | | | am cc368fde: am 8290aa50: Merge "Install the recovery binary directly to the recovery image." | Ying Wang | 2015-03-12 | 0 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | am 8290aa50: Merge "Install the recovery binary directly to the recovery image." | Ying Wang | 2015-03-11 | 1 | -5/+1 |
| | |\ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | | | |
|
* | | | | | | | | Merge "Install the recovery binary directly to the recovery image." | Ying Wang | 2015-03-11 | 1 | -5/+1 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Install the recovery binary directly to the recovery image. | Ying Wang | 2015-03-11 | 1 | -5/+1 |
|/ / / / / / / / |
|
| * | | | | | | | Install the recovery binary directly to the recovery image. | Ying Wang | 2015-03-10 | 1 | -5/+1 |
| * | | | | | | | am fb7d8965: am 023e4374: am 579b9299: (-s ours) Merge "Remove more dead code from minzip." | Narayan Kamath | 2015-02-27 | 0 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | am 023e4374: am 579b9299: (-s ours) Merge "Remove more dead code from minzip." | Narayan Kamath | 2015-02-27 | 0 | -0/+0 |
| | |\ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | | | |
|
* | | | | | | | | am 579b9299: (-s ours) Merge "Remove more dead code from minzip." | Narayan Kamath | 2015-02-27 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge "Remove more dead code from minzip." | Narayan Kamath | 2015-02-27 | 3 | -108/+59 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | Remove more dead code from minzip. | Narayan Kamath | 2015-02-27 | 3 | -108/+59 |
| |/ / / / / / / / |
|
| | * | | | | | | | am 66f94728: am 3deba524: am ecead276: Merge "Add tests for read_block_adb." | Dan Albert | 2015-02-27 | 4 | -16/+124 |
| | |\| | | | | | |
|
| | | * | | | | | | am 3deba524: am ecead276: Merge "Add tests for read_block_adb." | Dan Albert | 2015-02-27 | 4 | -16/+124 |
| | | |\ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | am ecead276: Merge "Add tests for read_block_adb." | Dan Albert | 2015-02-27 | 4 | -16/+124 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Add tests for read_block_adb." | Dan Albert | 2015-02-27 | 4 | -16/+124 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | Add tests for read_block_adb. | Dan Albert | 2015-02-27 | 4 | -16/+124 |
| |/ / / / / / / / |
|
| | * | | | | | | | Remove more dead code from minzip. | Narayan Kamath | 2015-02-27 | 3 | -114/+65 |
| | * | | | | | | | am 0257d107: am 71c45429: am f66bf339: am 3e91f691: Bump up max_map_count value. | Jesse Zhao | 2015-02-27 | 0 | -0/+0 |
| | |\| | | | | | |
|
| | | * | | | | | | am 71c45429: am f66bf339: am 3e91f691: Bump up max_map_count value. | Jesse Zhao | 2015-02-27 | 0 | -0/+0 |
| | | |\| | | | | |
|
| | | | * | | | | | am f66bf339: am 3e91f691: Bump up max_map_count value. | Jesse Zhao | 2015-02-27 | 0 | -0/+0 |
| | | | |\| | | | |
|
| | | | | * | | | | am 3e91f691: Bump up max_map_count value. | Jesse Zhao | 2015-02-27 | 1 | -0/+1 |
| | | | | |\| | | |
|
| | | | | | * | | | Bump up max_map_count value. | Jesse Zhao | 2015-02-25 | 1 | -0/+1 |
| | * | | | | | | | am 9b14c4b0: am 735a0f0f: am cab0beb9: Merge "This read accidentally got turned in to a write." | Dan Albert | 2015-02-27 | 1 | -1/+1 |
| | |\| | | | | | |
|
| | | * | | | | | | am 735a0f0f: am cab0beb9: Merge "This read accidentally got turned in to a write." | Dan Albert | 2015-02-27 | 1 | -1/+1 |
| | | |\ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | am cab0beb9: Merge "This read accidentally got turned in to a write." | Dan Albert | 2015-02-27 | 1 | -1/+1 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "This read accidentally got turned in to a write." | Dan Albert | 2015-02-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | This read accidentally got turned in to a write. | Dan Albert | 2015-02-26 | 1 | -1/+1 |
| | | * | | | | | | | am d9bbeaec: am 83e5d1dc: am c9bc3cc9: Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk" | Narayan Kamath | 2015-02-26 | 1 | -4/+1 |
| | | |\| | | | | | |
|
| | | | * | | | | | | am 83e5d1dc: am c9bc3cc9: Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk" | Narayan Kamath | 2015-02-26 | 1 | -4/+1 |
| | | | |\ \ \ \ \ \
| |_|_|_|/ / / / / /
|/| | | | | | | | | |
|
* | | | | | | | | | | am c9bc3cc9: Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk" | Narayan Kamath | 2015-02-26 | 1 | -4/+1 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk" | Narayan Kamath | 2015-02-26 | 1 | -4/+1 |
| |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| | * | | | | | | | | Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk | Trevor Drake | 2015-02-26 | 1 | -4/+1 |
| |/ / / / / / / / |
|
| | * | | | | | | | am 381f6416: am eef962bf: am 9255ad4a: Merge "Fix readx/writex names." | Dan Albert | 2015-02-26 | 1 | -4/+6 |
| | |\| | | | | | |
|
| | | * | | | | | | am eef962bf: am 9255ad4a: Merge "Fix readx/writex names." | Dan Albert | 2015-02-26 | 1 | -4/+6 |
| | | |\ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | am 9255ad4a: Merge "Fix readx/writex names." | Dan Albert | 2015-02-26 | 1 | -4/+6 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Fix readx/writex names." | Dan Albert | 2015-02-26 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | Fix readx/writex names. | Dan Albert | 2015-02-26 | 1 | -4/+6 |
| |/ / / / / / / / |
|
| | * | | | | | | | am 94cb7fdc: am d795dcc5: am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft." | Dan Albert | 2015-02-25 | 1 | -2/+0 |
| | |\| | | | | | |
|
| | | * | | | | | | am d795dcc5: am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft." | Dan Albert | 2015-02-25 | 1 | -2/+0 |
| | | |\ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft." | Dan Albert | 2015-02-25 | 1 | -2/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft." | Dan Albert | 2015-02-25 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | Remove _(GNU|XOPEN)_SORUCE makefile cruft. | Dan Albert | 2015-02-25 | 1 | -2/+0 |
| | | * | | | | | | | am 07d2542d: am b3f4ed86: am 82eea3fd: Merge "Fix LP64 build for minadbd." | Narayan Kamath | 2015-02-25 | 1 | -2/+2 |
| | | |\| | | | | | |
|
| | | | * | | | | | | am b3f4ed86: am 82eea3fd: Merge "Fix LP64 build for minadbd." | Narayan Kamath | 2015-02-25 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \
| |_|_|_|/ / / / / /
|/| | | | | | | | | |
|
* | | | | | | | | | | am 82eea3fd: Merge "Fix LP64 build for minadbd." | Narayan Kamath | 2015-02-25 | 1 | -2/+2 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Fix LP64 build for minadbd." | Narayan Kamath | 2015-02-25 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| | * | | | | | | | | Fix LP64 build for minadbd. | Narayan Kamath | 2015-02-25 | 1 | -2/+2 |
| |/ / / / / / / / |
|
| | * | | | | | | | am 8007a21e: am 6deb3d5c: am 35fbf787: Merge "Fix build from implicit declaration." | Dan Albert | 2015-02-25 | 4 | -18/+23 |
| | |\| | | | | | |
|
| | | * | | | | | | am 6deb3d5c: am 35fbf787: Merge "Fix build from implicit declaration." | Dan Albert | 2015-02-25 | 4 | -18/+23 |
| | | |\ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | am 35fbf787: Merge "Fix build from implicit declaration." | Dan Albert | 2015-02-25 | 4 | -18/+23 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Fix build from implicit declaration." | Dan Albert | 2015-02-25 | 4 | -18/+23 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | Fix build from implicit declaration. | Dan Albert | 2015-02-25 | 4 | -18/+23 |
| |/ / / / / / / / |
|
| | * | | | | | | | am 218dab7f: am 6f58e899: am 829d392a: Merge "Delete unused functions from minzip." | Narayan Kamath | 2015-02-24 | 2 | -93/+1 |
| | |\| | | | | | |
|
| | | * | | | | | | am 6f58e899: am 829d392a: Merge "Delete unused functions from minzip." | Narayan Kamath | 2015-02-24 | 2 | -93/+1 |
| | | |\ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | am 829d392a: Merge "Delete unused functions from minzip." | Narayan Kamath | 2015-02-24 | 2 | -93/+1 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Delete unused functions from minzip." | Narayan Kamath | 2015-02-24 | 2 | -93/+1 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | Delete unused functions from minzip. | Narayan Kamath | 2015-02-23 | 2 | -93/+1 |
| | | * | | | | | | | am 37e68a1d: am f9ee77ab: am 9e95c515: Merge "Fix a printf format warning." | Narayan Kamath | 2015-02-24 | 0 | -0/+0 |
| | | |\| | | | | | |
|
| | | | * | | | | | | am f9ee77ab: am 9e95c515: Merge "Fix a printf format warning." | Narayan Kamath | 2015-02-24 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \
| |_|_|_|/ / / / / /
|/| | | | | | | | | |
|
* | | | | | | | | | | am 9e95c515: Merge "Fix a printf format warning." | Narayan Kamath | 2015-02-24 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Fix a printf format warning." | Narayan Kamath | 2015-02-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| | * | | | | | | | | Fix a printf format warning. | Narayan Kamath | 2015-02-23 | 1 | -1/+1 |
| |/ / / / / / / / |
|
| | * | | | | | | | am dda456b5: am 552fceb8: am 2d102225: Merge "Kill of most of the remainder of minadbd." | Dan Albert | 2015-02-20 | 8 | -1576/+9 |
| | |\| | | | | | |
|
| | | * | | | | | | am 552fceb8: am 2d102225: Merge "Kill of most of the remainder of minadbd." | Dan Albert | 2015-02-20 | 8 | -1576/+9 |
| | | |\ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | am 2d102225: Merge "Kill of most of the remainder of minadbd." | Dan Albert | 2015-02-20 | 8 | -1576/+9 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Kill of most of the remainder of minadbd." | Dan Albert | 2015-02-20 | 8 | -1576/+9 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | Kill of most of the remainder of minadbd. | Dan Albert | 2015-02-20 | 8 | -1576/+9 |
| |/ / / / / / / / |
|
| | * | | | | | | | am a1df1a77: am c2b60b98: Merge commit \'f8dd04e1a5f94e7accf65a5375114ac7fa73f828\' into HEAD | Bill Yi | 2015-02-20 | 0 | -0/+0 |
| | |\| | | | | | |
|
| | | * | | | | | | am c2b60b98: Merge commit \'f8dd04e1a5f94e7accf65a5375114ac7fa73f828\' into HEAD | Bill Yi | 2015-02-20 | 0 | -0/+0 |
| | | |\ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge commit 'f8dd04e1a5f94e7accf65a5375114ac7fa73f828' into HEAD | Bill Yi | 2015-02-19 | 11 | -118/+584 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | | |
|
| | * | | | | | | | am 9613bd32: am 4eb6c71e: Merge "Move adb_main to its own file." | Dan Albert | 2015-02-19 | 3 | -30/+42 |
| | |\| | | | | | |
|
| | | * | | | | | | am 4eb6c71e: Merge "Move adb_main to its own file." | Dan Albert | 2015-02-19 | 3 | -30/+42 |
| | | |\ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge "Move adb_main to its own file." | Dan Albert | 2015-02-19 | 3 | -30/+42 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Move adb_main to its own file. | Dan Albert | 2015-02-19 | 3 | -30/+42 |
|/ / / / / / / / / |
|
| | * | | | | | | | am 91f68a47: am 5d22a5b5: Merge "Remove dead code." | Dan Albert | 2015-02-19 | 1 | -38/+0 |
| | |\| | | | | | |
|
| | | * | | | | | | am 5d22a5b5: Merge "Remove dead code." | Dan Albert | 2015-02-19 | 1 | -38/+0 |
| | | |\ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge "Remove dead code." | Dan Albert | 2015-02-19 | 1 | -38/+0 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Remove dead code. | Dan Albert | 2015-02-19 | 1 | -38/+0 |
| | | * | | | | | | | am 43162fe5: am 076f5479: Merge "Use headers from adb." | Dan Albert | 2015-02-19 | 7 | -663/+7 |
| | | |\| | | | | | |
|
| | | | * | | | | | | am 076f5479: Merge "Use headers from adb." | Dan Albert | 2015-02-19 | 7 | -663/+7 |
| | | | |\ \ \ \ \ \
| |_|_|_|/ / / / / /
|/| | | | | | | | | |
|
* | | | | | | | | | | Merge "Use headers from adb." | Dan Albert | 2015-02-19 | 7 | -663/+7 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Use headers from adb. | Dan Albert | 2015-02-19 | 7 | -663/+7 |
|/ / / / / / / / / |
|
| | * | | | | | | | am 61398da2: am bbf627a6: Merge "Remove unused code." | Dan Albert | 2015-02-19 | 3 | -183/+0 |
| | |\| | | | | | |
|
| | | * | | | | | | am bbf627a6: Merge "Remove unused code." | Dan Albert | 2015-02-19 | 3 | -183/+0 |
| | | |\ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge "Remove unused code." | Dan Albert | 2015-02-19 | 3 | -183/+0 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Remove unused code. | Dan Albert | 2015-02-19 | 3 | -183/+0 |
| | | * | | | | | | | am bf1476de: am 4db055d6: Merge "Lose USB transport code to libadb." | Dan Albert | 2015-02-19 | 6 | -1470/+3 |
| | | |\| | | | | | |
|
| | | | * | | | | | | am 4db055d6: Merge "Lose USB transport code to libadb." | Dan Albert | 2015-02-19 | 6 | -1470/+3 |
| | | | |\ \ \ \ \ \
| |_|_|_|/ / / / / /
|/| | | | | | | | | |
|
* | | | | | | | | | | Merge "Lose USB transport code to libadb." | Dan Albert | 2015-02-19 | 6 | -1470/+3 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Lose USB transport code to libadb. | Dan Albert | 2015-02-19 | 6 | -1470/+3 |
|/ / / / / / / / / |
|
| | * | | | | | | | am ecb0ad25: am 37e933a7: Merge "Add extern "C" to all the headers." | Dan Albert | 2015-02-19 | 6 | -0/+52 |
| | |\| | | | | | |
|
| | | * | | | | | | am 37e933a7: Merge "Add extern "C" to all the headers." | Dan Albert | 2015-02-18 | 6 | -0/+52 |
| | |/| | | | | |
| |/|/ / / / / /
| |/| | | | | |
|/| | | | | | | |
|
* | | | | | | | | Merge "Add extern "C" to all the headers." | Dan Albert | 2015-02-18 | 6 | -0/+52 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Add extern "C" to all the headers. | Dan Albert | 2015-02-18 | 6 | -0/+52 |
|/ / / / / / / / |
|
| | * | | | | | | Initialize stashbase even stash_max_blocks = 0 | Jesse Zhao | 2015-02-18 | 1 | -1/+1 |
| | * | | | | | | am f8dd04e1: am ff934d02: Merge "Fix Droid and animation color in recovery mode" | Elliott Hughes | 2015-02-12 | 5 | -14/+25 |
| | |\ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| * | | | | | | | am ff934d02: Merge "Fix Droid and animation color in recovery mode" | Elliott Hughes | 2015-02-12 | 5 | -14/+25 |
| |\ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | | |
|
* | | | | | | | | Merge "Fix Droid and animation color in recovery mode" | Elliott Hughes | 2015-02-12 | 5 | -14/+25 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Fix Droid and animation color in recovery mode | Tony Kuo | 2015-02-12 | 5 | -14/+25 |
|/ / / / / / / / |
|
| | * | | | | | | am adf71bf7: am 5db3f978: Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined" | Elliott Hughes | 2015-02-11 | 1 | -1/+3 |
| | |\ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| * | | | | | | | am 5db3f978: Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined" | Elliott Hughes | 2015-02-11 | 1 | -1/+3 |
| |\ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | | |
|
* | | | | | | | | Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined" | Elliott Hughes | 2015-02-11 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined | Adrien Grassein | 2014-11-07 | 1 | -1/+3 |
| | | * | | | | | | am 98e2c509: am 78aa50d3: Merge "recovery: Handle EV_SW events" | Elliott Hughes | 2015-02-11 | 1 | -2/+2 |
| | | |\ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | am 78aa50d3: Merge "recovery: Handle EV_SW events" | Elliott Hughes | 2015-02-11 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge "recovery: Handle EV_SW events" | Elliott Hughes | 2015-02-11 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | recovery: Handle EV_SW events | Ajay Dudani | 2015-02-11 | 1 | -2/+2 |
|/ / / / / / / / / |
|
| | | * | | | | | | am ee7127cc: am bf0be350: Merge "recovery: Generate libminui dynamic library" | Elliott Hughes | 2015-02-11 | 1 | -0/+7 |
| | | |\ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | am bf0be350: Merge "recovery: Generate libminui dynamic library" | Elliott Hughes | 2015-02-11 | 1 | -0/+7 |
| | |\ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge "recovery: Generate libminui dynamic library" | Elliott Hughes | 2015-02-11 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | recovery: Generate libminui dynamic library | Ajay Dudani | 2015-02-11 | 1 | -0/+7 |
|/ / / / / / / / / |
|
| | | * | | | | | | am dcbf4fc5: resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aosp | Elliott Hughes | 2015-02-11 | 3 | -6/+10 |
| | | |\ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aosp | Elliott Hughes | 2015-02-11 | 3 | -6/+10 |
| | |\ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge "recovery: Properly detect userdebug or eng builds" | Elliott Hughes | 2015-02-11 | 3 | -6/+10 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | recovery: Properly detect userdebug or eng builds | Elliott Hughes | 2015-02-10 | 3 | -6/+10 |
|/ / / / / / / / / |
|
| | | * | | | | | | am ec5c1c1e: am 99e084ca: Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read" | Nick Kralevich | 2015-02-09 | 3 | -23/+8 |
| | | |\ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | am 99e084ca: Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read" | Nick Kralevich | 2015-02-08 | 3 | -23/+8 |
| | |\ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read" | Nick Kralevich | 2015-02-08 | 3 | -23/+8 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Remove dead/unused code and realign some of the comments | Nanik Tolaram | 2015-02-08 | 3 | -23/+8 |
|/ / / / / / / / / |
|
| | | * | | | | | | am 42b09d25: am 6a0d2fbc: Merge "There\'s no GPL code in \'updater\'." | Elliott Hughes | 2015-02-09 | 2 | -339/+0 |
| | | |\ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | am 6a0d2fbc: Merge "There\'s no GPL code in \'updater\'." | Elliott Hughes | 2015-02-07 | 2 | -339/+0 |
| | |\ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge "There's no GPL code in 'updater'." | Elliott Hughes | 2015-02-07 | 2 | -339/+0 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | There's no GPL code in 'updater'. | Elliott Hughes | 2015-02-05 | 2 | -339/+0 |
|/ / / / / / / / / |
|
| | | * | | | | | | Merge "Support resuming block based OTAs" | Sami Tolvanen | 2015-02-06 | 1 | -346/+1460 |
| | | |\ \ \ \ \ \ |
|
| | | | * | | | | | | Support resuming block based OTAs | Sami Tolvanen | 2015-01-30 | 1 | -346/+1460 |
| | | * | | | | | | | am 40862ab5: am aeecac54: Merge "Add missing includes." | Elliott Hughes | 2015-01-30 | 11 | -0/+12 |
| | | |\ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| / / / / / /
| | | |/ / / / / / |
|
| | * | | | | | | | am aeecac54: Merge "Add missing includes." | Elliott Hughes | 2015-01-30 | 11 | -0/+12 |
| | |\ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge "Add missing includes." | Elliott Hughes | 2015-01-30 | 11 | -0/+12 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Add missing includes. | Elliott Hughes | 2015-01-30 | 11 | -0/+12 |
|/ / / / / / / / / |
|
| | | * | | | | | | am 22b8fe96: am dab56cac: Merge "Add missing includes." | Elliott Hughes | 2015-01-28 | 4 | -2/+6 |
| | | |\ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | am dab56cac: Merge "Add missing includes." | Elliott Hughes | 2015-01-28 | 4 | -2/+6 |
| | |\ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge "Add missing includes." | Elliott Hughes | 2015-01-28 | 4 | -2/+6 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Add missing includes. | Elliott Hughes | 2015-01-28 | 4 | -2/+6 |
|/ / / / / / / / / |
|
| | | * | | | | | | am 88c30fb6: am eaeb55f7: Merge "Start losing code to libadb." | Dan Albert | 2015-01-27 | 3 | -698/+1 |
| | | |\ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | am eaeb55f7: Merge "Start losing code to libadb." | Dan Albert | 2015-01-27 | 3 | -698/+1 |
| | |\ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge "Start losing code to libadb." | Dan Albert | 2015-01-27 | 3 | -698/+1 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Start losing code to libadb. | Dan Albert | 2014-11-25 | 3 | -698/+1 |
| | | | * | | | | | | am 2d67a483: am cdc38d04: Merge "Fix the v2 descriptor handling." | Christopher Ferris | 2015-01-26 | 1 | -11/+6 |
| | | | |\ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | am cdc38d04: Merge "Fix the v2 descriptor handling." | Christopher Ferris | 2015-01-26 | 1 | -11/+6 |
| | | |\ \ \ \ \ \ \
| |_|_|/ / / / / / /
|/| | | | | | | | | |
|
* | | | | | | | | | | Merge "Fix the v2 descriptor handling." | Christopher Ferris | 2015-01-26 | 1 | -11/+6 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Fix the v2 descriptor handling. | Christopher Ferris | 2015-01-26 | 1 | -11/+6 |
| | | | | * | | | | | | am efa16af5: am cad5ce81: Merge "adbd: Support for new f_fs descriptor format" | Christopher Ferris | 2015-01-26 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \
| | | | | |/ / / / / /
| | | | |/| | | | | | |
|
| | | | * | | | | | | | am cad5ce81: Merge "adbd: Support for new f_fs descriptor format" | Christopher Ferris | 2015-01-26 | 1 | -54/+107 |
| | | | |\ \ \ \ \ \ \
| |_|_|_|/ / / / / / /
|/| | | | | | | | | | |
|
* | | | | | | | | | | | Merge "adbd: Support for new f_fs descriptor format" | Christopher Ferris | 2015-01-26 | 1 | -54/+107 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | adbd: Support for new f_fs descriptor format | Badhri Jagan Sridharan | 2015-01-26 | 1 | -54/+107 |
| | | | | * | | | | | | am 4db9c893: am d4069928: Merge "Add missing <string.h> include." | Elliott Hughes | 2015-01-25 | 1 | -0/+1 |
| | | | | |\ \ \ \ \ \
| | | | | |/ / / / / /
| | | | |/| | | | | | |
|
| | | | * | | | | | | | am d4069928: Merge "Add missing <string.h> include." | Elliott Hughes | 2015-01-25 | 1 | -0/+1 |
| | | | |\ \ \ \ \ \ \
| |_|_|_|/ / / / / / /
|/| | | | | | | | | | |
|
* | | | | | | | | | | | Merge "Add missing <string.h> include." | Elliott Hughes | 2015-01-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | Add missing <string.h> include. | Elliott Hughes | 2015-01-25 | 1 | -0/+1 |
| | | | | * | | | | | | am e84e9310: am eade3a80: Merge "Remove superfluous OpenSSL include paths." | Kenny Root | 2015-01-23 | 1 | -1/+0 |
| | | | | |\ \ \ \ \ \
| | | | | |/ / / / / /
| | | | |/| | | | | | |
|
| | | | * | | | | | | | am eade3a80: Merge "Remove superfluous OpenSSL include paths." | Kenny Root | 2015-01-23 | 1 | -1/+0 |
| | | | |\ \ \ \ \ \ \
| |_|_|_|/ / / / / / /
|/| | | | | | | | | | |
|
* | | | | | | | | | | | Merge "Remove superfluous OpenSSL include paths." | Kenny Root | 2015-01-23 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | Remove superfluous OpenSSL include paths. | Adam Langley | 2015-01-23 | 1 | -1/+0 |
|/ / / / / / / / / / |
|
| | | | * | | | | | | am 465e8702: am 5bf74b23: Bump up max_map_count value. | Jesse Zhao | 2015-01-15 | 1 | -0/+1 |
| | | | |\ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | am 5bf74b23: Bump up max_map_count value. | Jesse Zhao | 2015-01-15 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \
| | | | | |/ / / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Bump up max_map_count value. | Jesse Zhao | 2015-01-09 | 1 | -0/+1 |
| | | | | * | | | | | am 479e5108: am dd719dfe: Merge "Use getmntent when accessing /proc/mounts." | Yabin Cui | 2015-01-06 | 1 | -75/+14 |
| | | | | |\ \ \ \ \
| | | | |_|/ / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | am dd719dfe: Merge "Use getmntent when accessing /proc/mounts." | Yabin Cui | 2015-01-06 | 1 | -75/+14 |
| | | |\ \ \ \ \ \ \
| |_|_|/ / / / / / /
|/| | | | | | | | | |
|
* | | | | | | | | | | Merge "Use getmntent when accessing /proc/mounts." | Yabin Cui | 2015-01-06 | 1 | -75/+14 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Use getmntent when accessing /proc/mounts. | Yabin Cui | 2015-01-02 | 1 | -75/+14 |
| | | | | | * | | | | | am 6bec0e51: am a5d63956: Merge "Remove an uninitialized value." | Dan Albert | 2015-01-05 | 1 | -2/+1 |
| | | | | | |\ \ \ \ \
| | | | | |_|/ / / / /
| | | | |/| | | | | | |
|
| | | | * | | | | | | | am a5d63956: Merge "Remove an uninitialized value." | Dan Albert | 2015-01-05 | 1 | -2/+1 |
| | | | |\ \ \ \ \ \ \
| |_|_|_|/ / / / / / /
|/| | | | | | | | | | |
|
* | | | | | | | | | | | Merge "Remove an uninitialized value." | Dan Albert | 2015-01-05 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | Remove an uninitialized value. | Dan Albert | 2014-12-18 | 1 | -2/+1 |
| | | | | | * | | | | | am 6bb8f476: am 538d7d83: Merge "Fix missing #includes in bootable/recovery." | Elliott Hughes | 2014-12-30 | 2 | -2/+4 |
| | | | | | |\ \ \ \ \
| | | | | |_|/ / / / /
| | | | |/| | | | | | |
|
| | | | * | | | | | | | am 538d7d83: Merge "Fix missing #includes in bootable/recovery." | Elliott Hughes | 2014-12-30 | 2 | -2/+4 |
| | | | |\ \ \ \ \ \ \
| |_|_|_|/ / / / / / /
|/| | | | | | | | | | |
|
* | | | | | | | | | | | Merge "Fix missing #includes in bootable/recovery." | Elliott Hughes | 2014-12-29 | 2 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | Fix missing #includes in bootable/recovery. | Elliott Hughes | 2014-12-29 | 2 | -2/+4 |
|/ / / / / / / / / / |
|
| | | | | * | | | | | am 8af7c5df: am a72512cd: Add O_CREAT option for open | Sungmin Choi | 2014-12-11 | 1 | -2/+10 |
| | | | | |\ \ \ \ \
| | | | |_|/ / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | am a72512cd: Add O_CREAT option for open | Sungmin Choi | 2014-12-11 | 1 | -2/+10 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Add O_CREAT option for open | Sungmin Choi | 2014-12-11 | 1 | -2/+10 |
| | | | | * | | | | | am cb1a7502: am f59b9942: Add basic navigation controls to log viewer. | Patrick Tjin | 2014-12-10 | 1 | -2/+36 |
| | | | | |\ \ \ \ \
| | | | |_|/ / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | am f59b9942: Add basic navigation controls to log viewer. | Patrick Tjin | 2014-12-10 | 1 | -2/+36 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Add basic navigation controls to log viewer. | Patrick Tjin | 2014-12-10 | 1 | -2/+36 |
| | | | | * | | | | | am 8e8d5de4: am cd055ee7: Save kernel logs to /cache/recovery | Patrick Tjin | 2014-12-10 | 1 | -6/+60 |
| | | | | |\ \ \ \ \
| | | | |_|/ / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | am cd055ee7: Save kernel logs to /cache/recovery | Patrick Tjin | 2014-12-10 | 1 | -6/+60 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Save kernel logs to /cache/recovery | Patrick Tjin | 2014-12-10 | 1 | -6/+60 |
| | | | | * | | | | | am 4f9fcffc: am 37ad1f12: Merge "Force write to disk while doing uncrypt" into lmp-mr1-dev | Michael Runge | 2014-12-10 | 1 | -5/+10 |
| | | | | |\ \ \ \ \
| | | | |_|/ / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | am 37ad1f12: Merge "Force write to disk while doing uncrypt" into lmp-mr1-dev | Michael Runge | 2014-12-10 | 1 | -5/+10 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "Force write to disk while doing uncrypt" into lmp-mr1-dev | Michael Runge | 2014-12-10 | 1 | -5/+10 |
| | | | |\ \ \ \ \ \ |
|
| | | | | * | | | | | | Force write to disk while doing uncrypt | Michael Runge | 2014-11-22 | 1 | -5/+10 |
| | | | | | * | | | | | am cdce7f7e: am c43b17f0: Merge "Fix recovery image build for 32p" | Ying Wang | 2014-12-02 | 1 | -1/+1 |
| | | | | | |\ \ \ \ \
| | | | |_|_|/ / / / /
| | | |/| | | | | | | |
|
| | | * | | | | | | | | am c43b17f0: Merge "Fix recovery image build for 32p" | Ying Wang | 2014-12-02 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \
| |_|_|/ / / / / / / /
|/| | | | | | | | | | |
|
* | | | | | | | | | | | Merge "Fix recovery image build for 32p" | Ying Wang | 2014-12-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | Fix recovery image build for 32p | Bruce Beare | 2014-12-01 | 1 | -1/+1 |
|/ / / / / / / / / / |
|
| | | | | * | | | | | am 0fe938c0: am 5b9c4ce5: am b278c252: Add support for tune2fs file operations | Michael Runge | 2014-11-24 | 0 | -0/+0 |
| | | | | |\ \ \ \ \
| | | |_|_|/ / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | am 5b9c4ce5: am b278c252: Add support for tune2fs file operations | Michael Runge | 2014-11-24 | 2 | -0/+43 |
| | |\| | | | | | | |
|
| | | * | | | | | | | am b278c252: Add support for tune2fs file operations | Michael Runge | 2014-11-24 | 2 | -0/+43 |
| | | |\ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | / / / /
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | Add support for tune2fs file operations | Michael Runge | 2014-11-21 | 2 | -0/+43 |
| | | | | * | | | | Add support for tune2fs file operations | Michael Runge | 2014-11-22 | 2 | -0/+43 |
| | | | | * | | | | am 39be2f64: am d34b6378: Merge "Global C++11 compatibility." | Dan Albert | 2014-11-21 | 1 | -3/+4 |
| | | | | |\ \ \ \
| | | |_|_|/ / / /
| | |/| | | | | | |
|
| | * | | | | | | | am d34b6378: Merge "Global C++11 compatibility." | Dan Albert | 2014-11-21 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge "Global C++11 compatibility." | Dan Albert | 2014-11-20 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Global C++11 compatibility. | Dan Albert | 2014-11-20 | 1 | -3/+4 |
|/ / / / / / / / / |
|
| | | | | * | | | | am 71fa5392: am de27d4cb: am e5879c36: Byte swap to support BGRA in recovery mode | Heather Lee Wilson | 2014-11-15 | 1 | -0/+12 |
| | | | | |\ \ \ \
| | | |_|_|/ / / /
| | |/| | | | | | |
|
| | * | | | | | | | am de27d4cb: am e5879c36: Byte swap to support BGRA in recovery mode | Heather Lee Wilson | 2014-11-15 | 1 | -0/+12 |
| | |\| | | | | | |
|
| | | * | | | | | | am e5879c36: Byte swap to support BGRA in recovery mode | Heather Lee Wilson | 2014-11-14 | 1 | -0/+12 |
| | | |\| | | | | |
|
| | | | * | | | | | Byte swap to support BGRA in recovery mode | Heather Lee Wilson | 2014-11-14 | 1 | -0/+12 |
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | am 82ca0ba8: am 92242c70: Merge "kill HAVE_FORKEXEC" | Yabin Cui | 2014-11-14 | 1 | -1/+1 |
| | | | | |\ \ \
| | | |_|_|/ / /
| | |/| | | | | |
|
| | * | | | | | | am 92242c70: Merge "kill HAVE_FORKEXEC" | Yabin Cui | 2014-11-13 | 1 | -1/+1 |
| | |\ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | | | |
|
* | | | | | | | | Merge "kill HAVE_FORKEXEC" | Yabin Cui | 2014-11-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | | |
|
| * | | | | | | | kill HAVE_FORKEXEC | Yabin Cui | 2014-11-13 | 1 | -1/+1 |
|/ / / / / / / |
|
| | | | * | | | am 8bebe58e: am 2020564f: am be81e51c: Use more aggressive sync writing to applypatch. | Michael Runge | 2014-10-31 | 1 | -8/+36 |
| | | | |\ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| * | | | | | | am 2020564f: am be81e51c: Use more aggressive sync writing to applypatch. | Michael Runge | 2014-10-31 | 1 | -8/+36 |
| |\| | | | | |
|
| | * | | | | | am be81e51c: Use more aggressive sync writing to applypatch. | Michael Runge | 2014-10-29 | 1 | -8/+36 |
| | |\| | | | |
|
| | | * | | | | Use more aggressive sync writing to applypatch. | Michael Runge | 2014-10-29 | 1 | -8/+36 |
| | | | * | | | am c2e7d903: am e908a454: am 042c3cd0: Force sync files written by minzip. | Michael Runge | 2014-10-31 | 1 | -2/+8 |
| | | | |\ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| * | | | | | | am e908a454: am 042c3cd0: Force sync files written by minzip. | Michael Runge | 2014-10-31 | 1 | -2/+8 |
| |\| | | | | |
|
| | * | | | | | am 042c3cd0: Force sync files written by minzip. | Michael Runge | 2014-10-29 | 1 | -2/+8 |
| | |\| | | | |
|
| | | * | | | | Force sync files written by minzip. | Michael Runge | 2014-10-29 | 1 | -2/+8 |
| | | | * | | | adbd: Support for new f_fs descriptor format | Badhri Jagan Sridharan | 2014-10-28 | 1 | -54/+107 |
| | | | * | | | am 8a9ee089: am fe8563f4: am 5ddf4293: Log mount/unmount errors to UI | Michael Runge | 2014-10-25 | 1 | -5/+9 |
| | | | |\ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| * | | | | | | am fe8563f4: am 5ddf4293: Log mount/unmount errors to UI | Michael Runge | 2014-10-25 | 1 | -5/+9 |
| |\| | | | | |
|
| | * | | | | | am 5ddf4293: Log mount/unmount errors to UI | Michael Runge | 2014-10-25 | 1 | -5/+9 |
| | |\| | | | |
|
| | | * | | | | Log mount/unmount errors to UI | Michael Runge | 2014-10-24 | 1 | -5/+9 |
| | | | * | | | am 944fc5e6: am 915d661c: am 68802416: unconditionally apply SELinux labels to symlinks | Nick Kralevich | 2014-10-24 | 1 | -10/+9 |
| | | | |\ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| * | | | | | | am 915d661c: am 68802416: unconditionally apply SELinux labels to symlinks | Nick Kralevich | 2014-10-24 | 1 | -10/+9 |
| |\| | | | | |
|
| | * | | | | | am 68802416: unconditionally apply SELinux labels to symlinks | Nick Kralevich | 2014-10-24 | 1 | -10/+9 |
| | |\| | | | |
|
| | | * | | | | unconditionally apply SELinux labels to symlinks | Nick Kralevich | 2014-10-24 | 1 | -10/+9 |
| | | | * | | | am 45322f93: am da500cec: am 168f7778: Allow passing of mount args to mountFn | Michael Runge | 2014-10-24 | 1 | -5/+18 |
| | | | |\ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| * | | | | | | am da500cec: am 168f7778: Allow passing of mount args to mountFn | Michael Runge | 2014-10-24 | 1 | -5/+18 |
| |\| | | | | |
|
| | * | | | | | am 168f7778: Allow passing of mount args to mountFn | Michael Runge | 2014-10-23 | 1 | -5/+18 |
| | |\| | | | |
|
| | | * | | | | Allow passing of mount args to mountFn | Michael Runge | 2014-10-23 | 1 | -5/+18 |
| | | | * | | | am d1e909e7: am 4da9cdea: am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-dev | Brian Carlstrom | 2014-10-24 | 1 | -34/+50 |
| | | | |\ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| * | | | | | | am 4da9cdea: am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-dev | Brian Carlstrom | 2014-10-24 | 1 | -34/+50 |
| |\| | | | | |
|
| | * | | | | | am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-dev | Brian Carlstrom | 2014-10-23 | 1 | -34/+50 |
| | |\| | | | |
|
| | | * | | | | Merge "Log to UI any metadata setting errors" into lmp-dev | Brian Carlstrom | 2014-10-23 | 1 | -34/+50 |
| | | |\ \ \ \ |
|
| | | | * | | | | Log to UI any metadata setting errors | Michael Runge | 2014-10-23 | 1 | -34/+50 |
| | | | | * | | | am 3e62e9d9: am d0602fbb: am 9b2db80d: Merge "Make /cache/recovery/last_log available in recovery" into lmp-dev | Nick Kralevich | 2014-10-23 | 3 | -5/+76 |
| | | | | |\ \ \
| | |_|_|_|/ / /
| |/| | | | | | |
|
| * | | | | | | | am d0602fbb: am 9b2db80d: Merge "Make /cache/recovery/last_log available in recovery" into lmp-dev | Nick Kralevich | 2014-10-23 | 3 | -5/+76 |
| |\| | | | | | |
|
| | * | | | | | | am 9b2db80d: Merge "Make /cache/recovery/last_log available in recovery" into lmp-dev | Nick Kralevich | 2014-10-23 | 3 | -5/+76 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Make /cache/recovery/last_log available in recovery" into lmp-dev | Nick Kralevich | 2014-10-23 | 3 | -5/+76 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | Make /cache/recovery/last_log available in recovery | Nick Kralevich | 2014-10-23 | 3 | -5/+76 |
| | | | |/ / / / |
|
| | | | | * | | | am c224ac28: am 3b5c6dca: am 2f0ef730: Treat already-renamed files as having no problems. | Michael Runge | 2014-10-23 | 1 | -0/+3 |
| | | | | |\ \ \
| | |_|_|_|/ / /
| |/| | | | | | |
|
| * | | | | | | | am 3b5c6dca: am 2f0ef730: Treat already-renamed files as having no problems. | Michael Runge | 2014-10-23 | 1 | -0/+3 |
| |\| | | | | | |
|
| | * | | | | | | am 2f0ef730: Treat already-renamed files as having no problems. | Michael Runge | 2014-10-23 | 1 | -0/+3 |
| | |\| | | | | |
|
| | | * | | | | | Treat already-renamed files as having no problems. | Michael Runge | 2014-10-23 | 1 | -0/+3 |
| | | |/ / / / |
|
| | | | * | | | am 0745fbfa: am c7249660: am 4f66469b: Merge "More test makefile cleanup." | Dan Albert | 2014-10-23 | 0 | -0/+0 |
| | | | |\ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| * | | | | | | am c7249660: am 4f66469b: Merge "More test makefile cleanup." | Dan Albert | 2014-10-23 | 0 | -0/+0 |
| |\ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
* | | | | | | | am 4f66469b: Merge "More test makefile cleanup." | Dan Albert | 2014-10-17 | 1 | -24/+23 |
|\ \ \ \ \ \ \ |
|
| | | | | * \ \ | am 440185cd: am ea5828a2: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb."" | Dan Albert | 2014-10-23 | 0 | -0/+0 |
| | | | | |\ \ \
| | | |_|_|/ / /
| | |/| | | | | |
|
| | * | | | | | | am ea5828a2: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb."" | Dan Albert | 2014-10-23 | 0 | -0/+0 |
| | |\ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | | | |
|
* | | | | | | | | am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb."" | Dan Albert | 2014-09-26 | 1 | -4/+21 |
|\ \ \ \ \ \ \ \ |
|
| | | | | | * \ \ | am 39705685: am e95ed95f: am a6e13ae0: Include reason when wiping data. | Jeff Sharkey | 2014-10-23 | 0 | -0/+0 |
| | | | | | |\ \ \
| | | | |_|_|/ / /
| | | |/| | | | | |
|
| | | * | | | | | | am e95ed95f: am a6e13ae0: Include reason when wiping data. | Jeff Sharkey | 2014-10-23 | 0 | -0/+0 |
| | | |\ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | am a6e13ae0: Include reason when wiping data. | Jeff Sharkey | 2014-09-25 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \
| | |_|_|_|/ / / /
| |/| | | | | | | |
|
| | | | | | * | | | am e5ce559f: am 78a30278: am 530b61e0: Merge "Copy epoll(2) changes to minadb." | Elliott Hughes | 2014-10-23 | 0 | -0/+0 |
| | | | | | |\ \ \
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | * | | | | | am 78a30278: am 530b61e0: Merge "Copy epoll(2) changes to minadb." | Elliott Hughes | 2014-10-23 | 0 | -0/+0 |
| | | | |\ \ \ \ \
| |_|_|_|/ / / / /
|/| | | | | | | | |
|
* | | | | | | | | | am 530b61e0: Merge "Copy epoll(2) changes to minadb." | Elliott Hughes | 2014-09-23 | 1 | -21/+4 |
|\ \ \ \ \ \ \ \ \ |
|
| | | | | | | * \ \ | am dd57886c: am 9eb8c8bd: init.rc: Inidicate that booting is complete wrt firwmare requests | JP Abgrall | 2014-10-21 | 1 | -1/+6 |
| | | | | | | |\ \ \
| | | | | | |_|/ / /
| | | | | |/| | | | |
|
| | | | | * | | | | | am 9eb8c8bd: init.rc: Inidicate that booting is complete wrt firwmare requests | JP Abgrall | 2014-10-21 | 1 | -1/+6 |
| | | | | |\| | | | |
|
| | | | | | * | | | | init.rc: Inidicate that booting is complete wrt firwmare requests | JP Abgrall | 2014-10-21 | 1 | -1/+6 |
| | | | | | | * | | | am 5b7f5b15: am 4f66469b: Merge "More test makefile cleanup." | Dan Albert | 2014-10-17 | 1 | -24/+23 |
| | | | | | | |\ \ \
| | | | | | |_|/ / /
| | | | | |/| | | | |
|
| | | | | * | | | | | am 4f66469b: Merge "More test makefile cleanup." | Dan Albert | 2014-10-17 | 1 | -24/+23 |
| | | | | |\ \ \ \ \
| | | | | |/ / / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Merge "More test makefile cleanup." | Dan Albert | 2014-10-17 | 1 | -24/+23 |
| | | |/| | | | | | |
|
| | | | * | | | | | | More test makefile cleanup. | Dan Albert | 2014-10-17 | 1 | -24/+23 |
| | | |/ / / / / / |
|
| | | | | | * | | | am 93ecb938: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb."" | Dan Albert | 2014-09-26 | 1 | -4/+21 |
| | | | | | |\ \ \
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | * | | | | | am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb."" | Dan Albert | 2014-09-26 | 1 | -4/+21 |
| | | | |\ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "Revert "Copy epoll(2) changes to minadb."" | Dan Albert | 2014-09-26 | 1 | -4/+21 |
| | |/| | | | | |
| |/| | | | | | | |
|
| | | * | | | | | | Revert "Copy epoll(2) changes to minadb." | Dan Albert | 2014-09-26 | 1 | -4/+21 |
| | |/ / / / / /
| |/| | | | | | |
|
| | | | | * | | | am 91c27888: am d83e4f15: support for version 2 of block image diffs | Doug Zongker | 2014-09-26 | 0 | -0/+0 |
| | | | | |\ \ \
| | | | |_|/ / /
| | | |/| | | | |
|
| | | * | | | | | am d83e4f15: support for version 2 of block image diffs | Doug Zongker | 2014-09-26 | 1 | -45/+209 |
| | | |\| | | | |
|
| | | | * | | | | support for version 2 of block image diffs | Doug Zongker | 2014-09-26 | 1 | -45/+209 |
| | | |/ / / /
| | |/| | | | |
|
| | | | * | | | am 62656652: am a6e13ae0: Include reason when wiping data. | Jeff Sharkey | 2014-09-25 | 1 | -0/+4 |
| | | | |\ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | am a6e13ae0: Include reason when wiping data. | Jeff Sharkey | 2014-09-25 | 1 | -0/+4 |
| | | |\ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Include reason when wiping data. | Jeff Sharkey | 2014-09-24 | 1 | -0/+4 |
| |/ / / / /
|/| | | | | |
|
| | | * | | | am 970c3947: am 530b61e0: Merge "Copy epoll(2) changes to minadb." | Elliott Hughes | 2014-09-23 | 1 | -21/+4 |
| | | |\ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | am 530b61e0: Merge "Copy epoll(2) changes to minadb." | Elliott Hughes | 2014-09-23 | 1 | -21/+4 |
| |/| | | |
|/|/ / / / |
|
| * | | | | Merge "Copy epoll(2) changes to minadb." | Elliott Hughes | 2014-09-23 | 1 | -21/+4 |
| |\ \ \ \ |
|
| | * | | | | Copy epoll(2) changes to minadb. | Elliott Hughes | 2014-09-23 | 1 | -21/+4 |
| |/ / / / |
|
| | * | | | Use the correct fuse_init_out structure size. | Christopher Ferris | 2014-09-18 | 1 | -2/+28 |
| | * | | | support for version 2 of block image diffs | Doug Zongker | 2014-09-08 | 1 | -45/+209 |
| | * | | | am 574443d8: create block map for all update packages on /data | Doug Zongker | 2014-09-05 | 1 | -12/+9 |
| | |\ \ \
| |_|/ / /
|/| | | | |
|
* | | | | | create block map for all update packages on /data | Doug Zongker | 2014-09-05 | 1 | -12/+9 |
| | * | | | am 40482ea2: Merge "fix comment in blockimg updater code" into lmp-dev | Doug Zongker | 2014-09-04 | 1 | -3/+3 |
| | |\ \ \
| |_|/ / /
|/| | | | |
|
* | | | | | Merge "fix comment in blockimg updater code" into lmp-dev | Doug Zongker | 2014-09-04 | 1 | -3/+3 |
|\ \ \ \ \ |
|
| * | | | | | fix comment in blockimg updater code | Doug Zongker | 2014-09-04 | 1 | -3/+3 |
| | | * | | | am 8328922f: use lseek64 instead of lseek | Andrew Boie | 2014-09-04 | 1 | -11/+11 |
| | | |\ \ \
| |_|_|/ / /
|/| | | | | |
|
* | | | | | | use lseek64 instead of lseek | Andrew Boie | 2014-09-04 | 1 | -11/+11 |
|/ / / / / |
|
| | * | | | am 5f875bf5: remove code for original block OTA mechanism | Doug Zongker | 2014-08-27 | 0 | -0/+0 |
| | |\ \ \
| |_|/ / /
|/| | | | |
|
* | | | | | remove code for original block OTA mechanism | Doug Zongker | 2014-08-26 | 2 | -209/+6 |
| | * | | | Merge "remove code for original block OTA mechanism" | Doug Zongker | 2014-08-26 | 2 | -209/+6 |
| | |\ \ \ |
|
| | | * | | | remove code for original block OTA mechanism | Doug Zongker | 2014-08-25 | 2 | -209/+6 |
| | * | | | | am f449db2f: open misc device in write-only mode | Doug Zongker | 2014-08-26 | 2 | -19/+27 |
| | |\ \ \ \
| |_|/ / / /
|/| | / / /
| | |/ / / |
|
* | | | | | open misc device in write-only mode | Doug Zongker | 2014-08-26 | 2 | -19/+27 |
| | * | | | am 1d5d6098: fix two bugs in block image updater | Doug Zongker | 2014-08-21 | 1 | -18/+32 |
| | |\ \ \
| |_|/ / /
|/| | | | |
|
* | | | | | fix two bugs in block image updater | Doug Zongker | 2014-08-21 | 1 | -18/+32 |
| | * | | | am bc7ffeda: installer for new block OTA system | Doug Zongker | 2014-08-20 | 0 | -0/+0 |
| | |\ \ \
| |_|/ / /
|/| | | | |
|
* | | | | | installer for new block OTA system | Doug Zongker | 2014-08-20 | 10 | -10/+669 |
| | * | | | Merge "installer for new block OTA system" | Doug Zongker | 2014-08-19 | 10 | -10/+669 |
| | |\ \ \ |
|
| | | * | | | installer for new block OTA system | Doug Zongker | 2014-08-19 | 10 | -10/+669 |
| | * | | | | am 2efc9d99: clear BCB in misc partition before rebooting | Doug Zongker | 2014-08-19 | 1 | -3/+43 |
| | |\ \ \ \
| |_|/ / / /
|/| | / / /
| | |/ / / |
|
* | | | | | clear BCB in misc partition before rebooting | Doug Zongker | 2014-08-19 | 1 | -3/+43 |
| | * | | | am 1a35a586: revert uncrypt back to dynamic linking, fix libs | Doug Zongker | 2014-08-15 | 1 | -6/+1 |
| | |\ \ \
| |_|/ / /
|/| | | | |
|
* | | | | | revert uncrypt back to dynamic linking, fix libs | Doug Zongker | 2014-08-14 | 1 | -6/+1 |
| | * | | | am 537d34f9: change uncrypt to static linking | Doug Zongker | 2014-08-15 | 1 | -0/+2 |
| | |\ \ \
| |_|/ / /
|/| | | | |
|
* | | | | | change uncrypt to static linking | Doug Zongker | 2014-08-14 | 1 | -0/+2 |
| | * | | | am 9dc71cfa: Merge "Erase PST partition if its marked to be erased." into lmp-dev | Andres Morales | 2014-08-06 | 3 | -0/+44 |
| | |\ \ \
| |_|/ / /
|/| | | | |
|
* | | | | | Merge "Erase PST partition if its marked to be erased." into lmp-dev | Andres Morales | 2014-08-05 | 3 | -0/+44 |
|\ \ \ \ \ |
|
| * | | | | | Erase PST partition if its marked to be erased. | Andres Morales | 2014-08-06 | 3 | -0/+44 |
| | | * | | | am 2b5f0e0f: remove spurious parens from error message | Doug Zongker | 2014-08-06 | 1 | -4/+3 |
| | | |\ \ \
| |_|_|/ / /
|/| | | | | |
|
* | | | | | | remove spurious parens from error message | Doug Zongker | 2014-08-06 | 1 | -4/+3 |
| | | * | | | am 78d458c3: Fix length printing + formats | JP Abgrall | 2014-08-05 | 1 | -3/+3 |
| | | |\ \ \
| |_|_|/ / /
|/| | | | | |
|
* | | | | | | Fix length printing + formats | JP Abgrall | 2014-08-05 | 1 | -3/+3 |
| | | * | | | am eaf33654: only do uncryption on packages in /data | Doug Zongker | 2014-08-01 | 1 | -1/+1 |
| | | |\ \ \
| |_|_|/ / /
|/| | | | | |
|
* | | | | | | only do uncryption on packages in /data | Doug Zongker | 2014-08-01 | 1 | -1/+1 |
|/ / / / / |
|
| | * | | | am a91ecc59: Auto create parent directories for rename support | Michael Runge | 2014-07-22 | 0 | -0/+0 |
| | |\ \ \
| |_|/ / /
|/| | | | |
|
* | | | | | Auto create parent directories for rename support | Michael Runge | 2014-07-22 | 2 | -3/+7 |
| | * | | | Auto create parent directories for rename support | Michael Runge | 2014-07-22 | 2 | -3/+7 |
| |/ / /
|/| | | |
|
* | | | | do sdcard sideloading through the fuse filesystem | Doug Zongker | 2014-07-10 | 4 | -102/+175 |
* | | | | refactor fuse sideloading code | Doug Zongker | 2014-07-10 | 9 | -43/+152 |
* | | | | drop APPLY_CACHE and refactor APPLY_EXT | Doug Zongker | 2014-07-08 | 2 | -64/+47 |
* | | | | sideload without holding the whole package in RAM | Doug Zongker | 2014-07-02 | 11 | -71/+618 |
* | | | | am 3e0fc39e: am 974fe112: Merge "Fix recovery mode." | Riley Andrews | 2014-06-25 | 1 | -1/+19 |
|\ \ \ \ |
|
| * | | | | am 974fe112: Merge "Fix recovery mode." | Riley Andrews | 2014-06-25 | 1 | -1/+19 |
| |\| | | |
|
| | * | | | Merge "Fix recovery mode." | Riley Andrews | 2014-06-24 | 1 | -1/+19 |
| | |\ \ \ |
|
| | | * | | | Fix recovery mode. | Riley Andrews | 2014-06-25 | 1 | -1/+19 |
| | |/ / / |
|
* | | | | | recovery: enable panic_on_oops | Colin Cross | 2014-06-24 | 1 | -0/+2 |
* | | | | | Use LOCAL_REQUIRED_MODULES for mkfs.f2fs | Ji-Hwan Lee | 2014-06-18 | 1 | -5/+3 |
* | | | | | Support F2FS for the data partition | JP Abgrall | 2014-06-17 | 3 | -15/+90 |
* | | | | | minui: avoid random screen frame at startup | Joey Pan | 2014-06-12 | 1 | -0/+2 |
* | | | | | advance progress bar during block OTA installations | Doug Zongker | 2014-06-09 | 1 | -2/+23 |
* | | | | | am dff8afe1: (-s ours) restore holo UI in recovery -- DO NOT MERGE | Doug Zongker | 2014-06-06 | 0 | -0/+0 |
|\ \ \ \ \ |
|
| * | | | | | restore holo UI in recovery -- DO NOT MERGE | Doug Zongker | 2014-06-03 | 12 | -16/+16 |
* | | | | | | Merge "restore holo UI in recovery" | Doug Zongker | 2014-06-06 | 12 | -16/+16 |
|\ \ \ \ \ \ |
|
| * | | | | | | restore holo UI in recovery | Doug Zongker | 2014-06-06 | 12 | -16/+16 |
* | | | | | | | am 54a61179: am cfd4b286: Merge "recovery: initialize keys press tracking status" | Doug Zongker | 2014-06-06 | 1 | -0/+1 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | / / / /
| | |/ / / /
| |/| | | | |
|
| * | | | | | am cfd4b286: Merge "recovery: initialize keys press tracking status" | Doug Zongker | 2014-06-06 | 1 | -0/+1 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | Merge "recovery: initialize keys press tracking status" | Doug Zongker | 2014-06-06 | 1 | -0/+1 |
| | |\ \ \ \ |
|
| | | * | | | | recovery: initialize keys press tracking status | Mihai Serban | 2014-06-06 | 1 | -0/+1 |
| | |/ / / / |
|
* | | / / / | disable async reboot during package installation | Doug Zongker | 2014-05-23 | 4 | -4/+47 |
| |_|/ / /
|/| | | | |
|
* | | | | | am 502e4595: am d1c64060: am 5fbb729f: Merge "exit instead of return if sideload file creation fails" | Doug Zongker | 2014-05-16 | 1 | -1/+1 |
|\| | | | |
|
| * | | | | am d1c64060: am 5fbb729f: Merge "exit instead of return if sideload file creation fails" | Doug Zongker | 2014-05-16 | 1 | -1/+1 |
| |\| | | |
|
| | * | | | am 5fbb729f: Merge "exit instead of return if sideload file creation fails" | Doug Zongker | 2014-05-16 | 1 | -1/+1 |
| | |\ \ \ |
|
| | | * \ \ | Merge "exit instead of return if sideload file creation fails" | Doug Zongker | 2014-05-16 | 1 | -1/+1 |
| | | |\ \ \ |
|
| | | | * | | | exit instead of return if sideload file creation fails | Ethan Yonker | 2013-01-09 | 1 | -1/+1 |
* | | | | | | | am c4804e9b: am d4592694: am 3ca99f6c: Merge "fix vulnerability in bspatch" | Doug Zongker | 2014-05-16 | 1 | -0/+5 |
|\| | | | | | |
|
| * | | | | | | am d4592694: am 3ca99f6c: Merge "fix vulnerability in bspatch" | Doug Zongker | 2014-05-16 | 1 | -0/+5 |
| |\| | | | | |
|
| | * | | | | | am 3ca99f6c: Merge "fix vulnerability in bspatch" | Doug Zongker | 2014-05-16 | 1 | -0/+5 |
| | |\| | | | |
|
| | | * | | | | Merge "fix vulnerability in bspatch" | Doug Zongker | 2014-05-16 | 1 | -0/+5 |
| | | |\ \ \ \ |
|
| | | | * | | | | fix vulnerability in bspatch | Doug Zongker | 2014-05-13 | 1 | -0/+5 |
* | | | | | | | | am 0766cdf4: am d2fb4ed5: am d27aa76a: Merge "Support BGRA framebuffer" | Doug Zongker | 2014-05-14 | 1 | -0/+13 |
|\| | | | | | | |
|
| * | | | | | | | am d2fb4ed5: am d27aa76a: Merge "Support BGRA framebuffer" | Doug Zongker | 2014-05-14 | 1 | -0/+13 |
| |\| | | | | | |
|
| | * | | | | | | am d27aa76a: Merge "Support BGRA framebuffer" | Doug Zongker | 2014-05-14 | 1 | -0/+13 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Support BGRA framebuffer" | Doug Zongker | 2014-05-14 | 1 | -0/+13 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | Support BGRA framebuffer | Daniel Leung | 2014-05-14 | 1 | -0/+13 |
| | | |/ / / / / |
|
* | | | | | | | | am 48abd574: am 34ff5fe3: am 74b90b30: Merge "screen_ui: Initialize text buffer" | Doug Zongker | 2014-05-13 | 1 | -0/+2 |
|\| | | | | | | |
|
| * | | | | | | | am 34ff5fe3: am 74b90b30: Merge "screen_ui: Initialize text buffer" | Doug Zongker | 2014-05-13 | 1 | -0/+2 |
| |\| | | | | | |
|
| | * | | | | | | am 74b90b30: Merge "screen_ui: Initialize text buffer" | Doug Zongker | 2014-05-13 | 1 | -0/+2 |
| | |\| | | | | |
|
| | | * | | | | | Merge "screen_ui: Initialize text buffer" | Doug Zongker | 2014-05-13 | 1 | -0/+2 |
| | | |\ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | | * | | | | screen_ui: Initialize text buffer | Bjorn Andersson | 2013-09-30 | 1 | -0/+2 |
* | | | | | | | | Allow 0-byte files in full OTAs. | Michael Runge | 2014-05-09 | 1 | -1/+3 |
* | | | | | | | | am e9f9238a: am 1cd52423: am 1c2cf1db: Merge "recovery: minui: add adf backend" | Greg Hackmann | 2014-05-03 | 5 | -5/+267 |
|\| | | | | | | |
|
| * | | | | | | | am 1cd52423: am 1c2cf1db: Merge "recovery: minui: add adf backend" | Greg Hackmann | 2014-05-03 | 5 | -5/+267 |
| |\| | | | | | |
|
| | * | | | | | | am 1c2cf1db: Merge "recovery: minui: add adf backend" | Greg Hackmann | 2014-05-03 | 5 | -5/+267 |
| | |\| | | | | |
|
| | | * | | | | | Merge "recovery: minui: add adf backend" | Greg Hackmann | 2014-05-03 | 5 | -5/+267 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | recovery: minui: add adf backend | Greg Hackmann | 2014-04-26 | 5 | -5/+267 |
| | | |/ / / / / |
|
* | | | | | | | | Allow lines without = signs. | Michael Runge | 2014-05-02 | 1 | -5/+3 |
* | | | | | | | | am ddaaccb3: am 29759e9d: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEAD | Bill Yi | 2014-04-30 | 1 | -1/+0 |
|\| | | | | | | |
|
| * | | | | | | | am 29759e9d: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEAD | Bill Yi | 2014-04-30 | 1 | -1/+0 |
| |\| | | | | | |
|
| | * | | | | | | Merge commit '25c2b2f670a3b11f7ce78eccde10c1a79188c9a8' into HEAD | Bill Yi | 2014-04-29 | 9 | -29/+180 |
| | |\ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | | * | | | | | am aa4545b5: Merge "restore minui support for paletted images with < 8 bits" | Doug Zongker | 2014-03-20 | 1 | -1/+1 |
| | | |\ \ \ \ \ |
|
| | | * \ \ \ \ \ | resolved conflicts for merge of 708aa238 to klp-dev-plus-aosp | Doug Zongker | 2014-03-18 | 1 | -4/+10 |
| | | |\ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ | am 130a7985: Merge "fix error log statement" | Doug Zongker | 2014-03-18 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ | resolved conflicts for merge of d90da130 to klp-dev-plus-aosp | Doug Zongker | 2014-03-18 | 6 | -244/+253 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ | am 026ebe02: Merge "Recovery 64-bit compile issues" | Mark Salyzyn | 2014-03-14 | 11 | -30/+33 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ | am a7266ef0: Merge "separate fbdev-specific code out from minui" | Doug Zongker | 2014-03-13 | 5 | -152/+268 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ | am c91612d4: Merge "remove pixelflinger from recovery" | Doug Zongker | 2014-03-13 | 6 | -274/+358 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ | am 8f087d02: Merge "update tools for making recovery images" | Doug Zongker | 2014-03-13 | 2 | -102/+53 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | am 59508993: Merge "allow CheckKey to request mounting /system" | Doug Zongker | 2014-03-13 | 3 | -3/+52 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'ea868b38' into manualmerge | Doug Zongker | 2014-03-13 | 18 | -103/+204 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 2f173bde: Merge "ADB sideload command not work" | Doug Zongker | 2014-03-11 | 3 | -11/+358 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am ac189bf6: Merge "recovery: Fix adb with linux 3.10" | Benoit Goby | 2014-03-08 | 1 | -0/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on" | Colin Cross | 2014-03-07 | 3 | -5/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | am 9e8d81ba: am 0e22af65: recovery: Fix adb with linux 3.10 | Benoit Goby | 2014-04-18 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | am 0e22af65: recovery: Fix adb with linux 3.10 | Benoit Goby | 2014-04-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | recovery: Fix adb with linux 3.10 | Benoit Goby | 2014-04-18 | 1 | -0/+6 |
* | | | | | | | | | | | | | | | | | | | | | am ecf1f6c9: am 558f2700: Merge "Change filesystem add entry API call." | Sasha Levitskiy | 2014-04-12 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | am 558f2700: Merge "Change filesystem add entry API call." | Sasha Levitskiy | 2014-04-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "Change filesystem add entry API call." | Sasha Levitskiy | 2014-04-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / /
| | |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Change filesystem add entry API call. | Sasha Levitskiy | 2014-04-11 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | make density-specific recovery assets | Doug Zongker | 2014-04-04 | 58 | -16/+16 |
* | | | | | | | | | | | | | | | | | | | | add reboot-to-bootloader and power down options to recovery menu | Doug Zongker | 2014-04-01 | 3 | -18/+44 |
* | | | | | | | | | | | | | | | | | | | | remove DefaultDevice's UI subclass | Doug Zongker | 2014-04-01 | 2 | -12/+3 |
* | | | | | | | | | | | | | | | | | | | | Merge "Fix build break caused by vold change" | Paul Lawrence | 2014-03-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | Fix build break caused by vold change | Paul Lawrence | 2014-03-03 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | | | am 03008bc1: am aa4545b5: Merge "restore minui support for paletted images with < 8 bits" | Doug Zongker | 2014-03-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | am aa4545b5: Merge "restore minui support for paletted images with < 8 bits" | Doug Zongker | 2014-03-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "restore minui support for paletted images with < 8 bits" | Doug Zongker | 2014-03-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / /
| | |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | restore minui support for paletted images with < 8 bits | Doug Zongker | 2014-03-20 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | recovery: 64 bit build issues | Mark Salyzyn | 2014-03-19 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | | am 03002477: am bacf9b45: add --shutdown_after option to recovery | Doug Zongker | 2014-03-18 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | am bacf9b45: add --shutdown_after option to recovery | Doug Zongker | 2014-03-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | add --shutdown_after option to recovery | Doug Zongker | 2014-03-18 | 1 | -4/+10 |
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | am b4bbf887: resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aosp | Doug Zongker | 2014-03-18 | 1 | -4/+10 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aosp | Doug Zongker | 2014-03-18 | 1 | -4/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "add --shutdown_after option to recovery" | Doug Zongker | 2014-03-18 | 1 | -4/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | add --shutdown_after option to recovery | Doug Zongker | 2014-03-18 | 1 | -4/+10 |
| | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | am 47c7e365: am 130a7985: Merge "fix error log statement" | Doug Zongker | 2014-03-18 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | am 130a7985: Merge "fix error log statement" | Doug Zongker | 2014-03-18 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "fix error log statement" | Doug Zongker | 2014-03-18 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / /
| | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | fix error log statement | Doug Zongker | 2014-03-18 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | am 80c1a386: resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp | Doug Zongker | 2014-03-18 | 6 | -244/+253 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp | Doug Zongker | 2014-03-18 | 6 | -244/+253 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "refactor image resource loading code in minui" | Doug Zongker | 2014-03-17 | 6 | -244/+253 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|/ / / /
| | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | refactor image resource loading code in minui | Doug Zongker | 2014-03-17 | 6 | -244/+253 |
| | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | minzip: 64 bit build issue | Mark Salyzyn | 2014-03-18 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | am 4b6de1ba: am 026ebe02: Merge "Recovery 64-bit compile issues" | Mark Salyzyn | 2014-03-14 | 11 | -30/+33 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | am 026ebe02: Merge "Recovery 64-bit compile issues" | Mark Salyzyn | 2014-03-14 | 11 | -30/+33 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Recovery 64-bit compile issues" | Mark Salyzyn | 2014-03-14 | 11 | -30/+33 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|/ / / /
| | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Recovery 64-bit compile issues | Mark Salyzyn | 2014-03-14 | 11 | -30/+33 |
| | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | am 239fb930: am a7266ef0: Merge "separate fbdev-specific code out from minui" | Doug Zongker | 2014-03-12 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | am a7266ef0: Merge "separate fbdev-specific code out from minui" | Doug Zongker | 2014-03-12 | 5 | -152/+268 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "separate fbdev-specific code out from minui" | Doug Zongker | 2014-03-12 | 5 | -152/+268 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|/ / / /
| | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | separate fbdev-specific code out from minui | Doug Zongker | 2014-03-11 | 5 | -152/+268 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | am cb1bdc9e: (-s ours) am c91612d4: Merge "remove pixelflinger from recovery" | Doug Zongker | 2014-03-12 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am c91612d4: Merge "remove pixelflinger from recovery" | Doug Zongker | 2014-03-12 | 6 | -274/+358 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "remove pixelflinger from recovery" | Doug Zongker | 2014-03-11 | 6 | -274/+358 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|/ / / /
| | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | remove pixelflinger from recovery | Doug Zongker | 2014-03-11 | 6 | -274/+358 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | am 7003ff3b: am 8f087d02: Merge "update tools for making recovery images" | Doug Zongker | 2014-03-12 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 8f087d02: Merge "update tools for making recovery images" | Doug Zongker | 2014-03-12 | 2 | -102/+53 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "update tools for making recovery images" | Doug Zongker | 2014-03-11 | 2 | -102/+53 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|/ / / /
| | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | update tools for making recovery images | Doug Zongker | 2014-03-11 | 2 | -102/+53 |
| | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | am aa6b8026: (-s ours) am 59508993: Merge "allow CheckKey to request mounting /system" | Doug Zongker | 2014-03-12 | 0 | -0/+0 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 59508993: Merge "allow CheckKey to request mounting /system" | Doug Zongker | 2014-03-12 | 3 | -3/+52 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | Merge "allow CheckKey to request mounting /system" | Doug Zongker | 2014-03-11 | 3 | -3/+52 |
| | |\ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/ / / /
| | |/| | | | | | | | | |
|
| | | * | | | | | | | | | allow CheckKey to request mounting /system | Doug Zongker | 2014-03-11 | 3 | -3/+52 |
| | |/ / / / / / / / / |
|
* | | | | | | | | | | | am c15b7865: (-s ours) resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aosp | Doug Zongker | 2014-03-12 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aosp | Doug Zongker | 2014-03-12 | 18 | -102/+204 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Merge "change how recovery animation is implemented" | Doug Zongker | 2014-03-11 | 18 | -95/+203 |
| | |\ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / / /
| | |/| | | | | | | | |
|
| | | * | | | | | | | | change how recovery animation is implemented | Doug Zongker | 2014-03-11 | 18 | -95/+203 |
| | |/ / / / / / / / |
|
* | | | | | | | | | | Merge "separate fbdev-specific code out from minui" | Doug Zongker | 2014-03-11 | 5 | -152/+268 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | separate fbdev-specific code out from minui | Doug Zongker | 2014-03-11 | 5 | -152/+268 |
* | | | | | | | | | | | update tools for making recovery images | Doug Zongker | 2014-03-11 | 2 | -102/+53 |
|/ / / / / / / / / / |
|
* | | | | | | | | | | remove pixelflinger from recovery | Doug Zongker | 2014-03-11 | 6 | -281/+357 |
* | | | | | | | | | | change how recovery animation is implemented | Doug Zongker | 2014-03-07 | 18 | -99/+202 |
* | | | | | | | | | | Merge "support don't-care maps when writing the system image" | Doug Zongker | 2014-03-04 | 1 | -62/+172 |
|\ \ \ \ \ \ \ \ \ \
| |_|_|_|/ / / / / /
|/| | | | | | | | | |
|
| * | | | | | | | | | support don't-care maps when writing the system image | Doug Zongker | 2014-02-25 | 1 | -62/+172 |
* | | | | | | | | | | am 49968f09: am 2f173bde: Merge "ADB sideload command not work" | Doug Zongker | 2014-02-26 | 3 | -11/+358 |
|\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| * | | | | | | | | | am 2f173bde: Merge "ADB sideload command not work" | Doug Zongker | 2014-02-26 | 3 | -11/+358 |
| |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "ADB sideload command not work" | Doug Zongker | 2014-02-26 | 3 | -11/+358 |
| | |\ \ \ \ \ \ \ \
| | | |_|_|_|/ / / /
| | |/| | | | | | | |
|
| | | * | | | | | | | ADB sideload command not work | Da Zhou | 2014-01-17 | 3 | -11/+358 |
* | | | | | | | | | | am ed75be6d: am ac189bf6: Merge "recovery: Fix adb with linux 3.10" | Benoit Goby | 2014-02-21 | 1 | -0/+6 |
|\| | | | | | | | |
| |_|_|/ / / / / /
|/| | | | | | | | |
|
| * | | | | | | | | am ac189bf6: Merge "recovery: Fix adb with linux 3.10" | Benoit Goby | 2014-02-20 | 1 | -0/+6 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "recovery: Fix adb with linux 3.10" | Benoit Goby | 2014-02-20 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \
| | | |_|_|/ / / /
| | |/| | | | | | |
|
| | | * | | | | | | recovery: Fix adb with linux 3.10 | Benoit Goby | 2014-02-20 | 1 | -0/+6 |
| | |/ / / / / / |
|
* | | | | | | | | add flag for GPL license | Doug Zongker | 2014-02-20 | 2 | -0/+339 |
* | | | | | | | | Merge "clean up some warnings when building recovery" | Doug Zongker | 2014-02-18 | 10 | -13/+23 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | clean up some warnings when building recovery | Doug Zongker | 2014-02-14 | 10 | -13/+23 |
* | | | | | | | | | Merge "Fix a crash when going into recovery mode." | Maxim Siniavine | 2014-02-14 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Fix a crash when going into recovery mode. | Maxim Siniavine | 2014-02-14 | 1 | -1/+6 |
* | | | | | | | | | | remove remaining libminelf references | Doug Zongker | 2014-02-14 | 2 | -3/+2 |
| |/ / / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | remove 'retouch' ASLR support | Doug Zongker | 2014-02-14 | 8 | -302/+12 |
* | | | | | | | | | add syspatch support to updater | Doug Zongker | 2014-02-13 | 2 | -14/+115 |
* | | | | | | | | | add mzGetStoredEntry function | Doug Zongker | 2014-02-13 | 2 | -2/+30 |
|/ / / / / / / / |
|
* | | | | | | | | am 2739ed96: am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on" | Colin Cross | 2014-02-06 | 3 | -5/+5 |
|\| | | | | | | |
|
| * | | | | | | | am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on" | Colin Cross | 2014-02-06 | 3 | -5/+5 |
| |\| | | | | |
| | |_|/ / / /
| |/| | | | | |
|
| | * | | | | | Merge "recovery: fix building with pointer-to-int errors turned on" | Colin Cross | 2014-02-06 | 3 | -5/+5 |
| | |\ \ \ \ \ |
|
| | | * | | | | | recovery: fix building with pointer-to-int errors turned on | Colin Cross | 2014-02-06 | 3 | -5/+5 |
| | |/ / / / / |
|
* | | | | | | | am fd84f65d: am f3532072: Merge "minadbd: remove dead code" | Colin Cross | 2014-01-27 | 2 | -25/+0 |
|\| | | | | | |
|
| * | | | | | | am f3532072: Merge "minadbd: remove dead code" | Colin Cross | 2014-01-27 | 2 | -25/+0 |
| |\| | | | | |
|
| | * | | | | | Merge "minadbd: remove dead code" | Colin Cross | 2014-01-27 | 2 | -25/+0 |
| | |\ \ \ \ \ |
|
| | | * | | | | | minadbd: remove dead code | Colin Cross | 2014-01-24 | 2 | -25/+0 |
| | |/ / / / / |
|
* | | | | | | | am f4641299: am 295e74aa: Merge "adbd: switch to su domain when running as root" | Nick Kralevich | 2014-01-24 | 1 | -1/+1 |
|\| | | | | | |
|
| * | | | | | | am 295e74aa: Merge "adbd: switch to su domain when running as root" | Nick Kralevich | 2014-01-24 | 1 | -1/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "adbd: switch to su domain when running as root" | Nick Kralevich | 2014-01-24 | 1 | -1/+1 |
| | |\ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | | * | | | | adbd: switch to su domain when running as root | Nick Kralevich | 2014-01-18 | 1 | -1/+1 |
| | |/ / / / |
|
* | | | | | | log extra info for debugging | Doug Zongker | 2014-01-21 | 2 | -1/+3 |
* | | | | | | program to store unencrypted files in an encrypted filesystem | Doug Zongker | 2014-01-16 | 3 | -0/+406 |
* | | | | | | do verification and extraction on memory, not files | Doug Zongker | 2014-01-16 | 11 | -209/+261 |
* | | | | | | am a01b6467: am 772f6e2a: Merge "correctly mount tmpfs as /tmp in recovery" | Doug Zongker | 2014-01-14 | 1 | -2/+2 |
|\| | | | | |
|
| * | | | | | am 772f6e2a: Merge "correctly mount tmpfs as /tmp in recovery" | Doug Zongker | 2014-01-14 | 1 | -2/+2 |
| |\| | | | |
|
| | * | | | | Merge "correctly mount tmpfs as /tmp in recovery" | Doug Zongker | 2014-01-14 | 1 | -2/+2 |
| | |\ \ \ \ |
|
| | | * | | | | correctly mount tmpfs as /tmp in recovery | Doug Zongker | 2014-01-14 | 1 | -2/+2 |
| | |/ / / / |
|
* | | | | | | am 7e0d3066: am fc729512: Merge "Set SELinux security contexts correctly for init and services." | Nick Kralevich | 2014-01-13 | 1 | -0/+11 |
|\| | | | | |
|
| * | | | | | am fc729512: Merge "Set SELinux security contexts correctly for init and services." | Nick Kralevich | 2014-01-13 | 1 | -0/+11 |
| |\| | | | |
|
| | * | | | | Merge "Set SELinux security contexts correctly for init and services." | Nick Kralevich | 2014-01-13 | 1 | -0/+11 |
| | |\ \ \ \ |
|
| | | * | | | | Set SELinux security contexts correctly for init and services. | Stephen Smalley | 2014-01-13 | 1 | -0/+11 |
| | |/ / / / |
|
* | | | | | | remove dead code from minzip | Doug Zongker | 2014-01-13 | 2 | -134/+0 |
* | | | | | | am 27efc8f9: am 617d1cad: Merge "minui: do not use flexible array initialization" | Nick Kralevich | 2014-01-04 | 1 | -1/+1 |
|\| | | | | |
|
| * | | | | | am 617d1cad: Merge "minui: do not use flexible array initialization" | Nick Kralevich | 2014-01-04 | 1 | -1/+1 |
| |\| | | | |
|
| | * | | | | Merge "minui: do not use flexible array initialization" | Nick Kralevich | 2014-01-04 | 1 | -1/+1 |
| | |\ \ \ \ |
|
| | | * | | | | minui: do not use flexible array initialization | synergy dev | 2013-11-26 | 1 | -1/+1 |
* | | | | | | | am 15f5fe1b: am f9dd42de: Merge "Don\'t abort on read_file if the file is missing." into klp-dev | Michael Runge | 2013-12-27 | 1 | -5/+3 |
|\| | | | | | |
|
| * | | | | | | am f9dd42de: Merge "Don\'t abort on read_file if the file is missing." into klp-dev | Michael Runge | 2013-12-27 | 1 | -5/+3 |
| |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | | |
|
| | * | | | | | Merge "Don't abort on read_file if the file is missing." into klp-dev | Michael Runge | 2013-12-20 | 1 | -5/+3 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Don't abort on read_file if the file is missing. | Michael Runge | 2013-12-14 | 1 | -5/+3 |
* | | | | | | | | am e1bb2733: am 168724c3: fix unnecessarily slow writing of EMMC partitions | Doug Zongker | 2013-12-20 | 1 | -15/+3 |
|\| | | | | | | |
|
| * | | | | | | | am 168724c3: fix unnecessarily slow writing of EMMC partitions | Doug Zongker | 2013-12-20 | 1 | -15/+3 |
| |\| | | | | | |
|
| | * | | | | | | fix unnecessarily slow writing of EMMC partitions | Doug Zongker | 2013-12-20 | 1 | -15/+3 |
| | |/ / / / / |
|
* | | | | | | | recovery: wipe encryption metadata along with data partition | Doug Zongker | 2013-12-13 | 2 | -2/+27 |
* | | | | | | | am d327c63a: am c87bab10: add the functions for multi-stage packages to updater | Doug Zongker | 2013-12-03 | 8 | -9/+181 |
|\| | | | | | |
|
| * | | | | | | am c87bab10: add the functions for multi-stage packages to updater | Doug Zongker | 2013-11-27 | 8 | -9/+181 |
| |\| | | | |
| | |/ / / /
| |/| | | | |
|
| | * | | | | add the functions for multi-stage packages to updater | Doug Zongker | 2013-11-27 | 8 | -9/+181 |
* | | | | | | Merge "Fix rare crash seen when dereferencing backgroundIcon[NONE]." | Doug Zongker | 2013-11-18 | 1 | -0/+1 |
|\ \ \ \ \ \ |
|
| * | | | | | | Fix rare crash seen when dereferencing backgroundIcon[NONE]. | Alistair Strachan | 2013-11-18 | 1 | -0/+1 |
* | | | | | | | Restore default umask after forking for update-binary. | Alistair Strachan | 2013-11-18 | 1 | -0/+1 |
|/ / / / / / |
|
* | | | | | | am 40dfc474: am c64e76c7: Merge "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add." into klp-dev | Michael Runge | 2013-11-08 | 1 | -0/+35 |
|\| | | | | |
|
| * | | | | | am c64e76c7: Merge "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add." into klp-dev | Michael Runge | 2013-11-08 | 1 | -0/+35 |
| |\| | | |
| | |/ / /
| |/| | | |
|
| | * | | | Merge "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add." into klp-dev | Michael Runge | 2013-11-07 | 1 | -0/+35 |
| | |\ \ \ |
|
| | | * | | | Enable incremental builder to find files that moved, and | Michael Runge | 2013-11-07 | 1 | -0/+35 |
* | | | | | | am a370c0f7: am 3966c571: merge in klp-release (no-op) | Ed Heyl | 2013-10-17 | 0 | -0/+0 |
|\| | | | | |
|
| * | | | | | am 3966c571: merge in klp-release (no-op) | Ed Heyl | 2013-10-17 | 0 | -0/+0 |
| |\| | | | |
|
| | * | | | | merge in klp-release (no-op) | Ed Heyl | 2013-10-17 | 0 | -0/+0 |
| | |\ \ \ \
| | | |/ / /
| | |/| | | |
|
| | | * | | | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-03 | 0 | -0/+0 |
| | | |\ \ \ |
|
* | | | | | | | am fc7eab96: am f4a6ab27: Merge "Add support for ECDSA signatures" | Kenny Root | 2013-10-14 | 12 | -60/+822 |
|\| | | | | | |
|
| * | | | | | | am f4a6ab27: Merge "Add support for ECDSA signatures" | Kenny Root | 2013-10-14 | 12 | -60/+822 |
| |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge "Add support for ECDSA signatures" | Kenny Root | 2013-10-14 | 12 | -60/+822 |
| | |\ \ \ \ \ \
| | | |_|_|_|/ /
| | |/| | | | | |
|
| | | * | | | | | Add support for ECDSA signatures | Kenny Root | 2013-10-10 | 12 | -60/+822 |
| | |/ / / / / |
|
* | | | | | | | am 053c1c5e: am 7fdeb1f9: merge in KQS81M | Ed Heyl | 2013-10-09 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | am 7fdeb1f9: merge in KQS81M | Ed Heyl | 2013-10-09 | 0 | -0/+0 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | merge in KQS81M | Ed Heyl | 2013-10-09 | 0 | -0/+0 |
| | |\ \ \ \ \
| | | |_|/ / /
| | |/| | / /
| | | | |/ /
| | | |/| | |
|
| | | * | | | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-09-12 | 0 | -0/+0 |
| | | |\ \ \ |
|
| | | | * | | | Don't apply permission changes to symlink. | Nick Kralevich | 2013-09-11 | 1 | -0/+5 |
| | | | * | | | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-09-10 | 0 | -0/+0 |
| | | | |\ \ \ |
|
| | | | | * | | | recovery: fix use of init reboot method | Doug Zongker | 2013-09-04 | 1 | -1/+1 |
* | | | | | | | | am efef45ed: am a2a1ce82: Allow child classes to override the overlay location for the update image. | Michael Runge | 2013-10-03 | 1 | -1/+3 |
|\| | | | | | | |
|
| * | | | | | | | am a2a1ce82: Allow child classes to override the overlay location for the update image. | Michael Runge | 2013-10-03 | 1 | -1/+3 |
| |\| | | | | | |
|
| | * | | | | | | Allow child classes to override the overlay location for the | Michael Runge | 2013-10-03 | 1 | -1/+3 |
| | |/ / / / / |
|
* | | | | | | | fix use of RGBA images in minui | Doug Zongker | 2013-09-26 | 1 | -3/+11 |
* | | | | | | | am dd92a4d6: am 58c60900: Merge "verifier: update to support certificates using SHA-256" | Kenny Root | 2013-09-25 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | am 58c60900: Merge "verifier: update to support certificates using SHA-256" | Kenny Root | 2013-09-25 | 0 | -0/+0 |
| |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | | |
|
| | * | | | | | Merge "verifier: update to support certificates using SHA-256" | Kenny Root | 2013-09-25 | 13 | -109/+254 |
| | |\ \ \ \ \ |
|
| | | * | | | | | verifier: update to support certificates using SHA-256 | Doug Zongker | 2013-09-25 | 13 | -109/+254 |
| | |/ / / / / |
|
* | | | | | | | am 46ab1b61: updater: Delete dead code | Nick Kralevich | 2013-09-18 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | updater: Delete dead code | Nick Kralevich | 2013-09-17 | 3 | -153/+0 |
* | | | | | | | recovery: fix epoll events type to uint32_t | Todd Poynor | 2013-09-17 | 4 | -5/+5 |
* | | | | | | | start healthd in recovery mode | Todd Poynor | 2013-09-14 | 1 | -1/+1 |
* | | | | | | | minui: add ev_get_epollfd() to retrieve epoll file descriptor | Todd Poynor | 2013-09-12 | 2 | -0/+6 |
* | | | | | | | recovery: ui changes for ev_*() switch to epoll | Todd Poynor | 2013-09-12 | 2 | -3/+3 |
* | | | | | | | minui: convert ev_*() event interface to epoll | Todd Poynor | 2013-09-12 | 2 | -27/+58 |
* | | | | | | | am 1306a7ef: am cc2958fd: fix secure adb in recovery | Doug Zongker | 2013-09-12 | 1 | -0/+1 |
|\| | | | | | |
|
| * | | | | | | am cc2958fd: fix secure adb in recovery | Doug Zongker | 2013-09-11 | 1 | -0/+1 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | fix secure adb in recovery | Doug Zongker | 2013-09-11 | 1 | -0/+1 |
* | | | | | | | updater: Delete dead code | Nick Kralevich | 2013-09-11 | 3 | -153/+0 |
* | | | | | | | am af677d78: am e461251e: Don\'t apply permission changes to symlink. | Nick Kralevich | 2013-09-11 | 1 | -0/+5 |
|\| | | | | | |
|
| * | | | | | | am e461251e: Don\'t apply permission changes to symlink. | Nick Kralevich | 2013-09-11 | 1 | -0/+5 |
| |\| | | | | |
|
| | * | | | | | Don't apply permission changes to symlink. | Nick Kralevich | 2013-09-11 | 1 | -0/+5 |
| | | |/ / /
| | |/| | | |
|
* | | | | | | am cc421662: am 5dbdef0e: updater: introduce and set_metadata and set_metadata_recursive | Nick Kralevich | 2013-09-10 | 1 | -0/+274 |
|\| | | | | |
|
| * | | | | | am 5dbdef0e: updater: introduce and set_metadata and set_metadata_recursive | Nick Kralevich | 2013-09-10 | 1 | -0/+274 |
| |\| | | | |
|
| | * | | | | updater: introduce and set_metadata and set_metadata_recursive | Nick Kralevich | 2013-09-10 | 1 | -0/+274 |
* | | | | | | am 5ae88e89: am 3328e3bc: Revert "Update OTA installer to understand SELinux filesystem labels" | Nick Kralevich | 2013-09-10 | 3 | -32/+8 |
|\| | | | | |
|
| * | | | | | am 3328e3bc: Revert "Update OTA installer to understand SELinux filesystem labels" | Nick Kralevich | 2013-09-10 | 3 | -32/+8 |
| |\| | | | |
|
| | * | | | | Revert "Update OTA installer to understand SELinux filesystem labels" | Nick Kralevich | 2013-09-09 | 3 | -32/+8 |
* | | | | | | allow CheckKey to request mounting /system | Doug Zongker | 2013-09-05 | 3 | -3/+52 |
* | | | | | | am f187a543: am 3b5a987c: recovery: fix use of init reboot method | Doug Zongker | 2013-09-03 | 1 | -1/+1 |
|\| | | | | |
|
| * | | | | | am 3b5a987c: recovery: fix use of init reboot method | Doug Zongker | 2013-09-03 | 1 | -1/+1 |
| |\| | | | |
|
| | * | | | | recovery: fix use of init reboot method | Doug Zongker | 2013-09-03 | 1 | -1/+1 |
| | | |/ /
| | |/| | |
|
* | | | | | am 366f78a9: am 77ea71d6: recovery: fix rebooting | Doug Zongker | 2013-08-30 | 2 | -1/+4 |
|\| | | | |
|
| * | | | | am 77ea71d6: recovery: fix rebooting | Doug Zongker | 2013-08-30 | 2 | -1/+4 |
| |\| | | |
|
| | * | | | recovery: fix rebooting | Doug Zongker | 2013-08-30 | 2 | -1/+4 |
* | | | | | am 19877de5: am 5c4e1dac: Merge "Update libpng API usage" | John Reck | 2013-08-27 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | am 5c4e1dac: Merge "Update libpng API usage" | John Reck | 2013-08-27 | 1 | -12/+12 |
| |\ \ \ \
| | |/ / /
| |/| / /
| | |/ / |
|
| | * | | Merge "Update libpng API usage" | John Reck | 2013-08-27 | 1 | -12/+12 |
| | |\ \ |
|
| | | * | | Update libpng API usage | John Reck | 2013-08-27 | 1 | -12/+12 |
| | |/ / |
|
* | | | | am 239ac6ab: recovery: install packages in a known mount environment | Doug Zongker | 2013-08-22 | 5 | -11/+35 |
|\| | | |
|
| * | | | recovery: install packages in a known mount environment | Doug Zongker | 2013-08-21 | 5 | -11/+35 |
* | | | | Fix libpng API usage | John Reck | 2013-08-13 | 1 | -12/+12 |
|/ / / |
|
* | | | notify about pending long press | Doug Zongker | 2013-07-31 | 5 | -27/+102 |
* | | | Merge "start healthd in recovery" | Todd Poynor | 2013-07-27 | 1 | -0/+4 |
|\ \ \ |
|
| * | | | start healthd in recovery | Todd Poynor | 2013-06-19 | 1 | -0/+4 |
* | | | | Update OTA installer to understand SELinux filesystem labels | Nick Kralevich | 2013-07-19 | 3 | -8/+32 |
* | | | | am a69b50c5: am 901b898d: recovery: remove O_DIRECT, use O_SYNC only | Doug Zongker | 2013-07-11 | 1 | -2/+2 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | am 901b898d: recovery: remove O_DIRECT, use O_SYNC only | Doug Zongker | 2013-07-11 | 1 | -2/+2 |
| |\ \ \ |
|
| | * | | | recovery: remove O_DIRECT, use O_SYNC only | Doug Zongker | 2013-07-11 | 1 | -2/+2 |
* | | | | | am 660637f3: am e8d953aa: recovery: more cargo-cult programming | Doug Zongker | 2013-07-11 | 1 | -2/+2 |
|\| | | | |
|
| * | | | | am e8d953aa: recovery: more cargo-cult programming | Doug Zongker | 2013-07-11 | 1 | -2/+2 |
| |\| | | |
|
| | * | | | recovery: more cargo-cult programming | Doug Zongker | 2013-07-11 | 1 | -2/+2 |
* | | | | | am 51ffaf54: (-s ours) Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-07-11 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-07-11 | 0 | -0/+0 |
| |\ \ \ \ |
|
| | * | | | | recovery: sleep after writing partition and closing it | Doug Zongker | 2013-07-11 | 1 | -2/+7 |
* | | | | | | am fbcfad33: am bf4a69ac: recovery: sleep after writing partition and closing it | Doug Zongker | 2013-07-11 | 1 | -2/+7 |
|\| | | | | |
|
| * | | | | | am bf4a69ac: recovery: sleep after writing partition and closing it | Doug Zongker | 2013-07-10 | 1 | -2/+7 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | recovery: sleep after writing partition and closing it | Doug Zongker | 2013-07-10 | 1 | -2/+7 |
* | | | | | | am e352c88f: (-s ours) Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-07-11 | 0 | -0/+0 |
|\| | | | | |
|
| * | | | | | Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-07-10 | 0 | -0/+0 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | recovery: write partitions more conservatively | Doug Zongker | 2013-07-10 | 1 | -24/+46 |
| | * | | | | recovery: try to write EMMC partitions more reliably | Doug Zongker | 2013-07-10 | 2 | -7/+73 |
* | | | | | | am 2148133d: am c870a99c: recovery: write partitions more conservatively | Doug Zongker | 2013-07-11 | 1 | -24/+46 |
|\| | | | | |
|
| * | | | | | am c870a99c: recovery: write partitions more conservatively | Doug Zongker | 2013-07-09 | 1 | -24/+46 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | recovery: write partitions more conservatively | Doug Zongker | 2013-07-09 | 1 | -24/+46 |
* | | | | | | Merge "recovery: preserve recovery logs across cache wipes" | Doug Zongker | 2013-07-09 | 1 | -2/+76 |
|\ \ \ \ \ \ |
|
| * | | | | | | recovery: preserve recovery logs across cache wipes | Doug Zongker | 2013-07-09 | 1 | -2/+76 |
* | | | | | | | recovery: move log output to stdout | Doug Zongker | 2013-07-09 | 8 | -72/+72 |
|/ / / / / / |
|
* | | | | | | am 0ccaccf7: am 044a0b4d: recovery: try to write EMMC partitions more reliably | Doug Zongker | 2013-07-08 | 2 | -7/+73 |
|\| | | | | |
|
| * | | | | | am 044a0b4d: recovery: try to write EMMC partitions more reliably | Doug Zongker | 2013-07-08 | 2 | -7/+73 |
| |\| | | | |
|
| | * | | | | recovery: try to write EMMC partitions more reliably | Doug Zongker | 2013-07-08 | 2 | -7/+73 |
* | | | | | | am 4d4b233e: am 2f6877a0: recovery: init backgroundIcon properly to avoid recovery mode crash | yetta_wu | 2013-07-08 | 0 | -0/+0 |
|\| | | | | |
|
| * | | | | | am 2f6877a0: recovery: init backgroundIcon properly to avoid recovery mode crash | yetta_wu | 2013-06-25 | 1 | -0/+4 |
| |\| | | | |
|
| | * | | | | recovery: init backgroundIcon properly to avoid recovery mode crash | yetta_wu | 2013-06-25 | 1 | -0/+4 |
| | |/ / / |
|
* | | | | | recovery: init backgroundIcon properly to avoid recovery mode crash | yetta_wu | 2013-07-02 | 1 | -0/+4 |
* | | | | | recovery: copy logs to cache more aggressively | Doug Zongker | 2013-07-02 | 1 | -9/+17 |
| |_|/ /
|/| | | |
|
* | | | | am 8cd12112: am d51bfc9b: Merge "Fix the potential segmentation fault" | Doug Zongker | 2013-06-04 | 1 | -1/+7 |
|\| | | |
|
| * | | | am d51bfc9b: Merge "Fix the potential segmentation fault" | Doug Zongker | 2013-06-04 | 1 | -1/+7 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Merge "Fix the potential segmentation fault" | Doug Zongker | 2013-06-04 | 1 | -1/+7 |
| | |\ \ |
|
| | | * | | Fix the potential segmentation fault | Jin Feng | 2013-06-04 | 1 | -1/+7 |
| | |/ / |
|
* | | | | am da1ebaef: recovery: save logs from the last few invocations of recovery | Doug Zongker | 2013-05-21 | 0 | -0/+0 |
|\| | | |
|
| * | | | recovery: save logs from the last few invocations of recovery | Doug Zongker | 2013-05-21 | 1 | -1/+19 |
* | | | | am 7c3ae45e: recovery: turn on text display for install errors in debug builds | Doug Zongker | 2013-05-21 | 0 | -0/+0 |
|\| | | |
|
| * | | | recovery: turn on text display for install errors in debug builds | Doug Zongker | 2013-05-21 | 3 | -8/+47 |
* | | | | recovery: save logs from the last few invocations of recovery | Doug Zongker | 2013-05-16 | 1 | -1/+19 |
* | | | | recovery: turn on text display for install errors in debug builds | Doug Zongker | 2013-05-16 | 3 | -8/+47 |
* | | | | Merge "verifier: update to support certificates using SHA-256" | Doug Zongker | 2013-04-12 | 13 | -109/+254 |
|\ \ \ \ |
|
| * | | | | verifier: update to support certificates using SHA-256 | Doug Zongker | 2013-04-10 | 13 | -109/+254 |
* | | | | | am 4e21482d: Add liblog | Ying Wang | 2013-04-10 | 3 | -2/+3 |
|\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / / |
|
| * | | | Add liblog | Ying Wang | 2013-04-10 | 3 | -2/+3 |
* | | | | am b5bd4fb7: (-s ours) am 2f50df00: am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge | Jean-Baptiste Queru | 2013-03-11 | 0 | -0/+0 |
|\| | | |
|
| * | | | am 2f50df00: am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge | Jean-Baptiste Queru | 2013-03-11 | 0 | -0/+0 |
|/| | | |
|
| * | | | am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge | Jean-Baptiste Queru | 2013-03-11 | 0 | -0/+0 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge | Jean-Baptiste Queru | 2013-03-11 | 0 | -0/+0 |
| | |\ \ |
|
| | | * \ | am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge | Jean-Baptiste Queru | 2013-03-11 | 0 | -0/+0 |
| | | |\ \ |
|
| | | | * | | am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge | Jean-Baptiste Queru | 2013-03-11 | 0 | -0/+0 |
| | | |/| | |
|
| | | | * | | Reconcile with jb-mr1-release - do not merge | Jean-Baptiste Queru | 2013-03-11 | 0 | -0/+0 |
| | | | |\ \ |
|
* | | | | | | | more font improvements and cleanup | Doug Zongker | 2013-03-07 | 11 | -33/+378 |
* | | | | | | | recovery: change font for menus to be an image | Doug Zongker | 2013-03-05 | 5 | -255/+38 |
* | | | | | | | am ec838b88: Merge "minadbd: remove unnecessary header files." | Nick Kralevich | 2013-03-01 | 1 | -2/+0 |
|\| | | | | | |
|
| * | | | | | | Merge "minadbd: remove unnecessary header files." | Nick Kralevich | 2013-03-01 | 1 | -2/+0 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | minadbd: remove unnecessary header files. | Nick Kralevich | 2013-03-01 | 1 | -2/+0 |
| |/ / / / / / |
|
* | | | | | | | Add a CleanSpec for bootable/recovery | Ben Murdoch | 2013-02-22 | 1 | -0/+1 |
* | | | | | | | Move to using the new unified fstab in recovery. | Ken Sumrall | 2013-02-20 | 4 | -149/+55 |
* | | | | | | | am f7d42340: am c560a67b: add optional overscan compensation to recovery graphics | Doug Zongker | 2013-01-03 | 3 | -5/+32 |
|\| | | | | | |
|
| * | | | | | | am c560a67b: add optional overscan compensation to recovery graphics | Doug Zongker | 2013-01-03 | 3 | -5/+32 |
| |\| | | | | |
|
| | * | | | | | add optional overscan compensation to recovery graphics | Doug Zongker | 2012-12-19 | 3 | -5/+32 |
* | | | | | | | am 6a1d21a0: am bb01d0c1: add NextCheckKeyIsLong() and EnqueueKey() methods | Doug Zongker | 2012-12-18 | 2 | -9/+35 |
|\| | | | | | |
|
| * | | | | | | am bb01d0c1: add NextCheckKeyIsLong() and EnqueueKey() methods | Doug Zongker | 2012-12-18 | 2 | -9/+35 |
| |\| | | | |
| | |_|_|_|/
| |/| | | | |
|
| | * | | | | add NextCheckKeyIsLong() and EnqueueKey() methods | Doug Zongker | 2012-12-17 | 2 | -9/+35 |
| | |/ / / |
|
* | | | | | am 9028fb4d: Merge "Pass the correct pointer to munmap on failure." | Elliott Hughes | 2012-12-17 | 1 | -4/+4 |
|\| | | | |
|
| * | | | | Merge "Pass the correct pointer to munmap on failure." | Elliott Hughes | 2012-12-17 | 1 | -4/+4 |
| |\ \ \ \ |
|
| | * | | | | Pass the correct pointer to munmap on failure. | Elliott Hughes | 2012-12-17 | 1 | -4/+4 |
| |/ / / / |
|
* | | | | | am 27f31606: (-s ours) am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 |
| |\| | | |
|
| | | \ \ | |
| | | \ \ | |
| | *-. \ \ | Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 |
| | |\ \ \ \
| | | |_|/ /
| | |/| | /
| | | | |/ |
|
* | | | | | move key loading to verifier code | Doug Zongker | 2012-11-02 | 4 | -103/+112 |
* | | | | | reduce some recovery logging | Doug Zongker | 2012-10-19 | 2 | -7/+26 |
* | | | | | am cd74108c: resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp | Kenny Root | 2012-10-17 | 11 | -53/+4 |
|\| | | | |
|
| * | | | | resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp | Kenny Root | 2012-10-17 | 11 | -53/+4 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge "Remove HAVE_SELINUX guards" | Kenny Root | 2012-10-17 | 11 | -53/+4 |
| | |\ \ \ \ |
|
| | | * | | | | Remove HAVE_SELINUX guards | Kenny Root | 2012-10-16 | 11 | -53/+4 |
| | |/ / / / |
|
* | | | | | | am d0d4d44d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-10 | 0 | -0/+0 |
|\| | | | | |
|
| | \ \ \ \ | |
| | \ \ \ \ | |
| *-. \ \ \ \ | Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-10 | 0 | -0/+0 |
| |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | /
| | | | |_|/
| | | |/| | |
|
| | | * | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-10 | 0 | -0/+0 |
| | | |\ \ \
| | | | |_|/
| | | |/| | |
|
| | * | | | | merge in jb-mr1-factory-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-10 | 0 | -0/+0 |
| | |\ \ \ \
| | | |/ / /
| | |/| / /
| | | |/ / |
|
* | | | | | am 4b57f8f2: am 6016d08b: recovery: fix failure to unmount "/cache" | Devin Kim | 2012-10-10 | 1 | -0/+1 |
|\| | | | |
|
| * | | | | am 6016d08b: recovery: fix failure to unmount "/cache" | Devin Kim | 2012-10-10 | 1 | -0/+1 |
| |\| | | |
|
| | * | | | recovery: fix failure to unmount "/cache" | Devin Kim | 2012-10-09 | 1 | -0/+1 |
* | | | | | am 2c3d1d83: (-s ours) Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-09 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-09 | 0 | -0/+0 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-09 | 0 | -0/+0 |
| | |\ \ \
| | | |/ /
| | |/| | |
|
* | | | | | am 80fb6818: am 8347cb2d: revert to tacky 3D recovery animation | Doug Zongker | 2012-10-08 | 67 | -4/+4 |
|\| | | | |
|
| * | | | | am 8347cb2d: revert to tacky 3D recovery animation | Doug Zongker | 2012-10-08 | 67 | -4/+4 |
| |\| | | |
|
| | * | | | revert to tacky 3D recovery animation | Doug Zongker | 2012-10-08 | 67 | -4/+4 |
* | | | | | am 6cc3ded2: (-s ours) Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-26 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-26 | 0 | -0/+0 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-25 | 0 | -0/+0 |
| | |\ \ \
| | | |/ /
| | |/| | |
|
* | | | | | am a8db3764: am 6c8553dd: display error state on OTA failure | Doug Zongker | 2012-09-24 | 1 | -4/+13 |
|\| | | | |
|
| * | | | | am 6c8553dd: display error state on OTA failure | Doug Zongker | 2012-09-24 | 1 | -4/+13 |
| |\| | | |
|
| | * | | | display error state on OTA failure | Doug Zongker | 2012-09-24 | 1 | -4/+13 |
* | | | | | am 15eaee40: (-s ours) Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-20 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-20 | 0 | -0/+0 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | tweak recovery text images | Doug Zongker | 2012-09-19 | 5 | -1/+2 |
| | * | | | localization for recovery messages | Doug Zongker | 2012-09-19 | 8 | -7/+53 |
* | | | | | am 42afb545: am b66cb69e: tweak recovery text images | Doug Zongker | 2012-09-19 | 5 | -1/+2 |
|\| | | | |
|
| * | | | | am b66cb69e: tweak recovery text images | Doug Zongker | 2012-09-19 | 5 | -1/+2 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | tweak recovery text images | Doug Zongker | 2012-09-18 | 5 | -1/+2 |
* | | | | | am ed3bc11e: am 5fa8c239: localization for recovery messages | Doug Zongker | 2012-09-18 | 8 | -7/+53 |
|\| | | | |
|
| * | | | | am 5fa8c239: localization for recovery messages | Doug Zongker | 2012-09-18 | 8 | -7/+53 |
| |\| | | |
|
| | * | | | localization for recovery messages | Doug Zongker | 2012-09-18 | 8 | -7/+53 |
* | | | | | am 74a806e5: (-s ours) Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-06 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-06 | 0 | -0/+0 |
| |\ \ \ \
| | |/ / /
| |/| / /
| | |/ / |
|
| | * | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-05 | 0 | -0/+0 |
| |/| | |
|
| | * | | fix format of installing_text | Doug Zongker | 2012-08-31 | 1 | -0/+0 |
* | | | | am 52eeea4f: minor recovery fixes | Doug Zongker | 2012-09-05 | 3 | -10/+13 |
|\| | | |
|
| * | | | minor recovery fixes | Doug Zongker | 2012-09-04 | 3 | -10/+13 |
* | | | | am f4c6ec84: fix format of installing_text | Doug Zongker | 2012-08-30 | 1 | -0/+0 |
|\| | | |
|
| * | | | fix format of installing_text | Doug Zongker | 2012-08-30 | 1 | -0/+0 |
| |/ / |
|
* | | | am aff4dbb0: Merge "recovery locale handling fixes" into jb-mr1-dev | Doug Zongker | 2012-08-30 | 6 | -9/+1 |
|\| | |
|
| * | | Merge "recovery locale handling fixes" into jb-mr1-dev | Doug Zongker | 2012-08-30 | 6 | -9/+1 |
| |\ \ |
|
| | * | | recovery locale handling fixes | Doug Zongker | 2012-08-30 | 6 | -9/+1 |
* | | | | am d52ef348: am bddbb5b3: Merge "Fixing trivial warnings for libminui" | Jean-Baptiste Queru | 2012-08-24 | 1 | -2/+2 |
|\| | | |
|
| * | | | am bddbb5b3: Merge "Fixing trivial warnings for libminui" | Jean-Baptiste Queru | 2012-08-24 | 1 | -2/+2 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Merge "Fixing trivial warnings for libminui" | Jean-Baptiste Queru | 2012-08-24 | 1 | -2/+2 |
| | |\ \ |
|
| | | * | | Fixing trivial warnings for libminui | Edwin Vane | 2012-08-21 | 1 | -2/+2 |
* | | | | | am 3474ab28: Merge "Add libm due to libpng dependency." into jb-mr1-dev | Stephen Hines | 2012-08-24 | 1 | -0/+1 |
|\| | | | |
|
| * | | | | Merge "Add libm due to libpng dependency." into jb-mr1-dev | Stephen Hines | 2012-08-24 | 1 | -0/+1 |
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | * | | | Add libm due to libpng dependency. | Stephen Hines | 2012-08-24 | 1 | -0/+1 |
* | | | | | am e630d945: am 6a693d57: Merge "Fixed warnings in libmtdutils" | Jean-Baptiste Queru | 2012-08-24 | 1 | -4/+4 |
|\| | | | |
|
| * | | | | am 6a693d57: Merge "Fixed warnings in libmtdutils" | Jean-Baptiste Queru | 2012-08-24 | 1 | -4/+4 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | Merge "Fixed warnings in libmtdutils" | Jean-Baptiste Queru | 2012-08-23 | 1 | -4/+4 |
| | |\ \ \ |
|
| | | * | | | Fixed warnings in libmtdutils | Edwin Vane | 2012-08-21 | 1 | -4/+4 |
| | | | |/
| | | |/| |
|
* | | | | | am 8876725f: am 0254d573: Merge "Fix multiple defined symbol errors" | Jean-Baptiste Queru | 2012-08-24 | 1 | -1/+1 |
|\| | | | |
|
| * | | | | am 0254d573: Merge "Fix multiple defined symbol errors" | Jean-Baptiste Queru | 2012-08-24 | 1 | -1/+1 |
| |\| | | |
|
| | * | | | Merge "Fix multiple defined symbol errors" | Jean-Baptiste Queru | 2012-08-23 | 1 | -1/+1 |
| | |\ \ \ |
|
| | | * | | | Fix multiple defined symbol errors | Edwin Vane | 2012-08-21 | 1 | -1/+1 |
| | | |/ / |
|
* | | | | | am 7b827d04: am 481e03e3: Merge "Fixed unused param warnings for check-lost+found" | Jean-Baptiste Queru | 2012-08-24 | 1 | -1/+1 |
|\| | | | |
|
| * | | | | am 481e03e3: Merge "Fixed unused param warnings for check-lost+found" | Jean-Baptiste Queru | 2012-08-24 | 1 | -1/+1 |
| |\| | | |
|
| | * | | | Merge "Fixed unused param warnings for check-lost+found" | Jean-Baptiste Queru | 2012-08-23 | 1 | -1/+1 |
| | |\ \ \
| | | |/ /
| | |/| | |
|
| | | * | | Fixed unused param warnings for check-lost+found | Edwin Vane | 2012-08-21 | 1 | -1/+1 |
| | |/ / |
|
* | | | | am 4f33e55d: change recovery images to android with spinner | Doug Zongker | 2012-08-23 | 68 | -13/+16 |
|\| | | |
|
| * | | | change recovery images to android with spinner | Doug Zongker | 2012-08-23 | 68 | -13/+16 |
* | | | | am 02ec6b88: add simple text to recovery UI | Doug Zongker | 2012-08-23 | 13 | -30/+274 |
|\| | | |
|
| * | | | add simple text to recovery UI | Doug Zongker | 2012-08-23 | 13 | -30/+274 |
| | |/
| |/| |
|
* | | | am a3ccba6d: add bonus data feature to imgdiff/imgpatch/applypatch | Doug Zongker | 2012-08-21 | 6 | -22/+100 |
|\| | |
|
| * | | add bonus data feature to imgdiff/imgpatch/applypatch | Doug Zongker | 2012-08-21 | 6 | -22/+100 |
* | | | am 55850258: am 3733d218: Merge changes I664f8dc7,I4154db06,I5e1df90f | Joe Onorato | 2012-08-17 | 1 | -0/+2 |
|\| | |
|
| * | | am 3733d218: Merge changes I664f8dc7,I4154db06,I5e1df90f | Joe Onorato | 2012-08-17 | 3 | -37/+63 |
| |\| |
|
| | * | Merge changes I664f8dc7,I4154db06,I5e1df90f | Joe Onorato | 2012-08-17 | 3 | -37/+63 |
| | |\ |
|
| | | * | Use the static version of libsparse | Joe Onorato | 2012-07-24 | 2 | -2/+2 |
| | | * | Multiple modules with the same name are going away. | Joe Onorato | 2012-07-22 | 2 | -36/+63 |
| | | * | host modules don't need LOCAL_MODULE_TAGS | Joe Onorato | 2012-07-22 | 1 | -1/+0 |
| | |/ |
|
| * | | recovery: import init.recovery.${ro.hardware}.rc | Colin Cross | 2012-08-08 | 1 | -0/+2 |
* | | | Use the static version of libsparse | Joe Onorato | 2012-08-14 | 2 | -2/+2 |
* | | | Multiple modules with the same name are going away. | Joe Onorato | 2012-08-14 | 2 | -36/+63 |
* | | | host modules don't need LOCAL_MODULE_TAGS | Joe Onorato | 2012-08-14 | 1 | -1/+0 |
|/ / |
|
* | | fix the symlink() command to create directories if needed | Doug Zongker | 2012-08-07 | 1 | -3/+29 |
* | | fix conflicts with merge of jb-dev-mako | Ed Heyl | 2012-07-26 | 1 | -2/+4 |
|\ \ |
|
| * | | minui: fix screen update issue | Devin Kim | 2012-07-20 | 1 | -2/+4 |
* | | | support version 2 (2048-bit e=65537) keys in recovery | Doug Zongker | 2012-07-25 | 6 | -5/+114 |
* | | | am dd6cd4fc: Merge "graphics: add support for "single buffering"" | Doug Zongker | 2012-07-21 | 1 | -2/+10 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge "graphics: add support for "single buffering"" | Doug Zongker | 2012-07-21 | 1 | -2/+10 |
| |\ \ |
|
| | * | | graphics: add support for "single buffering" | Octavian Purdila | 2012-07-12 | 1 | -2/+10 |
* | | | | am 989a2859: Merge "Link against libsparse" | Colin Cross | 2012-07-18 | 2 | -3/+3 |
|\| | | |
|
| * | | | Merge "Link against libsparse" | Colin Cross | 2012-07-18 | 2 | -3/+3 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Link against libsparse | Colin Cross | 2012-07-18 | 2 | -3/+3 |
| |/ / |
|
* | | | allow double-quotes or not in TARGET_RECOVERY_PIXEL_FORMAT | Doug Zongker | 2012-07-11 | 1 | -2/+6 |
* | | | Add mode when open(O_CREAT) is used. | Nick Kralevich | 2012-06-27 | 1 | -2/+2 |
|/ / |
|
* | | am 6d60667d: Merge "Use a dependency file to replace the list file." | Ying Wang | 2012-06-12 | 1 | -10/+14 |
|\ \ |
|
| * \ | Merge "Use a dependency file to replace the list file." | Ying Wang | 2012-06-12 | 1 | -10/+14 |
| |\ \ |
|
| | * | | Use a dependency file to replace the list file. | Ying Wang | 2012-06-11 | 1 | -10/+14 |
| |/ / |
|
| | | | |
| \ \ | |
*-. | | | Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-16 | 0 | -0/+0 |
|\ \| |
| |_|/
|/| | |
|
| * | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-04-30 | 0 | -0/+0 |
|/| | |
|
| * | | merge in jb-release history after reset to master | The Android Automerger | 2012-04-16 | 0 | -0/+0 |
| |\ \ |
|
| | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-10 | 0 | -0/+0 |
| | |\ \ |
|
| | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-09 | 0 | -0/+0 |
| | | |\ \ |
|
| | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-02 | 0 | -0/+0 |
| | | | |\ \ |
|
| | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-26 | 0 | -0/+0 |
| | | | | |\ \ |
|
| | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-21 | 0 | -0/+0 |
| | | | | | |\ \ |
|
| | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-20 | 0 | -0/+0 |
| | | | | | | |\ \ |
|
* | | | | | | | | | | fix timed progress bars in recovery | Doug Zongker | 2012-04-26 | 1 | -4/+8 |
|/ / / / / / / / / |
|
* | | | | | | | | | am e5d5ac76: minor recovery changes | Doug Zongker | 2012-04-12 | 4 | -4/+18 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | | |
|
| * | | | | | | | | minor recovery changes | Doug Zongker | 2012-04-12 | 4 | -4/+18 |
* | | | | | | | | | Merge "Add NOTICE file" | Doug Zongker | 2012-04-09 | 1 | -0/+41 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Add NOTICE file | Wei Zhong | 2012-04-06 | 1 | -0/+41 |
* | | | | | | | | | | Update merge for SELinux to compile | Kenny Root | 2012-04-08 | 1 | -1/+1 |
| |_|/ / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | am 78911bdf: am 2a4ab824: Merge "Change the format command to always take the mount point as an argument." | Kenny Root | 2012-04-07 | 1 | -13/+4 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | | |
|
| * | | | | | | | | am 2a4ab824: Merge "Change the format command to always take the mount point as an argument." | Kenny Root | 2012-04-07 | 1 | -13/+4 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Change the format command to always take the mount point as an argument." | Kenny Root | 2012-04-06 | 1 | -13/+4 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | Change the format command to always take the mount point as an argument. | Stephen Smalley | 2012-04-03 | 1 | -13/+4 |
| | |/ / / / / / / |
|
* | | | | | | | | | Merge remote-tracking branch 'goog/ics-aah' | Mike Lockwood | 2012-04-03 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \
| | |_|/ / / / / /
| |/| | / / / / /
| |_|_|/ / / / /
|/| | | | | | | |
|
| * | | | | | | | run minadbd as shell user, remove unused code | Doug Zongker | 2012-03-20 | 9 | -1171/+40 |
* | | | | | | | | resolved conflicts for merge of 0b1fee1b to master | Kenny Root | 2012-03-31 | 12 | -16/+167 |
|\ \ \ \ \ \ \ \
| | |/ / / / / /
| |/| | / / / /
| |_|_|/ / / /
|/| | | | | | |
|
| * | | | | | | am 155cd3c1: Merge changes Ied379f26,I09fb9d56 | Kenny Root | 2012-03-31 | 12 | -16/+167 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge changes Ied379f26,I09fb9d56 | Kenny Root | 2012-03-31 | 12 | -16/+167 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Extend recovery and updater to support setting file security contexts. | Stephen Smalley | 2012-03-30 | 12 | -18/+153 |
| | | * | | | | | Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used. | Stephen Smalley | 2012-01-24 | 2 | -0/+16 |
| | |/ / / / / |
|
* | | | | | | | Merge "fail edify script if set_perm() or symlink() fails" | Doug Zongker | 2012-03-22 | 1 | -0/+13 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | fail edify script if set_perm() or symlink() fails | Doug Zongker | 2012-03-22 | 1 | -0/+13 |
| | |_|_|_|_|/
| |/| | | | | |
|
* | | | | | | | Merge remote-tracking branch 'goog/ics-aah-exp' | Mike Lockwood | 2012-03-21 | 0 | -0/+0 |
|\ \ \ \ \ \ \
| | |_|_|/ / /
| |/| | | / /
| |_|_|_|/ /
|/| | | | | |
|
| * | | | | | Merge "allow recovery UI to ignore certain keypresses" into ics-aah | Doug Zongker | 2012-01-18 | 2 | -1/+4 |
| |\ \ \ \ \ |
|
| | * | | | | | allow recovery UI to ignore certain keypresses | Doug Zongker | 2012-01-18 | 2 | -1/+4 |
| * | | | | | | support "sideload over ADB" mode | Doug Zongker | 2012-01-18 | 23 | -16/+5713 |
| |/ / / / / |
|
| * | | | | | fix verifier test | Doug Zongker | 2011-11-01 | 2 | -7/+2 |
| * | | | | | move key processing to RecoveryUI | Doug Zongker | 2011-11-01 | 7 | -264/+296 |
| * | | | | | Merge "verifier_test needs to provide a UI object" into ics-aah | Doug Zongker | 2011-10-31 | 1 | -10/+36 |
| |\ \ \ \ \ |
|
| | * | | | | | verifier_test needs to provide a UI object | Doug Zongker | 2011-10-31 | 1 | -10/+36 |
| * | | | | | | C++ class for device-specific code | Doug Zongker | 2011-10-31 | 10 | -245/+322 |
| * | | | | | | refactor ui functions into a class | Doug Zongker | 2011-10-29 | 7 | -324/+436 |
| |/ / / / / |
|
| * | | | | | turn recovery into a C++ binary | Doug Zongker | 2011-10-28 | 20 | -148/+254 |
* | | | | | | remove unused code from minadbd | Doug Zongker | 2012-03-20 | 6 | -1157/+9 |
| |/ / / /
|/| | | | |
|
* | | | | | run minadbd as shell user | Doug Zongker | 2012-03-20 | 5 | -14/+31 |
| |_|_|/
|/| | | |
|
* | | | | remove retouching code from updater | Doug Zongker | 2012-02-28 | 3 | -334/+0 |
* | | | | fix build | Doug Zongker | 2012-02-28 | 3 | -4/+4 |
* | | | | fix failure to free memory | Doug Zongker | 2012-02-28 | 2 | -19/+45 |
* | | | | am 62947db5: am 37d0f260: Reconcile with ics-mr1-release | The Android Open Source Project | 2012-02-01 | 0 | -0/+0 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | am 37d0f260: Reconcile with ics-mr1-release | The Android Open Source Project | 2012-02-01 | 0 | -0/+0 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | Reconcile with ics-mr1-release | The Android Open Source Project | 2012-02-01 | 0 | -0/+0 |
| | |\ \
| | | |/
| | |/| |
|
* | | | | libz is a superset of libunz, so we don't need both. | Elliott Hughes | 2012-01-31 | 1 | -2/+2 |
* | | | | allow recovery UI to ignore certain keypresses | Doug Zongker | 2012-01-19 | 2 | -1/+4 |
* | | | | always initialize usb product, vendor, etc. for adb in recovery | Doug Zongker | 2012-01-10 | 1 | -7/+9 |
* | | | | Merge "support "sideload over ADB" mode" | Doug Zongker | 2012-01-10 | 22 | -9/+5704 |
|\ \ \ \ |
|
| * | | | | support "sideload over ADB" mode | Doug Zongker | 2012-01-10 | 22 | -9/+5704 |
* | | | | | recovery: convert all usages of $prop to ${prop} | Dima Zavin | 2012-01-10 | 1 | -3/+3 |
* | | | | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE | Steve Block | 2012-01-08 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE | Steve Block | 2012-01-06 | 1 | -2/+2 |
* | | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE | Steve Block | 2012-01-04 | 1 | -2/+2 |
* | | | | mount cache before sideloading from external storage | Doug Zongker | 2011-12-14 | 1 | -0/+4 |
* | | | | am 9fc3e3c8: Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-09 | 0 | -0/+0 |
|\| | | |
|
| * | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-08 | 0 | -0/+0 |
| |\ \ \
| | |/ /
| |/| /
| | |/ |
|
* | | | move key processing to RecoveryUI | Doug Zongker | 2011-11-04 | 8 | -271/+298 |
* | | | C++ class for device-specific code | Doug Zongker | 2011-10-31 | 11 | -261/+364 |
* | | | temporarily remove verifier_test binary | Doug Zongker | 2011-10-31 | 1 | -6/+6 |
* | | | refactor ui functions into a class | Doug Zongker | 2011-10-31 | 7 | -324/+436 |
* | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-10-31 | 0 | -0/+0 |
|\ \ \
| | |/
| |/| |
|
| * | | merge in ics-release history after reset to master | The Android Automerger | 2011-10-23 | 0 | -0/+0 |
| |\ \
| | |/
| |/| |
|
| | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-16 | 0 | -0/+0 |
| | |\ |
|
| | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-28 | 0 | -0/+0 |
| | | |\ |
|
| | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-21 | 0 | -0/+0 |
| | | | |\ |
|
| | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-05 | 0 | -0/+0 |
| | | | | |\ |
|
| | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-22 | 0 | -0/+0 |
| | | | | | |\ |
|
| | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-15 | 0 | -0/+0 |
| | | | | | | |\ |
|
| | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-14 | 0 | -0/+0 |
| | | | | | | | |\ |
|
| | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-13 | 0 | -0/+0 |
| | | | | | | | | |\ |
|
| | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-08 | 0 | -0/+0 |
| | | | | | | | | | |\ |
|
| | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-06-30 | 0 | -0/+0 |
| | | | | | | | | | | |\ |
|
| | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-06-27 | 0 | -0/+0 |
| | | | | | | | | | | | |\ |
|
| | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-06-24 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ |
|
| | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-06-24 | 0 | -0/+0 |
| | | | | | | | | | | | | |/| |
|
| | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-06-23 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ |
|
| | | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-06-21 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ |
|
| | | | | | | | | | | | | | | | * | Fix starting adb in recovery mode | Mike Lockwood | 2011-06-20 | 1 | -3/+27 |
* | | | | | | | | | | | | | | | | | turn recovery into a C++ binary | Doug Zongker | 2011-10-31 | 20 | -148/+254 |
|/ / / / / / / / / / / / / / / / |
|
* / / / / / / / / / / / / / / / | allow recovery packages to wipe cache | Doug Zongker | 2011-10-19 | 4 | -26/+71 |
|/ / / / / / / / / / / / / / / |
|
* / / / / / / / / / / / / / / | minui: add ability to synchronize current key state | Dima Zavin | 2011-10-13 | 2 | -2/+38 |
|/ / / / / / / / / / / / / / |
|
* / / / / / / / / / / / / / | fix problem where the screen is sometimes all black in recovery | Doug Zongker | 2011-09-27 | 1 | -0/+3 |
|/ / / / / / / / / / / / / |
|
* / / / / / / / / / / / / | update recovery with new 3D images | Doug Zongker | 2011-09-20 | 10 | -1/+1 |
|/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | minui: events: only open input devices with EV_KEY and/or EV_REL | Dima Zavin | 2011-09-02 | 1 | -0/+17 |
* | | | | | | | | | | | | minui: events: add ability to poll on non-input fds | Dima Zavin | 2011-09-02 | 2 | -3/+23 |
* | | | | | | | | | | | | minui: events: refactor event acquisition | Dima Zavin | 2011-09-02 | 3 | -75/+121 |
* | | | | | | | | | | | | minui: graphics: add interface for framebuffer blank/unblank | Dima Zavin | 2011-08-30 | 2 | -0/+13 |
* | | | | | | | | | | | | minui: graphics: add ability to query font size | Dima Zavin | 2011-08-30 | 2 | -0/+7 |
|/ / / / / / / / / / / |
|
* / / / / / / / / / / | change recovery images to match blue holo theme | Doug Zongker | 2011-08-20 | 18 | -1/+1 |
|/ / / / / / / / / / |
|
* / / / / / / / / / | Support multiple recovery updater extensions. | Michael Ward | 2011-07-15 | 1 | -2/+2 |
|/ / / / / / / / / |
|
* | | | | | | | | | Merge "Check pointer for null before dereferencing" | Doug Zongker | 2011-07-14 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | | |
|
| * | | | | | | | | Check pointer for null before dereferencing | Adam Bliss | 2011-07-14 | 1 | -0/+8 |
* | | | | | | | | | Merge "Update usb_connected() to support new gadget driver" | Benoit Goby | 2011-07-13 | 1 | -4/+5 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Update usb_connected() to support new gadget driver | Benoit Goby | 2011-07-12 | 1 | -4/+5 |
| | |/ / / / / / /
| |/| | | | | | | |
|
* / | | | | | | | | Remove the simulator target from all makefiles. | Jeff Brown | 2011-07-12 | 4 | -16/+0 |
|/ / / / / / / / |
|
* | / / / / / / | Add missing commands to recovery init.rc | Michael Ward | 2011-07-07 | 1 | -0/+3 |
| |/ / / / / /
|/| | | | | | |
|
* | | | | | | | init.rc: Simplify logic for starting adbd in recovery | Mike Lockwood | 2011-06-29 | 1 | -25/+6 |
| |/ / / / /
|/| | | | | |
|
* | | | | | | Allow applying an OTA package manually from cache. | Michael Ward | 2011-06-24 | 3 | -9/+33 |
* | | | | | | Get the correct line_length. | Michael Ward | 2011-06-24 | 1 | -2/+37 |
| |/ / / /
|/| | | | |
|
* | | | | | fix adb root in recovery | Doug Zongker | 2011-06-24 | 1 | -0/+4 |
| |/ / /
|/| | | |
|
* | | | | Graphics can handle stride != xres, and BGRA support. | Michael Ward | 2011-06-23 | 2 | -12/+18 |
| |/ /
|/| | |
|
* | | | Fix starting adb in recovery mode | Mike Lockwood | 2011-06-19 | 1 | -3/+27 |
| |/
|/| |
|
* | | am f84b2524: am 6ebedf00: am 82da01d6: Merge from gingerbread | Jean-Baptiste Queru | 2011-06-08 | 0 | -0/+0 |
|\ \ |
|
| * \ | am 6ebedf00: am 82da01d6: Merge from gingerbread | Jean-Baptiste Queru | 2011-06-07 | 0 | -0/+0 |
| |\ \ |
|
| | * \ | am 82da01d6: Merge from gingerbread | Jean-Baptiste Queru | 2011-06-01 | 0 | -0/+0 |
| | |\ \ |
|
| | | * \ | Merge from gingerbread | Jean-Baptiste Queru | 2011-06-01 | 1 | -1/+1 |
| | | |\ \ |
|
* | | | | | | am a94d9548: am 1117c69f: am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbread | Jean-Baptiste Queru | 2011-06-08 | 0 | -0/+0 |
|\| | | | |
| |_|_|_|/
|/| | | | |
|
| * | | | | am 1117c69f: am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbread | Jean-Baptiste Queru | 2011-06-07 | 0 | -0/+0 |
| |\| | | |
|
| | * | | | am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbread | Jean-Baptiste Queru | 2011-06-01 | 1 | -1/+1 |
| | |\ \ \
| | | |/ /
| | |/| /
| | | |/ |
|
| | | * | Merge "Mute unharmful build warning at the top of the build log:" into gingerbread | Jean-Baptiste Queru | 2011-05-31 | 1 | -1/+1 |
| | | |\ |
|
| | | | * | Mute unharmful build warning at the top of the build log: | Ying Wang | 2011-05-25 | 1 | -1/+1 |
| | | |/ |
|
* | | | | Reconcile with honeycomb-release | The Android Open Source Project | 2011-05-20 | 0 | -0/+0 |
|\ \ \ \ |
|
| * | | | | store partition length in recovery.fstab | Doug Zongker | 2011-02-25 | 2 | -9/+41 |
* | | | | | am c2a158db: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE | The Android Automerger | 2011-05-09 | 0 | -0/+0 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE | The Android Automerger | 2011-05-09 | 0 | -0/+0 |
| |\ \ \ \ |
|
| | * | | | | delay accessing misc partition until its device exists | Doug Zongker | 2011-05-04 | 1 | -0/+21 |
* | | | | | | am 90588820: delay accessing misc partition until its device exists | Doug Zongker | 2011-05-04 | 0 | -0/+0 |
|\| | | | | |
|
| * | | | | | delay accessing misc partition until its device exists | Doug Zongker | 2011-05-04 | 1 | -0/+21 |
| |/ / / / |
|
* | | | | | delay accessing misc partition until its device exists | Doug Zongker | 2011-04-22 | 1 | -0/+21 |
* | | | | | make write_raw_image able to take a blob | Doug Zongker | 2011-04-13 | 1 | -27/+40 |
* | | | | | save a last_install file with the result of the last package install attempt | Doug Zongker | 2011-04-12 | 4 | -6/+30 |
* | | | | | am 4762633c: log which key a package verified against in recovery | Doug Zongker | 2011-03-15 | 1 | -1/+1 |
|\| | | | |
|
| * | | | | log which key a package verified against in recovery | Doug Zongker | 2011-03-15 | 1 | -1/+1 |
* | | | | | recovery: mount /sdcard read-only | Iliyan Malchev | 2011-03-12 | 1 | -2/+3 |
* | | | | | am 6e4472ab: Have recovery reboot using the new android_reboot() function. | Ken Sumrall | 2011-03-11 | 2 | -5/+4 |
|\| | | | |
|
| * | | | | Have recovery reboot using the new android_reboot() function. | Ken Sumrall | 2011-03-11 | 2 | -5/+4 |
* | | | | | am 6ce4a326: don\'t reboot for inactivity if USB is connected | Doug Zongker | 2011-03-09 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | don't reboot for inactivity if USB is connected | Doug Zongker | 2011-03-09 | 1 | -13/+38 |
* | | | | | don't reboot for inactivity if USB is connected | Doug Zongker | 2011-03-08 | 1 | -13/+38 |
* | | | | | am 68189f29: allow paletted RGB images in recovery | Doug Zongker | 2011-03-08 | 1 | -2/+7 |
|\| | | | |
|
| * | | | | allow paletted RGB images in recovery | Doug Zongker | 2011-03-05 | 1 | -2/+7 |
* | | | | | Merge branch 'master' of ssh://android-git:29418/platform/bootable/recovery | Eric Fischer | 2011-03-04 | 0 | -0/+0 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | convert recovery images to palettized PNGs | Doug Zongker | 2011-03-03 | 9 | -0/+0 |
* | | | | | convert recovery images to palettized PNGs | Doug Zongker | 2011-03-04 | 9 | -0/+0 |
|/ / / / |
|
* | | | | change the default recovery assets to be in holograph style | Doug Zongker | 2011-03-02 | 25 | -11/+111 |
* | | | | make recovery UI images more general; allow for installation animation | Doug Zongker | 2011-03-01 | 6 | -50/+169 |
* | | | | am 8d43d940: am 2c273f00: store partition length in recovery.fstab | Doug Zongker | 2011-02-25 | 0 | -0/+0 |
|\ \ \ \ |
|
| * \ \ \ | am 2c273f00: store partition length in recovery.fstab | Doug Zongker | 2011-02-25 | 2 | -9/+41 |
| |\ \ \ \ |
|
| | * | | | | store partition length in recovery.fstab | Doug Zongker | 2011-02-25 | 2 | -9/+41 |
| | |/ / / |
|
* | | | | | store partition length in recovery.fstab | Doug Zongker | 2011-02-18 | 2 | -9/+41 |
* | | | | | Fix x86 build. | Ying Wang | 2011-02-09 | 3 | -7/+0 |
* | | | | | am 5df22d03: am 5cae445e: make recovery reboot after 2 minutes of no activity | Doug Zongker | 2011-01-25 | 3 | -4/+42 |
|\| | | | |
|
| * | | | | am 5cae445e: make recovery reboot after 2 minutes of no activity | Doug Zongker | 2011-01-25 | 3 | -4/+42 |
| |\| | | |
|
| | * | | | make recovery reboot after 2 minutes of no activity | Doug Zongker | 2011-01-25 | 3 | -4/+42 |
* | | | | | am da993fcf: am 8d58c957: Merge "Free allocated struct after freeing field" | Doug Zongker | 2011-01-22 | 1 | -1/+1 |
|\| | | | |
|
| * | | | | am 8d58c957: Merge "Free allocated struct after freeing field" | Doug Zongker | 2011-01-22 | 1 | -1/+1 |
| |\ \ \ \
| | |/ / /
| |/| / /
| | |/ / |
|
| | * | | Merge "Free allocated struct after freeing field" | Doug Zongker | 2011-01-20 | 1 | -1/+1 |
| | |\ \ |
|
| | | * | | Free allocated struct after freeing field | Christian Lindeberg | 2011-01-19 | 1 | -1/+1 |
| | |/ / |
|
* | | | | Merge "remove encrypted filesystem code from recovery" | Doug Zongker | 2011-01-21 | 4 | -399/+2 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | remove encrypted filesystem code from recovery | Doug Zongker | 2011-01-18 | 4 | -399/+2 |
* | | | | Reserve the last 16 Kbytes of /data for the crypto footer. | Ken Sumrall | 2011-01-20 | 2 | -10/+17 |
|/ / / |
|
* | | | option to allow recovery to use 24-bit graphics in UI | Doug Zongker | 2011-01-14 | 2 | -10/+22 |
* | | | Update make_ext4fs arguments in roots.c | Colin Cross | 2011-01-06 | 1 | -1/+1 |
* | | | Update arguments to make_ext4fs | Colin Cross | 2010-12-29 | 1 | -1/+1 |
* | | | am c5ebf1fb: am 5d6309e7: fix comparison of ECC stats before and after mtd reads | Doug Zongker | 2010-11-04 | 1 | -0/+2 |
|\| | |
|
| * | | am 5d6309e7: fix comparison of ECC stats before and after mtd reads | Doug Zongker | 2010-11-03 | 1 | -0/+2 |
| |\| |
|
| | * | fix comparison of ECC stats before and after mtd reads | Doug Zongker | 2010-11-03 | 1 | -0/+2 |
* | | | am 8521ef59: am 51266d13: clear recovery framebuffers on allocation; display icon right after ui_init | Doug Zongker | 2010-11-01 | 2 | -1/+3 |
|\| | |
|
| * | | am 51266d13: clear recovery framebuffers on allocation; display icon right after ui_init | Doug Zongker | 2010-11-01 | 2 | -1/+3 |
| |\| |
|
| | * | clear recovery framebuffers on allocation; display icon right after ui_init | Doug Zongker | 2010-11-01 | 2 | -1/+3 |
* | | | am 2d87023e: am 2c3539e4: save the log from recovery\'s last run in /cache/recovery/last_log | Doug Zongker | 2010-09-30 | 1 | -17/+40 |
|\| | |
|
| * | | am 2c3539e4: save the log from recovery\'s last run in /cache/recovery/last_log | Doug Zongker | 2010-09-29 | 1 | -17/+40 |
| |\| |
|
| | * | save the log from recovery's last run in /cache/recovery/last_log | Doug Zongker | 2010-09-29 | 1 | -17/+40 |
* | | | am 704fa750: am 9b125b04: handle old-style CACHE: packages | Doug Zongker | 2010-09-22 | 1 | -2/+18 |
|\| | |
|
| * | | am 9b125b04: handle old-style CACHE: packages | Doug Zongker | 2010-09-22 | 1 | -2/+18 |
| |\| |
|
| | * | handle old-style CACHE: packages | Doug Zongker | 2010-09-22 | 1 | -2/+18 |
* | | | am af78591c: am 2c3c5c15: Merge "mount sdcard only on demand; fix sideload installs" into gingerbread | Doug Zongker | 2010-09-22 | 2 | -3/+26 |
|\| | |
|
| * | | am 2c3c5c15: Merge "mount sdcard only on demand; fix sideload installs" into gingerbread | Doug Zongker | 2010-09-22 | 2 | -3/+26 |
| |\| |
|
| | * | Merge "mount sdcard only on demand; fix sideload installs" into gingerbread | Doug Zongker | 2010-09-22 | 2 | -3/+26 |
| | |\ |
|
| | | * | mount sdcard only on demand; fix sideload installs | Doug Zongker | 2010-09-22 | 2 | -3/+26 |
* | | | | am 8147ba85: (-s ours) am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge) | Doug Zongker | 2010-09-21 | 0 | -0/+0 |
|\| | | |
|
| * | | | am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge) | Doug Zongker | 2010-09-21 | 1 | -2/+2 |
| |\| | |
|
| | * | | use fs_type "emmc" instead of "block" for consistency (do not merge) | Doug Zongker | 2010-09-21 | 1 | -2/+2 |
| | |/ |
|
* | | | remove the notion of "root path"; support mixed flash types | Doug Zongker | 2010-09-21 | 9 | -535/+323 |
* | | | am 3dba40da: (-s ours) am d4208f9f: remove the notion of "root path"; support mixed flash types (do not merge) | Doug Zongker | 2010-09-21 | 0 | -0/+0 |
|\| | |
|
| * | | am d4208f9f: remove the notion of "root path"; support mixed flash types (do not merge) | Doug Zongker | 2010-09-21 | 9 | -471/+340 |
| |\| |
|
| | * | remove the notion of "root path"; support mixed flash types (do not merge) | Doug Zongker | 2010-09-21 | 9 | -471/+340 |
* | | | resolved conflicts for merge of 40f0d3b4 to master | Doug Zongker | 2010-09-18 | 3 | -82/+3 |
|\| | |
|
| * | | am d7d42089: remove unneeded partition roots | Doug Zongker | 2010-09-17 | 3 | -82/+2 |
| |\| |
|
| | * | remove unneeded partition roots | Doug Zongker | 2010-09-17 | 3 | -82/+2 |
* | | | am 1dcd2fd0: (-s ours) am 792b0071: do not merge - update to match ext4utils api | Brian Swetland | 2010-09-16 | 0 | -0/+0 |
|\| | |
|
| * | | am 792b0071: do not merge - update to match ext4utils api | Brian Swetland | 2010-09-16 | 1 | -1/+1 |
| |\| |
|
| | * | do not merge - update to match ext4utils api | Brian Swetland | 2010-09-16 | 1 | -1/+1 |
* | | | add missing sparseness parameter | Doug Zongker | 2010-09-16 | 1 | -1/+1 |
* | | | resolved conflicts for merge of 85bcf776 to master | Doug Zongker | 2010-09-16 | 0 | -0/+0 |
|\| | |
|
| * | | am 8a8e6cc3: (cherry-pick) EMMC support in applypatch | Doug Zongker | 2010-09-15 | 2 | -103/+176 |
| |\| |
|
| | * | (cherry-pick) EMMC support in applypatch | Doug Zongker | 2010-09-15 | 2 | -103/+176 |
* | | | resolved conflicts for merge of 9f89b0e4 to master | Doug Zongker | 2010-09-16 | 1 | -1/+1 |
|\| | |
|
| * | | am 56c5105b: support for ext4/EMMC filesystems in updater binary | Doug Zongker | 2010-09-15 | 6 | -37/+76 |
| |\| |
|
| | * | support for ext4/EMMC filesystems in updater binary | Doug Zongker | 2010-09-15 | 6 | -37/+76 |
* | | | resolved conflicts for merge of 76445f3a to master | Doug Zongker | 2010-09-16 | 1 | -20/+9 |
|\| | |
|
| * | | am 8674a726: (cherry-pick) support installing any .zip file on the sdcard | Doug Zongker | 2010-09-15 | 4 | -29/+144 |
| |\| |
|
| | * | (cherry-pick) support installing any .zip file on the sdcard | Doug Zongker | 2010-09-15 | 4 | -29/+144 |
* | | | am 858f0a76: am 8e5e4dad: close update package before installing; allow remount | Doug Zongker | 2010-09-16 | 5 | -3/+17 |
|\| | |
|
| * | | am 8e5e4dad: close update package before installing; allow remount | Doug Zongker | 2010-09-15 | 5 | -3/+17 |
| |\| |
|
| | * | close update package before installing; allow remount | Doug Zongker | 2010-09-15 | 5 | -3/+17 |
* | | | am bd4bc088: am d12560aa: add the ability to seek to a raw location while reading MTD partition | Doug Zongker | 2010-09-15 | 2 | -0/+8 |
|\| | |
|
| * | | am d12560aa: add the ability to seek to a raw location while reading MTD partition | Doug Zongker | 2010-09-15 | 2 | -0/+8 |
| |\| |
|
| | * | add the ability to seek to a raw location while reading MTD partition | Doug Zongker | 2010-09-15 | 2 | -0/+8 |
* | | | am f94a3575: am 61ba7a83: stop treating all-zero blocks as bad | Doug Zongker | 2010-09-12 | 1 | -8/+1 |
|\| | |
|
| * | | am 61ba7a83: stop treating all-zero blocks as bad | Doug Zongker | 2010-09-12 | 1 | -8/+1 |
| |\| |
|
| | * | stop treating all-zero blocks as bad | Doug Zongker | 2010-09-12 | 1 | -8/+1 |
* | | | am a2c9a1e8: am aaf3f56c: block is bad if ioctl() returns nonzero | Doug Zongker | 2010-09-10 | 1 | -2/+5 |
|\| | |
|
| * | | am aaf3f56c: block is bad if ioctl() returns nonzero | Doug Zongker | 2010-09-10 | 1 | -2/+5 |
| |\| |
|
| | * | block is bad if ioctl() returns nonzero | Doug Zongker | 2010-09-10 | 1 | -2/+5 |
* | | | am 28cae98c: am 4bc98062: add --show_text option to recovery | Doug Zongker | 2010-09-03 | 3 | -0/+11 |
|\| | |
|
| * | | am 4bc98062: add --show_text option to recovery | Doug Zongker | 2010-09-03 | 3 | -0/+11 |
| |\| |
|
| | * | add --show_text option to recovery | Doug Zongker | 2010-09-03 | 3 | -0/+11 |
* | | | am 4c7c2f73: (-s ours) am 532c8600: Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3 | Ying Wang | 2010-09-02 | 0 | -0/+0 |
|\| | |
|
| * | | am 532c8600: Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3 | Ying Wang | 2010-09-01 | 3 | -6/+5 |
| |\| |
|
| | * | Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3 | Ying Wang | 2010-09-01 | 3 | -6/+5 |
* | | | am 17b44ee3: (-s ours) am 21f0f97e: Fix for crespo. | Ying Wang | 2010-09-02 | 0 | -0/+0 |
|\| | |
|
| * | | am 21f0f97e: Fix for crespo. | Ying Wang | 2010-09-01 | 3 | -5/+6 |
| |\| |
|
| | * | Fix for crespo. | Ying Wang | 2010-08-31 | 3 | -5/+6 |
* | | | am 97900287: am 965f9dc4: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward | Jean-Baptiste Queru | 2010-08-24 | 0 | -0/+0 |
|\| | |
|
| * | | am 965f9dc4: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward | Jean-Baptiste Queru | 2010-08-24 | 0 | -0/+0 |
| |\| |
|
| | * | merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward | Jean-Baptiste Queru | 2010-08-24 | 0 | -0/+0 |
| | |\ |
|
| | | * | fix bug in applying patches | Doug Zongker | 2010-08-13 | 1 | -1/+1 |
| | | * | remove shadowed variable declaration | Doug Zongker | 2010-08-13 | 1 | -1/+2 |
* | | | | am c080bc54: am fbd7ae7a: am 201cd466: remove shadowed variable declaration | Doug Zongker | 2010-08-16 | 1 | -1/+2 |
|\| | | |
|
| * | | | am fbd7ae7a: am 201cd466: remove shadowed variable declaration | Doug Zongker | 2010-08-13 | 1 | -1/+2 |
| |\| | |
|
| | * | | am 201cd466: remove shadowed variable declaration | Doug Zongker | 2010-08-13 | 1 | -1/+2 |
| | |\ \ |
|
| | | * | | remove shadowed variable declaration | Doug Zongker | 2010-08-13 | 1 | -1/+2 |
* | | | | | Changes to work with updated make_ext4fs tool that supports creating sparse images. | Ken Sumrall | 2010-08-14 | 2 | -2/+2 |
* | | | | | am c4e32005: am 17986e6b: am 8cd9e4f3: fix bug in applying patches | Doug Zongker | 2010-08-13 | 1 | -1/+1 |
|\| | | | |
|
| * | | | | am 17986e6b: am 8cd9e4f3: fix bug in applying patches | Doug Zongker | 2010-08-13 | 1 | -1/+1 |
| |\| | | |
|
| | * | | | am 8cd9e4f3: fix bug in applying patches | Doug Zongker | 2010-08-13 | 1 | -1/+1 |
| | |\| | |
|
| | | * | | fix bug in applying patches | Doug Zongker | 2010-08-13 | 1 | -1/+1 |
| | | |/ |
|
* | | | | support using an EMMC misc partition to store recovery arguments | Doug Zongker | 2010-08-13 | 2 | -3/+56 |
* | | | | Working ASLR implementation | Hristo Bojinov | 2010-08-02 | 10 | -18/+649 |
* | | | | don't go into file select menu when mounting external storage fails | Doug Zongker | 2010-08-02 | 1 | -1/+4 |
* | | | | generalize "install from sdcard" to "install from external storage" | Doug Zongker | 2010-07-30 | 4 | -9/+11 |
* | | | | Mute unwanted error message | Ying Wang | 2010-07-21 | 1 | -1/+1 |
* | | | | resolved conflicts for merge of c02c37a1 to master | Doug Zongker | 2010-07-09 | 2 | -8/+122 |
|\| | | |
|
| * | | | am 23ceeea8: make a copy of sideloaded packages in /tmp before verifying | Doug Zongker | 2010-07-09 | 2 | -4/+117 |
| |\| | |
|
| | * | | make a copy of sideloaded packages in /tmp before verifying | Doug Zongker | 2010-07-09 | 2 | -4/+117 |
* | | | | EMMC support in applypatch | Doug Zongker | 2010-07-08 | 2 | -103/+176 |
* | | | | support for ext4/EMMC filesystems in updater binary | Doug Zongker | 2010-07-02 | 6 | -37/+76 |
* | | | | Merge "support userdata and cache partitions using emmc/ext4 instead of mtd/yaffs" | Doug Zongker | 2010-07-01 | 2 | -5/+40 |
|\ \ \ \ |
|
| * | | | | support userdata and cache partitions using emmc/ext4 instead of mtd/yaffs | Doug Zongker | 2010-06-30 | 2 | -5/+40 |
* | | | | | am 60faafcf: merge from open-source master | The Android Open Source Project | 2010-07-01 | 0 | -0/+0 |
|\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / / |
|
| * | | | merge from open-source master | The Android Open Source Project | 2010-07-01 | 0 | -0/+0 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | am ecc76ba5: Set adbd to be disabled by default in recovery | Kenny Root | 2010-06-28 | 1 | -0/+1 |
| | |\| |
|
* | | | | am c78a9698: am ecc76ba5: Set adbd to be disabled by default in recovery | Kenny Root | 2010-06-28 | 1 | -0/+1 |
|\| | | |
|
| * | | | am ecc76ba5: Set adbd to be disabled by default in recovery | Kenny Root | 2010-06-28 | 1 | -0/+1 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Set adbd to be disabled by default in recovery | Kenny Root | 2010-06-28 | 1 | -0/+1 |
* | | | | am 21b97ed5: Add __attribute__((format(printf, a, b))) to printf like functions. | Nick Kralevich | 2010-06-25 | 2 | -2/+2 |
|\| | | |
|
| * | | | Add __attribute__((format(printf, a, b))) to printf like functions. | Nick Kralevich | 2010-06-25 | 2 | -2/+2 |
* | | | | am dd6a0412: recovery: Add ueventd service | Colin Cross | 2010-05-14 | 1 | -0/+4 |
|\| | | |
|
| * | | | recovery: Add ueventd service | Colin Cross | 2010-05-14 | 1 | -0/+4 |
* | | | | am be42930f: am 97ca48e7: generic_x86 support | Bruce Beare | 2010-05-04 | 1 | -0/+2 |
|\| | | |
|
| * | | | am 97ca48e7: generic_x86 support | Bruce Beare | 2010-05-04 | 1 | -0/+2 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | generic_x86 support | Bruce Beare | 2010-05-04 | 1 | -0/+2 |
| | |/ |
|
* | | | support installing any .zip file on the sdcard | Doug Zongker | 2010-04-08 | 4 | -24/+144 |
* | | | am 52219a68: (-s ours) DO NOT MERGE Encrypted File Systems integration. Recovery changes. | Oscar Montemayor | 2010-04-02 | 0 | -0/+0 |
|\| | |
|
| * | | DO NOT MERGE | Oscar Montemayor | 2010-04-02 | 6 | -242/+354 |
* | | | Merge "Encrypted File Systems part 3. Recovery changes." | Oscar Montemayor | 2010-03-31 | 6 | -242/+354 |
|\ \ \ |
|
| * | | | Encrypted File Systems part 3. Recovery changes. | Oscar Montemayor | 2010-03-15 | 6 | -242/+354 |
* | | | | am 51282faa: (-s ours) am 2654f5aa: (-s ours) DO NOT MERGE Removing unused recovey options. Please refer to Bug#2502219 for more info. | Oscar Montemayor | 2010-03-30 | 0 | -0/+0 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * / | am 2654f5aa: (-s ours) DO NOT MERGE Removing unused recovey options. Please refer to Bug#2502219 for more info. | Oscar Montemayor | 2010-03-30 | 0 | -0/+0 |
|/| |
| |/ |
|
| * | DO NOT MERGE | Oscar Montemayor | 2010-03-27 | 4 | -268/+2 |
|/ |
|
* | Add an empty CleanSpec.mk | Jean-Baptiste Queru | 2010-03-09 | 1 | -0/+49 |
* | make StringValue wrapper okay to call on NULL | Doug Zongker | 2010-02-25 | 1 | -0/+1 |
* | refactor applypatch and friends | Doug Zongker | 2010-02-23 | 12 | -1322/+1296 |
* | add missing includes to fix mac build (maybe) | Doug Zongker | 2010-02-20 | 2 | -0/+4 |
* | relocate applypatch; add type system and new functions to edify | Doug Zongker | 2010-02-18 | 22 | -112/+4239 |
* | Filename check and free allocated strings | Kenny Root | 2010-02-18 | 2 | -0/+7 |
* | am da846fcf: am 4c382b13: reconcile main tree with open-source eclair | The Android Open Source Project | 2010-02-05 | 0 | -0/+0 |
|\ |
|
| * | am 4c382b13: reconcile main tree with open-source eclair | The Android Open Source Project | 2010-02-05 | 0 | -0/+0 |
| |\ |
|
| | * | reconcile main tree with open-source eclair | The Android Open Source Project | 2010-02-05 | 0 | -0/+0 |
| | |\ |
|
| | | * | reconcile android-2.1_r1 snapshot | The Android Open Source Project | 2010-01-29 | 0 | -0/+0 |
| | | |\ |
|
| | | | * | android-2.1_r1 snapshot | The Android Open Source Project | 2010-01-13 | 2 | -6/+13 |
* | | | | | bump updater API version to 3; deprecate firmware update command | Doug Zongker | 2010-02-03 | 14 | -599/+16 |
* | | | | | Merge "change log recovery to generic device_recovery_start function" | Doug Zongker | 2010-02-02 | 4 | -4/+10 |
|\ \ \ \ \ |
|
| * | | | | | change log recovery to generic device_recovery_start function | Doug Zongker | 2010-02-02 | 4 | -4/+10 |
* | | | | | | add a one-argument version of package_extract_file | Doug Zongker | 2010-02-01 | 3 | -24/+113 |
|/ / / / / |
|
* | | | | | fix parsing of dumpkeys output | Doug Zongker | 2010-01-29 | 1 | -4/+4 |
* | | | | | save the recovery log from before HTC firmware updates | Doug Zongker | 2010-01-21 | 5 | -6/+117 |
* | | | | | am 4e9332cb: am 22d79a5c: make offsets in firmware update header not point to bad blocks | Doug Zongker | 2010-01-13 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | am 22d79a5c: make offsets in firmware update header not point to bad blocks | Doug Zongker | 2010-01-13 | 3 | -8/+51 |
| |\| | | |
|
| | * | | | make offsets in firmware update header not point to bad blocks | Doug Zongker | 2010-01-13 | 3 | -8/+51 |
| | |/ / |
|
* | | | | make offsets in firmware update header not point to bad blocks | Doug Zongker | 2010-01-13 | 3 | -8/+51 |
* | | | | am 158657bc: merge from open-source master | Jean-Baptiste Queru | 2009-12-22 | 0 | -0/+0 |
|\| | | |
|
| * | | | merge from open-source master | Jean-Baptiste Queru | 2009-12-22 | 0 | -0/+0 |
| |\ \ \ |
|
| | * | | | Security: Fix typo in recovery EOCD detection. | Steve Kondik | 2009-12-09 | 1 | -1/+1 |
* | | | | | am d36308c2: am 17a47098: use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions | Doug Zongker | 2009-12-16 | 1 | -5/+12 |
|\| | | | |
|
| * | | | | am 17a47098: use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions | Doug Zongker | 2009-12-15 | 1 | -5/+12 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions | Doug Zongker | 2009-12-15 | 1 | -5/+12 |
* | | | | | Merge commit 'goog/eclair-plus-aosp' | Android Git Automerger | 2009-12-15 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | am c652e41d: fix cut-and-paste error in verifier | Doug Zongker | 2009-12-09 | 1 | -1/+1 |
| |\| | | |
|
* | | | | | am 9b430e11: am 73ae31ce: add a simple unit test for the OTA package verifier | Doug Zongker | 2009-12-11 | 11 | -2/+203 |
|\ \ \ \ \ |
|
| * \ \ \ \ | am 73ae31ce: add a simple unit test for the OTA package verifier | Doug Zongker | 2009-12-11 | 11 | -2/+203 |
| |\ \ \ \ \ |
|
| | * | | | | | add a simple unit test for the OTA package verifier | Doug Zongker | 2009-12-10 | 11 | -2/+203 |
* | | | | | | | Merge change I117fdea9 | Android (Google) Code Review | 2009-12-10 | 4 | -22/+303 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Recovery changes for Encrypted File Systems. | Oscar Montemayor | 2009-12-10 | 4 | -22/+303 |
* | | | | | | | | am 2278a04a: am 9acf28a3: am c652e41d: fix cut-and-paste error in verifier | Doug Zongker | 2009-12-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| / / / / / /
| |/ / / / / / |
|
| * | | | | | | am 9acf28a3: am c652e41d: fix cut-and-paste error in verifier | Doug Zongker | 2009-12-10 | 1 | -1/+1 |
| |\| | | | | |
|
| | * | | | | | am c652e41d: fix cut-and-paste error in verifier | Doug Zongker | 2009-12-09 | 1 | -1/+1 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | fix cut-and-paste error in verifier | Doug Zongker | 2009-12-09 | 1 | -1/+1 |
* | | | | | | | am 6e5be9b2: merge from open-source master | Jean-Baptiste Queru | 2009-11-16 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | merge from open-source master | Jean-Baptiste Queru | 2009-11-15 | 0 | -0/+0 |
| |\ \ \ \ \ \
| | | |_|/ / /
| | |/| | | | |
|
| | * | | | | | merge from open-source master | Jean-Baptiste Queru | 2009-11-15 | 0 | -0/+0 |
| | |\ \ \ \ \
| | | | |_|/ /
| | | |/| | | |
|
| | | * | | | | merge from eclair | Jean-Baptiste Queru | 2009-11-15 | 18 | -458/+582 |
| | | |\ \ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | * | | | eclair snapshot | Jean-Baptiste Queru | 2009-11-13 | 18 | -458/+582 |
* | | | | | | | am 4011770f: merge from open-source master | Jean-Baptiste Queru | 2009-10-15 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | merge from open-source master | Jean-Baptiste Queru | 2009-10-15 | 1 | -3/+6 |
| |\| | | | |
| | |_|_|/ /
| |/| | | | |
|
| | * | | | | am 54ec81fe: Merge change I1c8ca2e4 into eclair | Doug Zongker | 2009-10-08 | 3 | -0/+0 |
| | |\ \ \ \
| | | | |_|/
| | | |/| | |
|
| | * | | | | am 988500b6: add terminator to recovery\'s getopt_long options array | Doug Zongker | 2009-10-07 | 1 | -0/+1 |
| | |\ \ \ \ |
|
* | | | | | | | am d93a2545: simplify construction of the recovery progress bar | Doug Zongker | 2009-10-13 | 16 | -26/+19 |
|\| | | | | | |
|
| * | | | | | | simplify construction of the recovery progress bar | Doug Zongker | 2009-10-09 | 16 | -26/+19 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | am 54ec81fe: Merge change I1c8ca2e4 into eclair | Doug Zongker | 2009-10-12 | 3 | -0/+0 |
|\| | | | | |
|
| * | | | | | Merge change I1c8ca2e4 into eclair | Android (Google) Code Review | 2009-10-08 | 3 | -0/+0 |
| |\ \ \ \ \
| | |_|/ / /
| |/| | | | |
|
| | * | | | | replace generic recovery icons | Doug Zongker | 2009-10-03 | 3 | -0/+0 |
* | | | | | | am 988500b6: add terminator to recovery\'s getopt_long options array | Doug Zongker | 2009-10-12 | 1 | -0/+1 |
|\| | | | | |
|
| * | | | | | add terminator to recovery's getopt_long options array | Doug Zongker | 2009-10-06 | 1 | -0/+1 |
| |/ / / / |
|
* | | | | | am 8f8bc4cb: am f93d8166: confirm before wiping user data in recovery | Doug Zongker | 2009-09-25 | 1 | -69/+107 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | am f93d8166: confirm before wiping user data in recovery | Doug Zongker | 2009-09-23 | 1 | -69/+107 |
| |\| | | |
|
| | * | | | confirm before wiping user data in recovery | Doug Zongker | 2009-09-23 | 1 | -69/+107 |
* | | | | | am 486aa290: am fd8fb0c4: reduce fraction of progress bar for verification | Doug Zongker | 2009-09-20 | 1 | -1/+1 |
|\| | | | |
|
| * | | | | am fd8fb0c4: reduce fraction of progress bar for verification | Doug Zongker | 2009-09-20 | 1 | -1/+1 |
| |\| | | |
|
| | * | | | reduce fraction of progress bar for verification | Doug Zongker | 2009-09-20 | 1 | -1/+1 |
* | | | | | am d16fb221: am 60babf8b: delete files before symlinking; log error messages | Doug Zongker | 2009-09-19 | 1 | -3/+21 |
|\| | | | |
|
| * | | | | am 60babf8b: delete files before symlinking; log error messages | Doug Zongker | 2009-09-19 | 1 | -3/+21 |
| |\| | | |
|
| | * | | | delete files before symlinking; log error messages | Doug Zongker | 2009-09-19 | 1 | -3/+21 |
* | | | | | am 2f4fc561: am 196c25c7: don\'t complain if recovery icon is short | Doug Zongker | 2009-09-17 | 1 | -1/+5 |
|\| | | | |
|
| * | | | | am 196c25c7: don\'t complain if recovery icon is short | Doug Zongker | 2009-09-15 | 1 | -1/+5 |
| |\| | | |
|
| | * | | | don't complain if recovery icon is short | Doug Zongker | 2009-09-15 | 1 | -1/+5 |
* | | | | | am b5d542cd: am a3f89eab: add a run_program() function to edify | Doug Zongker | 2009-09-10 | 1 | -0/+49 |
|\| | | | |
|
| * | | | | am a3f89eab: add a run_program() function to edify | Doug Zongker | 2009-09-10 | 1 | -0/+49 |
| |\| | | |
|
| | * | | | add a run_program() function to edify | Doug Zongker | 2009-09-10 | 1 | -0/+49 |
* | | | | | am 9a77b613: merge from open-source master | Jean-Baptiste Queru | 2009-09-04 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | merge from open-source master | Jean-Baptiste Queru | 2009-09-04 | 0 | -0/+0 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | merge from donut | Jean-Baptiste Queru | 2009-09-03 | 1 | -0/+1 |
| | |\ \ \
| | | | |/
| | | |/| |
|
* | | | | | am cbf90380: merge from open-source master | Jean-Baptiste Queru | 2009-09-01 | 1 | -3/+6 |
|\| | | | |
|
| * | | | | merge from open-source master | Jean-Baptiste Queru | 2009-09-01 | 1 | -3/+6 |
| |\| | |
| | |_|/
| |/| | |
|
| | * | | Not all failures to fopen_root_path() are serious. | Jay Freeman (saurik) | 2009-08-25 | 1 | -3/+6 |
* | | | | am 34c98df7: (-s ours) do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master | Doug Zongker | 2009-08-18 | 0 | -0/+0 |
|\| | | |
|
| * | | | do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master | Doug Zongker | 2009-08-18 | 1 | -0/+10 |
* | | | | Recovery: When updating from SD card, update can't resume automatically | Jared Suttles | 2009-08-18 | 1 | -0/+10 |
* | | | | am 54e2e86c: (-s ours) do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch | Doug Zongker | 2009-08-17 | 0 | -0/+0 |
|\| | | |
|
| * | | | do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch | Doug Zongker | 2009-08-17 | 3 | -330/+155 |
* | | | | verify whole-file signature instead of jarsigner signatures | Doug Zongker | 2009-08-15 | 3 | -330/+155 |
|/ / / |
|
* | | | merge from open-source master | Jean-Baptiste Queru | 2009-08-04 | 0 | -0/+0 |
|\| | |
|
| * | | merge from donut | Jean-Baptiste Queru | 2009-07-29 | 71 | -5257/+4 |
| |\ \ |
|
* | \ \ | am 20697b96: only build flash_image for eng | Doug Zongker | 2009-08-04 | 1 | -0/+1 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | only build flash_image for eng | Doug Zongker | 2009-07-24 | 1 | -0/+1 |
| | |/
| |/| |
|
* | | | reconcile korg/master into goog/master | Jean-Baptiste Queru | 2009-07-26 | 0 | -0/+0 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge korg/donut into korg/master | Jean-Baptiste Queru | 2009-07-26 | 67 | -1221/+2704 |
| |\ \ |
|
* | | | | fix compile warnings in recovery, change images | Doug Zongker | 2009-07-23 | 6 | -4/+5 |
* | | | | resolved conflicts for merge of 64893ccc to master | Doug Zongker | 2009-07-16 | 71 | -5257/+4 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | remove amend | Doug Zongker | 2009-07-15 | 71 | -5257/+4 |
| | |/
| |/| |
|
* | | | am bec02d57: skip over all-zero blocks when reading MTD partition | Doug Zongker | 2009-07-03 | 1 | -1/+12 |
|\| | |
|
| * | | skip over all-zero blocks when reading MTD partition | Doug Zongker | 2009-07-01 | 1 | -1/+12 |
* | | | am d8f7c9b8: Merge change 5545 into donut | Android (Google) Code Review | 2009-06-30 | 1 | -1/+6 |
|\| | |
|
| * | | Merge change 5545 into donut | Android (Google) Code Review | 2009-06-26 | 1 | -1/+6 |
| |\ \ |
|
| | * | | remove updater from the user system image | Doug Zongker | 2009-06-26 | 1 | -1/+6 |
* | | | | am 0bbfe3d9: fix off-by-one error in set_perm() | Doug Zongker | 2009-06-25 | 1 | -1/+1 |
|\| | | |
|
| * | | | fix off-by-one error in set_perm() | Doug Zongker | 2009-06-25 | 1 | -1/+1 |
| |/ / |
|
* | | | am fbf3c10e: improve updater progress bar | Doug Zongker | 2009-06-25 | 2 | -4/+34 |
|\| | |
|
| * | | improve updater progress bar | Doug Zongker | 2009-06-24 | 2 | -4/+34 |
* | | | add device extension mechanism to updater | Doug Zongker | 2009-06-22 | 2 | -1/+43 |
* | | | add function for device-specific wipe data features | Doug Zongker | 2009-06-19 | 4 | -2/+20 |
* | | | am 47cace98: add file_getprop() to updater | Doug Zongker | 2009-06-18 | 3 | -11/+117 |
|\| | |
|
| * | | add file_getprop() to updater | Doug Zongker | 2009-06-18 | 3 | -11/+117 |
* | | | resolved conflicts for merge of fb2e3af3 to master | Doug Zongker | 2009-06-18 | 5 | -27/+74 |
|\| | |
|
| * | | let the "firmware" command take the file straight from the package | Doug Zongker | 2009-06-18 | 5 | -26/+56 |
* | | | am e3da02e7: add less_than_int, greater_than_int to edify | Doug Zongker | 2009-06-15 | 2 | -0/+63 |
|\| | |
|
| * | | add less_than_int, greater_than_int to edify | Doug Zongker | 2009-06-13 | 2 | -0/+63 |
* | | | am d9c9d10d: fixes to edify and updater script | Doug Zongker | 2009-06-15 | 9 | -509/+674 |
|\| | |
|
| * | | fixes to edify and updater script | Doug Zongker | 2009-06-12 | 9 | -509/+674 |
* | | | am 8edb00c9: edify extensions for OTA package installation, part 2 | Doug Zongker | 2009-06-15 | 7 | -16/+291 |
|\| | |
|
| * | | edify extensions for OTA package installation, part 2 | Doug Zongker | 2009-06-12 | 7 | -16/+291 |
* | | | am 9dbc027b: fix sim build in donut, too | Doug Zongker | 2009-06-12 | 0 | -0/+0 |
|\| | |
|
| * | | fix sim build in donut, too | Doug Zongker | 2009-06-12 | 1 | -4/+4 |
* | | | am 9931f7f3: edify extensions for OTA package installation, part 1 | Doug Zongker | 2009-06-12 | 13 | -13/+694 |
|\| | |
|
| * | | edify extensions for OTA package installation, part 1 | Doug Zongker | 2009-06-12 | 13 | -13/+694 |
* | | | fix simulator build by excluding more of recovery | Doug Zongker | 2009-06-12 | 1 | -3/+4 |
* | | | fix error from change 3606 | Doug Zongker | 2009-06-11 | 1 | -18/+18 |
* | | | split out device-specific recovery UI code into vendor directories | Doug Zongker | 2009-06-11 | 6 | -72/+171 |
* | | | am 9b9c2114: Merge change 3514 into donut | Android (Google) Code Review | 2009-06-10 | 7 | -0/+889 |
|\| | |
|
| * | | Merge change 3514 into donut | Android (Google) Code Review | 2009-06-10 | 7 | -0/+889 |
| |\ \ |
|
| | * | | core of edify, an eventual replacement for amend | Doug Zongker | 2009-06-10 | 7 | -0/+889 |
* | | | | Force the fb into 16 bpp mode in case the hw has some other default. | Rebecca Schultz Zavin | 2009-06-06 | 1 | -0/+1 |
* | | | | am b2ee9201: allow OTA package to provide binary instead of script | Doug Zongker | 2009-06-05 | 1 | -1/+169 |
|\| | | |
|
| * | | | allow OTA package to provide binary instead of script | Doug Zongker | 2009-06-05 | 1 | -1/+169 |
| |/ / |
|
* | | | am f28c916e: remove unused permissions scheme from amend | Doug Zongker | 2009-06-03 | 12 | -1076/+69 |
|\| | |
|
| * | | remove unused permissions scheme from amend | Doug Zongker | 2009-06-03 | 12 | -1076/+69 |
* | | | am 07e1dca7: don\'t say "install complete" when it really isn\'t | Doug Zongker | 2009-06-01 | 4 | -2/+14 |
|\| | |
|
| * | | don't say "install complete" when it really isn't | Doug Zongker | 2009-05-29 | 4 | -2/+14 |
* | | | am 1c4ceae: undo temporary alignment hack | Doug Zongker | 2009-05-08 | 2 | -48/+8 |
|\| | |
|
| * | | undo temporary alignment hack | Doug Zongker | 2009-05-08 | 2 | -48/+8 |
* | | | am 683c462: align data passed to write() on 32k boundaries | Doug Zongker | 2009-05-06 | 2 | -17/+55 |
|\| | |
|
| * | | align data passed to write() on 32k boundaries | Doug Zongker | 2009-05-06 | 2 | -17/+55 |
* | | | am 596271f: handle short writes when unzipping files | Doug Zongker | 2009-04-30 | 1 | -11/+27 |
|\| | |
|
| * | | handle short writes when unzipping files | Doug Zongker | 2009-04-30 | 1 | -11/+27 |
* | | | Merge donut into master | Jean-Baptiste Queru | 2009-04-23 | 0 | -0/+0 |
|\| | |
|
| * | | merge cupcake into donut | Jean-Baptiste Queru | 2009-04-23 | 0 | -0/+0 |
| |\ \ |
|
* | | | | Merge donut into master | Jean-Baptiste Queru | 2009-04-23 | 0 | -0/+0 |
|\| | | |
|
| * | | | AI 144130: Don't build OTA package keys into the recovery binary; read | Doug Zongker | 2009-04-02 | 2 | -21/+88 |
| * | | | AI 144082: Remove the unused "unpacking" recovery icon. | Doug Zongker | 2009-04-01 | 3 | -2/+0 |
| * | | | AI 144070: Add an option to wipe cache (only) to the recovery menu. | Doug Zongker | 2009-04-01 | 1 | -0/+9 |
| * | | | AI 143128: Use PNG instead of BMP for recovery image icons. This saves | Doug Zongker | 2009-03-27 | 36 | -101/+68 |
| * | | | Automated import from //branches/donutburger/...@142141,142141 | Doug Zongker | 2009-03-25 | 1 | -4/+9 |
| * | | | Automated import from //branches/donutburger/...@140818,140818 | Dianne Hackborn | 2009-03-25 | 1 | -0/+190 |
* | | | | Merge branch 'readonly-p4-master' | Doug Zongker | 2009-04-02 | 2 | -21/+88 |
|\ \ \ \ |
|
| * | | | | AI 144132: am: CL 144130 Don't build OTA package keys into the recovery binary; read | Doug Zongker | 2009-04-02 | 2 | -21/+88 |
* | | | | | Merge branch 'readonly-p4-master' | Doug Zongker | 2009-04-02 | 3 | -2/+0 |
|\| | | | |
|
| * | | | | AI 144105: am: CL 144082 Remove the unused "unpacking" recovery icon. | Doug Zongker | 2009-04-02 | 3 | -2/+0 |
* | | | | | Merge branch 'readonly-p4-master' | Doug Zongker | 2009-04-02 | 1 | -0/+9 |
|\| | | | |
|
| * | | | | AI 144101: am: CL 144070 Add an option to wipe cache (only) to the recovery menu. | Doug Zongker | 2009-04-02 | 1 | -0/+9 |
* | | | | | Merge branch 'open_source_no_contributions' into google_internal | The Android Open Source Project | 2009-03-29 | 0 | -0/+0 |
|\ \ \ \ \
| |/ / / /
|/| | | /
| | |_|/
| |/| | |
|
| * | | | Merge commit 'korg/cupcake' | The Android Open Source Project | 2009-03-27 | 2 | -4/+199 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Automated import from //branches/cupcake/...@142138,142138 | Doug Zongker | 2009-03-25 | 1 | -4/+9 |
| | * | | auto import from //branches/cupcake_rel/...@141571 | The Android Open Source Project | 2009-03-20 | 1 | -0/+190 |
| | |/ |
|
| * | | Merge commit 'remotes/korg/cupcake' into cupcake_to_master | Jean-Baptiste Queru | 2009-03-19 | 4 | -48/+254 |
| |\| |
|
| * | | Remove obsolete OTA tools | Jean-Baptiste Queru | 2009-03-02 | 2 | -343/+0 |
| * | | Merge branch 'cupcake' | The Android Open Source Project | 2009-01-10 | 1 | -24/+79 |
| |\ \ |
|
* | | | | AI 143289: am: CL 143128 Use PNG instead of BMP for recovery image icons. This saves | Doug Zongker | 2009-03-28 | 36 | -101/+68 |
* | | | | Automated import from //branches/master/...@142142,142142 | Doug Zongker | 2009-03-25 | 1 | -4/+9 |
* | | | | Automated import from //branches/master/...@140824,140824 | Dianne Hackborn | 2009-03-25 | 1 | -0/+190 |
| |_|/
|/| | |
|
* | | | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-04 | 135 | -0/+14368 |
* | | | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-04 | 137 | -14711/+0 |
* | | | auto import from //depot/cupcake/@132589 | The Android Open Source Project | 2009-03-03 | 2 | -0/+343 |
* | | | auto import from //depot/cupcake/@137055 | The Android Open Source Project | 2009-03-03 | 2 | -343/+0 |
* | | | auto import from //branches/cupcake/...@130745 | The Android Open Source Project | 2009-02-11 | 4 | -48/+254 |
| |/
|/| |
|
* | | auto import from //branches/cupcake/...@125939 | The Android Open Source Project | 2009-01-10 | 1 | -24/+79 |
|/ |
|
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-18 | 11 | -35/+341 |
* | Initial Contribution | The Android Open Source Project | 2008-10-21 | 134 | -0/+14144 |