summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "update_verifier: Set the success flag if dm-verity is not enabled." am: a7211b3c16 am: 6c6861d7c5Tao Bao2017-03-112-0/+9
|\
| * Merge "update_verifier: Set the success flag if dm-verity is not enabled." am: a7211b3c16Tao Bao2017-03-112-0/+9
| |\
| | * Merge "update_verifier: Set the success flag if dm-verity is not enabled."Tao Bao2017-03-112-0/+9
| | |\
| | | * Merge "update_verifier: Set the success flag if dm-verity is not enabled."Tao Bao2017-03-112-0/+9
| | | |\
| | | | * update_verifier: Set the success flag if dm-verity is not enabled.Tao Bao2017-03-112-0/+9
| | | |/
* | | | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 7a0dfec771 am: 1a23257214Bowgo Tsai2017-03-104-44/+13
|\| | |
| * | | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 7a0dfec771Bowgo Tsai2017-03-104-44/+13
| |\| |
| | * | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs"Bowgo Tsai2017-03-104-44/+13
| | |\|
| | | * Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs"Treehugger Robot2017-03-104-44/+13
| | | |\
| | | | * recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIsBowgo Tsai2017-03-104-44/+13
| | | |/
* | | | Merge "recovery: Fix the FIXME in get_menu_selection()." am: f0e8f0727e am: 316610763bTao Bao2017-03-081-99/+94
|\| | |
| * | | Merge "recovery: Fix the FIXME in get_menu_selection()." am: f0e8f0727eTao Bao2017-03-081-99/+94
| |\| |
| | * | Merge "recovery: Fix the FIXME in get_menu_selection()."Tao Bao2017-03-081-99/+94
| | |\|
| | | * Merge "recovery: Fix the FIXME in get_menu_selection()."Tao Bao2017-03-081-99/+94
| | | |\
| | | | * recovery: Fix the FIXME in get_menu_selection().Tao Bao2017-03-081-99/+94
* | | | | Merge "recovery: Move a few int to bool." am: cbb2bcf541 am: b97f06a5ddTao Bao2017-03-083-147/+142
|\| | | |
| * | | | Merge "recovery: Move a few int to bool." am: cbb2bcf541Tao Bao2017-03-083-147/+142
| |\| | |
| | * | | Merge "recovery: Move a few int to bool."Tao Bao2017-03-083-147/+142
| | |\| |
| | | * | Merge "recovery: Move a few int to bool."Tao Bao2017-03-083-147/+142
| | | |\|
| | | | * recovery: Move a few int to bool.Tao Bao2017-03-083-147/+142
| | | |/
* | | | Merge "recovery: Add the missing #include." am: b7f56f9b91 am: d988b56999Tao Bao2017-03-071-0/+2
|\| | |
| * | | Merge "recovery: Add the missing #include." am: b7f56f9b91Tao Bao2017-03-071-0/+2
| |\| |
| | * | Merge "recovery: Add the missing #include."Tao Bao2017-03-071-0/+2
| | |\|
| | | * Merge "recovery: Add the missing #include."Tao Bao2017-03-071-0/+2
| | | |\
| | | | * recovery: Add the missing #include.Tao Bao2017-03-071-0/+2
| | | |/
* | | | Merge "recovery: Drop the "--stages" / '-g' argument." am: 9bd1dced90 am: ecf5467a82Tao Bao2017-03-072-14/+5
|\| | |
| * | | Merge "recovery: Drop the "--stages" / '-g' argument." am: 9bd1dced90Tao Bao2017-03-072-14/+5
| |\| |
| | * | Merge "recovery: Drop the "--stages" / '-g' argument."Tao Bao2017-03-072-14/+5
| | |\|
| | | * Merge "recovery: Drop the "--stages" / '-g' argument."Tao Bao2017-03-072-14/+5
| | | |\
| | | | * recovery: Drop the "--stages" / '-g' argument.Tao Bao2017-03-072-14/+5
* | | | | Merge "recovery: Add SetStage() into 'Run graphics test'." am: 1a575f8d5f am: e303128144Tao Bao2017-03-071-25/+37
|\| | | |
| * | | | Merge "recovery: Add SetStage() into 'Run graphics test'." am: 1a575f8d5fTao Bao2017-03-071-25/+37
| |\| | |
| | * | | Merge "recovery: Add SetStage() into 'Run graphics test'."Tao Bao2017-03-071-25/+37
| | |\| |
| | | * | Merge "recovery: Add SetStage() into 'Run graphics test'."Tao Bao2017-03-071-25/+37
| | | |\ \
| | | | * | recovery: Add SetStage() into 'Run graphics test'.Tao Bao2017-03-071-25/+37
| | | | |/
* | | | | Merge "recovery: Minor clean up to choose_recovery_file()." am: 73d21d1c1c am: 4a2bde2d26Tao Bao2017-03-071-51/+35
|\| | | |
| * | | | Merge "recovery: Minor clean up to choose_recovery_file()." am: 73d21d1c1cTao Bao2017-03-071-51/+35
| |\| | |
| | * | | Merge "recovery: Minor clean up to choose_recovery_file()."Tao Bao2017-03-071-51/+35
| | |\| |
| | | * | Merge "recovery: Minor clean up to choose_recovery_file()."Tao Bao2017-03-071-51/+35
| | | |\ \ | | | | |/ | | | |/|
| | | | * recovery: Minor clean up to choose_recovery_file().Tao Bao2017-03-071-51/+35
| | | |/
* | | | Merge "Refractor the code for imgdiff" am: a2e7a07031 am: 68571e27d8Tianjie Xu2017-03-074-618/+653
|\| | |
| * | | Merge "Refractor the code for imgdiff" am: a2e7a07031Tianjie Xu2017-03-074-618/+653
| |\| |
| | * | Merge "Refractor the code for imgdiff"Tianjie Xu2017-03-074-618/+653
| | |\|
| | | * Merge "Refractor the code for imgdiff"Treehugger Robot2017-03-074-618/+653
| | | |\
| | | | * Refractor the code for imgdiffTianjie Xu2017-03-074-618/+653
* | | | | Merge "Fix an error on bootloadermessager test teardown" am: b694ba8aab am: 536989892cTianjie Xu2017-03-031-2/+4
|\| | | |
| * | | | Merge "Fix an error on bootloadermessager test teardown" am: b694ba8aabTianjie Xu2017-03-031-2/+4
| |\| | |
| | * | | Merge "Fix an error on bootloadermessager test teardown"Tianjie Xu2017-03-031-2/+4
| | |\| |
| | | * | Merge "Fix an error on bootloadermessager test teardown"Tianjie Xu2017-03-031-2/+4
| | | |\ \
| | | | * | Fix an error on bootloadermessager test teardownTianjie Xu2017-03-031-2/+4
| | | | |/
* | | | | Merge "Recovery Test: add SideloadTest to test FUSE support on target" am: 53feebea4f am: 3d605c54e3Wei Wang2017-03-032-0/+22
|\| | | |
| * | | | Merge "Recovery Test: add SideloadTest to test FUSE support on target" am: 53feebea4fWei Wang2017-03-032-0/+22
| |\| | |
| | * | | Merge "Recovery Test: add SideloadTest to test FUSE support on target"Wei Wang2017-03-032-0/+22
| | |\| |
| | | * | Merge "Recovery Test: add SideloadTest to test FUSE support on target"Treehugger Robot2017-03-032-0/+22
| | | |\ \ | | | | |/ | | | |/|
| | | | * Recovery Test: add SideloadTest to test FUSE support on targetWei Wang2017-03-032-0/+22
| | | |/
* | | | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" am: 0f26468eda am: 5cce91a95aTianjie Xu2017-03-013-3/+111
|\| | |
| * | | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" am: 0f26468edaTianjie Xu2017-03-013-3/+111
| |\| |
| | * | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc"Tianjie Xu2017-03-013-3/+111
| | |\|
| | | * Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc"Treehugger Robot2017-03-013-3/+111
| | | |\
| | | | * Skip BootloaderMessageTest, UncryptTest for devices without /miscTianjie Xu2017-03-013-3/+111
* | | | | Merge "recovery: Remember the last log position." am: d549616b24 am: 6691dacf56Tao Bao2017-03-011-1/+2
|\| | | |
| * | | | Merge "recovery: Remember the last log position." am: d549616b24Tao Bao2017-03-011-1/+2
| |\| | |
| | * | | Merge "recovery: Remember the last log position."Tao Bao2017-03-011-1/+2
| | |\| |
| | | * | Merge "recovery: Remember the last log position."Tao Bao2017-03-011-1/+2
| | | |\ \ | | | | |/ | | | |/|
| | | | * recovery: Remember the last log position.Tao Bao2017-03-011-1/+2
| | | |/
* | | | Import translations. DO NOT MERGEBill Yi2017-02-281-1/+1
* | | | Merge "recovery: Don't show "No /cache partition found" on screen." am: 021304503a am: 7c77883b06Tao Bao2017-02-241-1/+0
|\| | |
| * | | Merge "recovery: Don't show "No /cache partition found" on screen." am: 021304503aTao Bao2017-02-241-1/+0
| |\| |
| | * | Merge "recovery: Don't show "No /cache partition found" on screen."Tao Bao2017-02-241-1/+0
| | |\|
| | | * Merge "recovery: Don't show "No /cache partition found" on screen."Treehugger Robot2017-02-241-1/+0
| | | |\
| | | | * recovery: Don't show "No /cache partition found" on screen.Tao Bao2017-02-241-1/+0
* | | | | Merge "Add a missing #include for openat(2)." am: 3ac0dd2a56 am: cdfe2895b4Elliott Hughes2017-02-241-0/+1
|\| | | |
| * | | | Merge "Add a missing #include for openat(2)." am: 3ac0dd2a56Elliott Hughes2017-02-241-0/+1
| |\| | |
| | * | | Merge "Add a missing #include for openat(2)."Elliott Hughes2017-02-241-0/+1
| |/| | | | | |/ /
| | * | Merge "Add a missing #include for openat(2)."Elliott Hughes2017-02-241-0/+1
| | |\ \
| | | * | Add a missing #include for openat(2).Elliott Hughes2017-02-231-0/+1
| | |/ /
* | | | Merge "Use bspatch from external/bsdiff." am: f9962dbfe2 am: 2c467f6e49 am: 6f06890343Sen Jiang2017-02-165-183/+31
|\| | |
| * | | Merge "Use bspatch from external/bsdiff." am: f9962dbfe2 am: 2c467f6e49Sen Jiang2017-02-165-183/+31
| |\ \ \
| | * \ \ Merge "Use bspatch from external/bsdiff." am: f9962dbfe2Sen Jiang2017-02-165-183/+31
| | |\ \ \
| | | * | | Merge "Use bspatch from external/bsdiff."Sen Jiang2017-02-165-183/+31
| | | |\| |
| | | | * | Merge "Use bspatch from external/bsdiff."Sen Jiang2017-02-165-183/+31
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Use bspatch from external/bsdiff.Sen Jiang2017-02-025-183/+31
* | | | | | Merge "recovery: Clean up browse_directory()." am: 635eb1c83e am: c42d44bbeb am: 19e7776451Tao Bao2017-02-141-92/+55
|\| | | | |
| * | | | | Merge "recovery: Clean up browse_directory()." am: 635eb1c83e am: c42d44bbebTao Bao2017-02-141-92/+55
| |\| | | |
| | * | | | Merge "recovery: Clean up browse_directory()." am: 635eb1c83eTao Bao2017-02-141-92/+55
| | |\| | |
| | | * | | Merge "recovery: Clean up browse_directory()."Tao Bao2017-02-141-92/+55
| | | |\| |
| | | | * | Merge "recovery: Clean up browse_directory()."Tao Bao2017-02-141-92/+55
| | | | |\ \
| | | | | * | recovery: Clean up browse_directory().Tao Bao2017-02-111-92/+55
* | | | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." am: 0d14cc279c am: 6585a3c368 am: b8997adc20Tao Bao2017-02-138-271/+333
|\| | | | | |
| * | | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." am: 0d14cc279c am: 6585a3c368Tao Bao2017-02-138-271/+333
| |\| | | | |
| | * | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." am: 0d14cc279cTao Bao2017-02-138-271/+333
| | |\| | | |
| | | * | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes."Tao Bao2017-02-138-271/+333
| | | |\| | |
| | | | * | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes."Tao Bao2017-02-138-271/+333
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | minui: Move graphics_{adf,drm,fbdev} into classes.Tao Bao2017-02-118-271/+333
| | | | |/ /
* | | | | | Merge "minui: Save errno before calling close()." am: df464dbe79 am: 8075089ca1 am: 30c164411fTao Bao2017-02-101-1/+2
|\| | | | |
| * | | | | Merge "minui: Save errno before calling close()." am: df464dbe79 am: 8075089ca1Tao Bao2017-02-101-1/+2
| |\| | | |
| | * | | | Merge "minui: Save errno before calling close()." am: df464dbe79Tao Bao2017-02-101-1/+2
| | |\| | |
| | | * | | Merge "minui: Save errno before calling close()."Tao Bao2017-02-101-1/+2
| | | |\| |
| | | | * | Merge "minui: Save errno before calling close()."Treehugger Robot2017-02-101-1/+2
| | | | |\ \
| | | | | * | minui: Save errno before calling close().Tao Bao2017-02-091-1/+2
| | | | |/ /
* | | | | | Merge "minui: Clean up graphics_fbdev.cpp." am: 5121961421 am: e91a2d23ca am: c441edd1c3Tao Bao2017-02-091-139/+129
|\| | | | |
| * | | | | Merge "minui: Clean up graphics_fbdev.cpp." am: 5121961421 am: e91a2d23caTao Bao2017-02-091-139/+129
| |\| | | |
| | * | | | Merge "minui: Clean up graphics_fbdev.cpp." am: 5121961421Tao Bao2017-02-091-139/+129
| | |\| | |
| | | * | | Merge "minui: Clean up graphics_fbdev.cpp."Tao Bao2017-02-091-139/+129
| | | |\| |
| | | | * | Merge "minui: Clean up graphics_fbdev.cpp."Treehugger Robot2017-02-091-139/+129
| | | | |\ \
| | | | | * | minui: Clean up graphics_fbdev.cpp.Tao Bao2017-02-071-139/+129
* | | | | | | Merge "minui: Clean up graphics_adf.cpp." am: d592e1d5e1 am: 46829c326e am: ffd5c03711Tao Bao2017-02-091-191/+156
|\| | | | | |
| * | | | | | Merge "minui: Clean up graphics_adf.cpp." am: d592e1d5e1 am: 46829c326eTao Bao2017-02-091-191/+156
| |\| | | | |
| | * | | | | Merge "minui: Clean up graphics_adf.cpp." am: d592e1d5e1Tao Bao2017-02-091-191/+156
| | |\| | | |
| | | * | | | Merge "minui: Clean up graphics_adf.cpp."Tao Bao2017-02-091-191/+156
| | | |\| | |
| | | | * | | Merge "minui: Clean up graphics_adf.cpp."Tao Bao2017-02-091-191/+156
| | | | |\ \ \
| | | | | * | | minui: Clean up graphics_adf.cpp.Tao Bao2017-02-071-191/+156
| | | | | |/ /
* | | | | | | Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71 am: f6b6b75916 am: ed5ee5292cTao Bao2017-02-091-351/+297
|\| | | | | |
| * | | | | | Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71 am: f6b6b75916Tao Bao2017-02-091-351/+297
| |\| | | | |
| | * | | | | Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71Tao Bao2017-02-091-351/+297
| | |\| | | |
| | | * | | | Merge "minui: Clean up graphics_drm.cpp."Tao Bao2017-02-091-351/+297
| | | |\| | |
| | | | * | | Merge "minui: Clean up graphics_drm.cpp."Treehugger Robot2017-02-091-351/+297
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | minui: Clean up graphics_drm.cpp.Tao Bao2017-02-071-351/+297
| | | | |/ /
* | | | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e am: 80176c68b2 am: b8af1beed0Tao Bao2017-02-046-9/+9
|\| | | | |
| * | | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e am: 80176c68b2Tao Bao2017-02-046-9/+9
| |\| | | |
| | * | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4eTao Bao2017-02-046-9/+9
| | |\| | |
| | | * | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)."Tao Bao2017-02-046-9/+9
| | | |\| |
| | | | * | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)."Treehugger Robot2017-02-046-9/+9
| | | | |\ \
| | | | | * | Replace _exit(-1) with _exit(EXIT_FAILURE).Tao Bao2017-02-036-9/+9
| | | | |/ /
* | | | | | Merge "Avoid to call UI functions in child process" am: 0f275ae56e am: 5fa2e576f9 am: 15ab95bb63Tianjie Xu2017-02-031-1/+5
|\| | | | |
| * | | | | Merge "Avoid to call UI functions in child process" am: 0f275ae56e am: 5fa2e576f9Tianjie Xu2017-02-031-1/+5
| |\| | | |
| | * | | | Merge "Avoid to call UI functions in child process" am: 0f275ae56eTianjie Xu2017-02-031-1/+5
| | |\| | |
| | | * | | Merge "Avoid to call UI functions in child process"Tianjie Xu2017-02-031-1/+5
| | | |\| |
| | | | * | Merge "Avoid to call UI functions in child process"Treehugger Robot2017-02-031-1/+5
| | | | |\ \
| | | | | * | Avoid to call UI functions in child processTianjie Xu2017-02-031-1/+5
* | | | | | | Merge "update_verifier should read dm wrapped partition" am: c44c479197 am: d40cd0e7cf am: a8764c46aaTianjie Xu2017-02-031-6/+64
|\| | | | | |
| * | | | | | Merge "update_verifier should read dm wrapped partition" am: c44c479197 am: d40cd0e7cfTianjie Xu2017-02-031-6/+64
| |\| | | | |
| | * | | | | Merge "update_verifier should read dm wrapped partition" am: c44c479197Tianjie Xu2017-02-031-6/+64
| | |\| | | |
| | | * | | | Merge "update_verifier should read dm wrapped partition"Tianjie Xu2017-02-031-6/+64
| | | |\| | |
| | | | * | | Merge "update_verifier should read dm wrapped partition"Tianjie Xu2017-02-031-6/+64
| | | | |\ \ \
| | | | | * | | update_verifier should read dm wrapped partitionTianjie Xu2017-01-261-6/+64
| | | | | |/ /
* | | | | | | Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540d am: ec8d74580d am: 7d8e13a535Tao Bao2017-02-031-62/+1
|\| | | | | |
| * | | | | | Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540d am: ec8d74580dTao Bao2017-02-031-62/+1
| |\| | | | |
| | * | | | | Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540dTao Bao2017-02-031-62/+1
| | |\| | | |
| | | * | | | Merge "minui: Minor clean up to graphics.cpp."Tao Bao2017-02-031-62/+1
| | | |\| | |
| | | | * | | Merge "minui: Minor clean up to graphics.cpp."Tao Bao2017-02-031-62/+1
| | | | |\ \ \ | | | | | |_|/ | | | | |/| |
| | | | | * | minui: Minor clean up to graphics.cpp.Tao Bao2017-02-031-62/+1
| | | | |/ /
* | | | | | Merge "Fix a log issue in ui.cpp." am: 7f38fbf976 am: c33d037d7d am: 2be767eba4Tao Bao2017-02-011-1/+1
|\| | | | |
| * | | | | Merge "Fix a log issue in ui.cpp." am: 7f38fbf976 am: c33d037d7dTao Bao2017-02-011-1/+1
| |\| | | |
| | * | | | Merge "Fix a log issue in ui.cpp." am: 7f38fbf976Tao Bao2017-02-011-1/+1
| | |\| | |
| | | * | | Merge "Fix a log issue in ui.cpp."Tao Bao2017-02-011-1/+1
| | | |\| |
| | | | * | Merge "Fix a log issue in ui.cpp."Tao Bao2017-02-011-1/+1
| | | | |\ \
| | | | | * | Fix a log issue in ui.cpp.Tao Bao2017-02-011-1/+1
| | | | |/ /
* | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d am: 29ef12f777 am: 1c35b48253Tao Bao2017-02-011-0/+1
|\| | | | |
| * | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d am: 29ef12f777Tao Bao2017-02-011-0/+1
| |\| | | |
| | * | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812dTao Bao2017-02-011-0/+1
| | |\| | |
| | | * | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)"Tao Bao2017-02-011-0/+1
| | | |\| |
| | | | * | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)"Tao Bao2017-02-011-0/+1
| | | | |\ \
| | | | | * | bootable/recovery: cleanup compiler warnings (potential leak of memory)Rahul Chaudhry2016-12-071-0/+1
* | | | | | | Merge "recovery: Add screensaver mode." am: 389a29193c am: 2684259c34 am: 79ce31073aTao Bao2017-01-312-24/+120
|\| | | | | |
| * | | | | | Merge "recovery: Add screensaver mode." am: 389a29193c am: 2684259c34Tao Bao2017-01-312-24/+120
| |\| | | | |
| | * | | | | Merge "recovery: Add screensaver mode." am: 389a29193cTao Bao2017-01-312-24/+120
| | |\| | | |
| | | * | | | Merge "recovery: Add screensaver mode."Tao Bao2017-01-312-24/+120
| | | |\| | |
| | | | * | | Merge "recovery: Add screensaver mode."Tao Bao2017-01-312-24/+120
| | | | |\ \ \ | | | | | |_|/ | | | | |/| |
| | | | | * | recovery: Add screensaver mode.Tao Bao2017-01-312-24/+120
| | | | |/ /
* | | | | | Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1 am: 5b5b8333e0 am: 9518d34c0fAlex Deymo2017-01-262-2/+2
|\| | | | |
| * | | | | Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1 am: 5b5b8333e0Alex Deymo2017-01-262-2/+2
| |\| | | |
| | * | | | Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1Alex Deymo2017-01-262-2/+2
| | |\| | |
| | | * | | Merge "Remove '_static' suffix from libext2* references."Alex Deymo2017-01-262-2/+2
| | | |\| |
| | | | * | Merge "Remove '_static' suffix from libext2* references."Alex Deymo2017-01-262-2/+2
| | | | |\ \
| | | | | * | Remove '_static' suffix from libext2* references.Alex Deymo2017-01-242-2/+2
* | | | | | | Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 am: a78bbda4e2 am: 445f24f712Connor O'Brien2017-01-251-1/+6
|\| | | | | |
| * | | | | | Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 am: a78bbda4e2Connor O'Brien2017-01-251-1/+6
| |\| | | | |
| | * | | | | Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7Connor O'Brien2017-01-251-1/+6
| | |\| | | |
| | | * | | | Merge "Use flash erase & logical block size for userdata wipe"Connor O'Brien2017-01-251-1/+6
| | | |\| | |
| | | | * | | Merge "Use flash erase & logical block size for userdata wipe"Treehugger Robot2017-01-251-1/+6
| | | | |\ \ \
| | | | | * | | Use flash erase & logical block size for userdata wipeConnor O'Brien2017-01-251-1/+6
| | | | |/ / /
* | | | | | | Merge "minui: Move callback functions to std::function." am: a476312714 am: 343987b2a1 am: 19856bcb2eTao Bao2017-01-255-129/+115
|\| | | | | |
| * | | | | | Merge "minui: Move callback functions to std::function." am: a476312714 am: 343987b2a1Tao Bao2017-01-255-129/+115
| |\| | | | |
| | * | | | | Merge "minui: Move callback functions to std::function." am: a476312714Tao Bao2017-01-255-129/+115
| | |\| | | |
| | | * | | | Merge "minui: Move callback functions to std::function."Tao Bao2017-01-255-129/+115
| | | |\| | |
| | | | * | | Merge "minui: Move callback functions to std::function."Tao Bao2017-01-255-129/+115
| | | | |\ \ \
| | | | | * | | minui: Move callback functions to std::function.Tao Bao2017-01-235-129/+115
* | | | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 am: 8e01ded271 am: b30b8cf436Tao Bao2017-01-251-48/+46
|\| | | | | | |
| * | | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 am: 8e01ded271Tao Bao2017-01-251-48/+46
| |\| | | | | |
| | * | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3Tao Bao2017-01-251-48/+46
| | |\| | | | |
| | | * | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()."Tao Bao2017-01-251-48/+46
| | | |\| | | |
| | | | * | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()."Tao Bao2017-01-251-48/+46
| | | | |\ \ \ \
| | | | | * | | | update_verifier: Move property_get() to android::base::GetProperty().Tao Bao2017-01-201-48/+46
* | | | | | | | | Merge "Print with newline for ui_print." am: 90deaf9ab7 am: 1313a9636d am: 14be4eb8ceTao Bao2017-01-243-7/+1
|\| | | | | | | |
| * | | | | | | | Merge "Print with newline for ui_print." am: 90deaf9ab7 am: 1313a9636dTao Bao2017-01-243-7/+1
| |\| | | | | | |
| | * | | | | | | Merge "Print with newline for ui_print." am: 90deaf9ab7Tao Bao2017-01-243-7/+1
| | |\| | | | | |
| | | * | | | | | Merge "Print with newline for ui_print."Tao Bao2017-01-243-7/+1
| | | |\| | | | |
| | | | * | | | | Merge "Print with newline for ui_print."Tao Bao2017-01-243-7/+1
| | | | |\ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | | * | | | Print with newline for ui_print.Tao Bao2017-01-223-7/+1
| | | | | |/ / /
* | | | | | | | Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4e am: 58eace4a96Chris Phoenix2017-01-230-0/+0
|\| | | | | | |
| * | | | | | | Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4eChris Phoenix2017-01-231-1/+1
| |\| | | | | |
| | * | | | | | Merge "bootctrl HAL uses "default" service name" am: cf1af460d5Chris Phoenix2017-01-231-1/+1
| | |\| | | | |
| | | * | | | | Merge "bootctrl HAL uses "default" service name"Chris Phoenix2017-01-231-1/+1
| | | |\| | | |
| | | | * | | | Merge "bootctrl HAL uses "default" service name"Chris Phoenix2017-01-231-1/+1
| | | | |\ \ \ \
| | | | | * | | | bootctrl HAL uses "default" service nameChris Phoenix2017-01-201-1/+1
* | | | | | | | | Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12e am: f1a371b1b0Tianjie Xu2017-01-2311-0/+3
|\| | | | | | | |
| * | | | | | | | Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12eTianjie Xu2017-01-2311-0/+3
| |\| | | | | | |
| | * | | | | | | Merge "Restore the max width for recovery background texts" am: c1df344381Tianjie Xu2017-01-2311-0/+3
| | |\| | | | | |
| | | * | | | | | Merge "Restore the max width for recovery background texts"Tianjie Xu2017-01-2311-0/+3
| | | |\| | | | |
| | | | * | | | | Merge "Restore the max width for recovery background texts"Tianjie Xu2017-01-2311-0/+3
| | | | |\ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | | * | | | Restore the max width for recovery background textsTianjie Xu2017-01-2311-0/+3
| | | | |/ / / /
* | | | | | | | Merge "bootctrl HAL uses "default" service name"Chris Phoenix2017-01-231-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | bootctrl HAL uses "default" service nameChris Phoenix2017-01-211-1/+1
* | | | | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48 am: 6a82bc228aTao Bao2017-01-202-4/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48Tao Bao2017-01-202-4/+10
| |\| | | | | |
| | * | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656Tao Bao2017-01-202-4/+10
| | |\| | | | |
| | | * | | | | Merge "imgpatch: Compile with ZLIB_CONST defined."Tao Bao2017-01-202-4/+10
| | | |\| | | |
| | | | * | | | Merge "imgpatch: Compile with ZLIB_CONST defined."Tao Bao2017-01-202-4/+10
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | imgpatch: Compile with ZLIB_CONST defined.Tao Bao2017-01-202-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: e4dcbd1c9eTianjie Xu2017-01-200-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: 99e38bf254Tianjie Xu2017-01-200-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: 8e267878ccTianjie Xu2017-01-200-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: 87f49b83caTianjie Xu2017-01-200-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: 99e38bf254Tianjie Xu2017-01-200-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: 8e267878ccTianjie Xu2017-01-200-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: 3d1f19c733Tianjie Xu2017-01-200-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: 510b13acd8Tianjie Xu2017-01-200-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 oursTianjie Xu2017-01-200-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: 9930b28456Tianjie Xu2017-01-200-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: d1c3bdd8c2Tianjie Xu2017-01-200-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: 457ad2dc3cTianjie Xu2017-01-200-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 oursTianjie Xu2017-01-200-0/+0
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9aTianjie Xu2017-01-200-0/+0
| | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s oursTianjie Xu2017-01-200-0/+0
| | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s oursTianjie Xu2017-01-200-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-devTianjie Xu2017-01-200-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | * | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-devTianjie Xu2017-01-201-0/+7
* | | | | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 am: 9bb0819ef6 am: f859652e5fSen Jiang2017-01-192-16/+20
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 am: 9bb0819ef6Sen Jiang2017-01-192-16/+20
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004Sen Jiang2017-01-192-16/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode."Sen Jiang2017-01-192-16/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode."Sen Jiang2017-01-192-16/+20
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | imgdiff: cache bsdiff suffix array in zip mode.Sen Jiang2017-01-192-16/+20
| | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadb am: 18098b7de3Tianjie Xu2017-01-195-3/+177
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadbTianjie Xu2017-01-195-3/+177
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9Tianjie Xu2017-01-195-3/+177
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file"Tianjie Xu2017-01-195-3/+177
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file"Tianjie Xu2017-01-195-3/+177
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | Add checkers and tests for empty locale in PNG fileTianjie Xu2017-01-195-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-aospTianjie Xu2017-01-190-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-aospAndroid Build Merger (Role)2017-01-190-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: 4aa56ad477Tianjie Xu2017-01-190-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: d0bfa33c66Tianjie Xu2017-01-190-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: 8953f919e4Tianjie Xu2017-01-190-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: de530474e9Tianjie Xu2017-01-190-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: d0bfa33c66Tianjie Xu2017-01-190-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: 8953f919e4Tianjie Xu2017-01-190-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: 8f9e3c9bd9Tianjie Xu2017-01-190-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: 67b69c05c6Tianjie Xu2017-01-190-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 oursTianjie Xu2017-01-190-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: b21b92b386Tianjie Xu2017-01-190-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: ddca75fb0aTianjie Xu2017-01-190-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: 37a5941440Tianjie Xu2017-01-190-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 oursTianjie Xu2017-01-190-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: 94c8b5e5a6Tianjie Xu2017-01-190-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 oursTianjie Xu2017-01-190-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | |_|_|/ / / / | | | | | | | | | | | | |/| | | | | |
| | | | | | | | | | | | * | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s oursTianjie Xu2017-01-190-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | |_|_|/ / / | | | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | | * | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s oursTianjie Xu2017-01-190-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | |_|_|/ / | | | | | | | | | | | | | | |/| | | |
| | | | | | | | | | | | | | * | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726Tianjie Xu2017-01-190-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ DO NOT MERGE: Add a checker for signature boundary in verifierTianjie Xu2017-01-181-0/+7
| | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | * | | | | DO NOT MERGE: Add a checker for signature boundary in verifierTianjie Xu2016-12-201-0/+7
* | | | | | | | | | | | | | | | | | | | | resolve build error when merging 0f7f7e21 am: 97ea844acaTianjie Xu2017-01-190-0/+0
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | resolve build error when merging 0f7f7e21Tianjie Xu2017-01-191-2/+2
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | resolve build error when merging 0f7f7e21Tianjie Xu2017-01-191-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-aospTianjie Xu2017-01-190-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-aospAndroid Build Merger (Role)2017-01-180-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: f127896675Tianjie Xu2017-01-190-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: e0d3b0ceabTianjie Xu2017-01-181-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: e4ec60e045Tianjie Xu2017-01-181-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: 8a45adb243Tianjie Xu2017-01-190-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: e0d3b0ceabTianjie Xu2017-01-181-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: e4ec60e045Tianjie Xu2017-01-181-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: 64f0de7a13Tianjie Xu2017-01-181-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: ca50d7b66aTianjie Xu2017-01-181-0/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763Tianjie Xu2017-01-181-0/+6
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3Tianjie Xu2017-01-181-0/+6
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51Tianjie Xu2017-01-181-0/+6
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / / / | | | | | | | | |/| | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45Tianjie Xu2017-01-181-0/+6
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / / / / / | | | | | | | | | |/| | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72dTianjie Xu2017-01-181-0/+6
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |/ / / / / / / / / / | | | | | | | | | | |/| | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8bTianjie Xu2017-01-181-0/+6
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |/ / / / / / / / / | | | | | | | | | | | |/| | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fdeTianjie Xu2017-01-181-0/+6
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | |/ / / / / / / / | | | | | | | | | | | | |/| | | | | | | |
| | | | | | | | | | | | * | | | | | | | | Add a checker for signature boundary in verifierTianjie Xu2017-01-181-0/+6
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | |/| | | | | | |
| | | | | | | | | | | | | * | | | | | | | Add a checker for signature boundary in verifierTianjie Xu2016-12-171-0/+6
* | | | | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." am: 13d15af08f am: ad20b76397 am: 54890af615Tao Bao2017-01-1711-22/+45
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." am: 13d15af08f am: ad20b76397Tao Bao2017-01-1711-22/+45
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." am: 13d15af08fTao Bao2017-01-1711-22/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h."Tao Bao2017-01-1711-22/+45
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h."Tao Bao2017-01-1711-22/+45
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | minui: Export minui/minui.h.Tao Bao2017-01-1711-22/+45
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71 am: 421d92707d am: 81bffbda89Tao Bao2017-01-142-82/+78
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71 am: 421d92707dTao Bao2017-01-142-82/+78
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71Tao Bao2017-01-142-82/+78
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()."Tao Bao2017-01-142-82/+78
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()."Tao Bao2017-01-142-82/+78
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | recovery: Move property_get() to android::base::GetProperty().Tao Bao2017-01-132-82/+78
* | | | | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" am: f0af02fea6 am: 19e4f627d8 am: e05674f93eTianjie Xu2017-01-1426-2/+20
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" am: f0af02fea6 am: 19e4f627d8Tianjie Xu2017-01-1426-2/+20
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" am: f0af02fea6Tianjie Xu2017-01-1426-2/+20
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery"Tianjie Xu2017-01-1426-2/+20
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery"Tianjie Xu2017-01-1426-2/+20
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | Update background text images in recoveryTianjie Xu2017-01-0726-2/+20
* | | | | | | | | | | | | | | | | | | | | | Merge "Rename language+country resources to just language"Roozbeh Pournader2017-01-1330-270/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Rename language+country resources to just languageRoozbeh Pournader2017-01-1130-0/+0
* | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb am: f8f1a25850 am: a1e336d548Alex Deymo2017-01-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb am: f8f1a25850Alex Deymo2017-01-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bbAlex Deymo2017-01-120-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup'Alex Deymo2017-01-120-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup'Alex Deymo2017-01-123-6/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1a am: 9e93a79f4cAlex Deymo2017-01-123-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1aAlex Deymo2017-01-123-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse am: 67f3aa8804Alex Deymo2017-01-123-3/+3
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparseAlex Deymo2017-01-123-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparseAlex Deymo2017-01-113-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899 am: 9edd655f94Alex Deymo2017-01-123-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899Alex Deymo2017-01-123-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. am: 31653660adAlex Deymo2017-01-123-3/+3
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils.Alex Deymo2017-01-123-3/+3
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils.Alex Deymo2017-01-113-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-01-1230-0/+270
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1 am: 7d345f27e7Tianjie Xu2017-01-103-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1Tianjie Xu2017-01-103-4/+6
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" am: 37d74f3e20Tianjie Xu2017-01-103-4/+6
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry"Tianjie Xu2017-01-103-4/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry"Tianjie Xu2017-01-103-4/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | Do not inject I/O fault on a retryTianjie Xu2017-01-093-4/+6
| | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Address review comment." am: 77ec0071cf am: 3e003ceeda am: ac431948d3Elliott Hughes2017-01-101-1/+1
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Address review comment." am: 77ec0071cf am: 3e003ceedaElliott Hughes2017-01-101-1/+1
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Address review comment." am: 77ec0071cfElliott Hughes2017-01-101-1/+1
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Address review comment."Elliott Hughes2017-01-101-1/+1
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Address review comment."Elliott Hughes2017-01-101-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Address review comment.Elliott Hughes2017-01-091-1/+1
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 am: 61728ff4d8 am: 6ac5db29dbElliott Hughes2017-01-091-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 am: 61728ff4d8Elliott Hughes2017-01-091-0/+0
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32Elliott Hughes2017-01-091-0/+0
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation."Elliott Hughes2017-01-091-0/+0
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation."Elliott Hughes2017-01-091-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Move to .md files for even trivial documentation.Elliott Hughes2017-01-071-0/+0
* | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." am: 33808f16c5 am: fe0a80184c am: b7ce9c5e00Tao Bao2017-01-091-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." am: 33808f16c5 am: fe0a80184cTao Bao2017-01-091-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." am: 33808f16c5Tao Bao2017-01-091-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing."Tao Bao2017-01-091-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing."Tao Bao2017-01-091-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | recovery: Fix the argument parsing.Tao Bao2017-01-091-2/+2
| | | | | | |/ / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 am: 06b4254a70 am: 5ec75851a7Tianjie Xu2017-01-071-1/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 am: 06b4254a70Tianjie Xu2017-01-071-1/+40
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8Tianjie Xu2017-01-071-1/+40
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0"Tianjie Xu2017-01-071-1/+40
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0"Tianjie Xu2017-01-071-1/+40
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Retry ioctl in uncrypt if it returns block# 0Tianjie Xu2016-12-051-1/+40
* | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb am: 1bbd9c68af am: af53db6ba0Tao Bao2017-01-061-145/+166
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb am: 1bbd9c68afTao Bao2017-01-061-145/+166
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3ebTao Bao2017-01-061-145/+166
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp."Tao Bao2017-01-061-145/+166
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp."Treehugger Robot2017-01-061-145/+166
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | recovery: Clean up try_update_binary() in install.cpp.Tao Bao2017-01-061-145/+166
| | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 am: 179fc8a82b am: ba0dad8828Tao Bao2017-01-061-0/+50
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 am: 179fc8a82bTao Bao2017-01-061-0/+50
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7Tao Bao2017-01-061-0/+50
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()."Tao Bao2017-01-061-0/+50
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()."Tao Bao2017-01-061-0/+50
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | tests: Add testcase for show_progress() and set_progress().Tao Bao2017-01-061-0/+50
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." am: 91f74c82cd am: 719a15b187 am: fbb5dbb471Tao Bao2017-01-051-83/+84
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." am: 91f74c82cd am: 719a15b187Tao Bao2017-01-051-83/+84
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." am: 91f74c82cdTao Bao2017-01-051-83/+84
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()."Tao Bao2017-01-051-83/+84
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()."Tao Bao2017-01-051-83/+84
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | updater: Clean up CreateStash().Tao Bao2016-12-291-84/+85
* | | | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b am: 4d37763c69 am: e513c0f2acTao Bao2017-01-043-15/+91
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b am: 4d37763c69Tao Bao2017-01-043-15/+91
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879bTao Bao2017-01-043-15/+91
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop."Tao Bao2017-01-043-15/+91
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop."Tao Bao2017-01-043-15/+91
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | imgdiff: Fix an edge case that leads to infinite loop.Tao Bao2016-12-283-15/+91
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" am: 1302ea8725 am: 9f9d50d4ed am: e477a54c8dJerry Zhang2017-01-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" am: 1302ea8725 am: 9f9d50d4edJerry Zhang2017-01-041-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" am: 1302ea8725Jerry Zhang2017-01-041-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery"Jerry Zhang2017-01-041-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery"Jerry Zhang2017-01-041-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | Write aliases before ffs mount in recoveryJerry Zhang2017-01-041-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." am: 56fc8fa376 am: 1227f6b841 am: 3806993e25Tao Bao2017-01-049-236/+244
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." am: 56fc8fa376 am: 1227f6b841Tao Bao2017-01-049-236/+244
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." am: 56fc8fa376Tao Bao2017-01-049-236/+244
| | |\| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text."Tao Bao2017-01-049-236/+244
| | | |\| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text."Tao Bao2017-01-049-236/+244
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | recovery: Fix the broken UI text.Tao Bao2017-01-049-236/+244
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery"Jerry Zhang2017-01-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Write aliases before ffs mount in recoveryJerry Zhang2017-01-041-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." am: 466e1b396a am: 6502c50e4b am: cb9c4fc4fbTao Bao2017-01-041-74/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." am: 466e1b396a am: 6502c50e4bTao Bao2017-01-041-74/+63
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." am: 466e1b396aTao Bao2017-01-041-74/+63
| | |\| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()."Tao Bao2017-01-041-74/+63
| | | |\| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()."Tao Bao2017-01-041-74/+63
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | updater: Refactor parse_range().Tao Bao2017-01-041-74/+63
| | | | |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0 am: 05e7db3000 am: 83317083c8Tao Bao2017-01-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0 am: 05e7db3000Tao Bao2017-01-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0Tao Bao2017-01-040-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png"Tao Bao2017-01-041-2/+4
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png"Tao Bao2017-01-041-2/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.pngTim Kryger2017-01-041-2/+4
| | | | | | |/ / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 am: c58f5e73d5 am: c025f145cbTao Bao2017-01-041-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 am: c58f5e73d5Tao Bao2017-01-041-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." am: f9684c22c1Tao Bao2017-01-041-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h."Tao Bao2017-01-041-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h."Tao Bao2017-01-041-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | updater: Update the header name for bootloader.h.Tao Bao2016-12-291-2/+2
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf am: 29e1b7b4b2 am: 1b29658702Tao Bao2016-12-282-3/+2
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf am: 29e1b7b4b2Tao Bao2016-12-282-3/+2
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acfTao Bao2016-12-282-3/+2
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()."Tao Bao2016-12-282-3/+2
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()."Tao Bao2016-12-282-3/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | applypatch: Don't expose FindMatchingPatch().Tao Bao2016-12-282-3/+2
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." am: 344c8eb453 am: 4fe022c4ed am: 4e2471d6ddTao Bao2016-12-288-266/+812
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." am: 344c8eb453 am: 4fe022c4edTao Bao2016-12-288-266/+812
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." am: 344c8eb453Tao Bao2016-12-288-266/+812
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff."Tao Bao2016-12-288-266/+812
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff."Tao Bao2016-12-288-266/+812
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Add tests for imgdiff.Tao Bao2016-12-208-266/+812
* | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 am: 1b83e7e28d am: 7f0f49dd2bTao Bao2016-12-232-0/+151
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 am: 1b83e7e28dTao Bao2016-12-232-0/+151
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39Tao Bao2016-12-232-0/+151
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil."Tao Bao2016-12-232-0/+151
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil."Tao Bao2016-12-232-0/+151
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | tests: Add test coverage for DirUtil.Tao Bao2016-12-222-0/+151
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e am: baf422229d am: ef801f9a62Tao Bao2016-12-222-8/+16
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e am: baf422229dTao Bao2016-12-222-8/+16
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288eTao Bao2016-12-222-8/+16
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)."Tao Bao2016-12-222-8/+16
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)."Tao Bao2016-12-222-8/+16
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | tests: Replace the O_RDONLY in access(2).Tao Bao2016-12-222-8/+16
| | | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579e am: 830ab1c482Tao Bao2016-12-222-1/+193
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579eTao Bao2016-12-222-1/+193
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8Tao Bao2016-12-222-1/+193
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil."Tao Bao2016-12-222-1/+193
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil."Tao Bao2016-12-222-1/+193
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | tests: Add testcase for ZipUtil.Tao Bao2016-12-222-1/+193
| | | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 am: bc344ba7b9 am: 11e9af909dPaul Crowley2016-12-221-12/+52
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 am: bc344ba7b9Paul Crowley2016-12-221-12/+52
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3Paul Crowley2016-12-221-12/+52
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag."Paul Crowley2016-12-221-12/+52
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag."Treehugger Robot2016-12-221-12/+52
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Support a "ask before wiping" boot flag.Paul Crowley2016-12-211-12/+52
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Add a checker for signature boundary in verifier"Tianjie Xu2016-12-193-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifierTianjie Xu2016-12-173-1/+8
* | | | | | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 am: b0337774b2 am: 88bd5d59deTao Bao2016-12-191-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 am: b0337774b2Tao Bao2016-12-191-0/+11
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3Tao Bao2016-12-191-0/+11
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed."Tao Bao2016-12-191-0/+11
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed."Tao Bao2016-12-191-0/+11
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Bugfix:updater always retry apply patch failed,when memcpy failed.katao2016-12-191-0/+11
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.png am: 48be23c8ed am: 14bdbb6c77 -s oursTim Kryger2016-12-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.png am: 48be23c8edTim Kryger2016-12-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.pngTim Kryger2016-12-151-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: 910c83b915Tim Kryger2016-12-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aospTim Kryger2016-12-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aospTreeHugger Robot2016-12-161-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp am: a5876e43f7Tim Kryger2016-12-161-2/+4
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aospTim Kryger2016-12-161-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aospTim Kryger2016-12-151-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.pngTim Kryger2016-11-291-2/+3
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 am: 9a707b08ef am: cb15594696Tao Bao2016-12-164-12/+65
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 am: 9a707b08efTao Bao2016-12-164-12/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2Tao Bao2016-12-164-12/+65
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs."Tao Bao2016-12-154-12/+65
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs."Tao Bao2016-12-154-12/+65
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Add update_bootloader_message() to fix two-step OTAs.Tao Bao2016-12-154-12/+65
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." am: 07d985b75b am: 7f3ada54ec am: 870b87dfc8Tao Bao2016-12-162-0/+140
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." am: 07d985b75b am: 7f3ada54ecTao Bao2016-12-162-0/+140
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." am: 07d985b75bTao Bao2016-12-162-0/+140
| | |\| | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message."Tao Bao2016-12-152-0/+140
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message."Tao Bao2016-12-152-0/+140
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | tests: Add tests for bootloader_message.Tao Bao2016-12-152-0/+140
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." am: 8c1584feaf am: 2f8f6ec0fc am: ef45a88680Sen Jiang2016-12-149-17/+102
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." am: 8c1584feaf am: 2f8f6ec0fcSen Jiang2016-12-149-17/+102
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." am: 8c1584feafSen Jiang2016-12-149-17/+102
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI."Sen Jiang2016-12-149-17/+102
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI."Sen Jiang2016-12-149-17/+102
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Add a stub recovery UI.Sen Jiang2016-12-139-17/+102
* | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." am: 2bb3a2270e am: f7f3f821a8 am: e97575e7aeTao Bao2016-12-141-1/+1
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." am: 2bb3a2270e am: f7f3f821a8Tao Bao2016-12-141-1/+1
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." am: 2bb3a2270eTao Bao2016-12-141-1/+1
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order."Tao Bao2016-12-141-1/+1
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order."Treehugger Robot2016-12-141-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | updater: Fix the operator order.Tao Bao2016-12-141-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2 am: 527f08ed0b am: 1871a2feebTao Bao2016-12-143-26/+4
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2 am: 527f08ed0bTao Bao2016-12-143-26/+4
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2Tao Bao2016-12-143-26/+4
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update."Tao Bao2016-12-143-26/+4
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update."Tao Bao2016-12-143-26/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | Remove the obsolete comments for firmware update.Tao Bao2016-12-143-26/+4
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1 am: af62097c08 am: b1e8150c44Tao Bao2016-12-143-1/+177
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1 am: af62097c08Tao Bao2016-12-143-1/+177
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1Tao Bao2016-12-143-1/+177
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt."Tao Bao2016-12-143-1/+177
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt."Tao Bao2016-12-143-1/+177
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Add tests for setup-bcb and clear-bcb via uncrypt.Tao Bao2016-12-143-1/+177
| | | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6 am: 7294a8830b am: 495478e853Tao Bao2016-12-141-95/+85
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6 am: 7294a8830bTao Bao2016-12-131-95/+85
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6Tao Bao2016-12-131-95/+85
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping."Tao Bao2016-12-131-95/+85
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping."Tao Bao2016-12-131-95/+85
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | recovery: Clean up the log saving while wiping.Tao Bao2016-12-131-95/+85
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9a am: 01afbb8f29Tao Bao2016-12-131-1/+2
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9aTao Bao2016-12-131-1/+2
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcbTao Bao2016-12-131-1/+2
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings."Tao Bao2016-12-131-1/+2
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings."Tao Bao2016-12-131-1/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | clang-format: Adjust short functions / if settings.Tao Bao2016-12-131-1/+2
* | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 am: 09197c47e2 am: 1b321e43e1Tao Bao2016-12-132-9/+2
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 am: 09197c47e2Tao Bao2016-12-132-9/+2
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3Tao Bao2016-12-132-9/+2
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field.""Tao Bao2016-12-132-9/+2
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field.""Tao Bao2016-12-132-9/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Revert "write_bootloader_message(<options>) should not reset stage field."Tao Bao2016-12-132-9/+2
* | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5be am: cbb044239a am: ff77b42d66Tao Bao2016-12-101-21/+1
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5be am: cbb044239aTao Bao2016-12-101-21/+1
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5beTao Bao2016-12-101-21/+1
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format."Tao Bao2016-12-101-21/+1
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format."Tao Bao2016-12-101-21/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | recovery: Remove obsolete code that supports "CACHE:foo" format.Tao Bao2016-12-101-21/+1
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d am: f4fabe254c am: d8ce8fa609Tao Bao2016-12-092-2/+9
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d am: f4fabe254cTao Bao2016-12-092-2/+9
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191dTao Bao2016-12-092-2/+9
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field."Tao Bao2016-12-092-2/+9
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field."Tao Bao2016-12-092-2/+9
| | | | |\| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | write_bootloader_message(<options>) should not reset stage field.Tao Bao2016-12-062-2/+9
| | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c am: 6be6680109 am: d4ceb1fb64Tao Bao2016-12-091-2/+5
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c am: 6be6680109Tao Bao2016-12-091-2/+5
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7cTao Bao2016-12-091-2/+5
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE."Tao Bao2016-12-091-2/+5
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE."Tao Bao2016-12-091-2/+5
| | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | recovery: Fix the argument parsing from COMMAND_FILE.Tao Bao2016-12-091-2/+5
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237 am: dd9c5674dfTao Bao2016-12-061-80/+70
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237Tao Bao2016-12-061-80/+70
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." am: 3aadbbac39Tao Bao2016-12-061-80/+70
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()."Tao Bao2016-12-061-80/+70
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()."Tao Bao2016-12-061-80/+70
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | recovery: Clean up get_args().Tao Bao2016-12-051-80/+70
| | | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Revert "Import translations. DO NOT MERGE"Bill Yi2016-12-0581-0/+729
* | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-12-0381-729/+0
* | | | | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." am: d2c56629ab am: 1d9779b57b am: 997ccbc5a4Tao Bao2016-12-023-993/+994
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." am: d2c56629ab am: 1d9779b57bTao Bao2016-12-023-993/+994
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." am: d2c56629abTao Bao2016-12-023-993/+994
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging."Tao Bao2016-12-023-993/+994
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging."Tao Bao2016-12-023-993/+994
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | updater: Switch to libbase logging.Tao Bao2016-12-013-993/+994
* | | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 am: 80cd188162 am: bd8f34190cTao Bao2016-12-011-0/+16
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 am: 80cd188162Tao Bao2016-12-011-0/+16
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8Tao Bao2016-12-011-0/+16
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)"Tao Bao2016-12-011-0/+16
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)"Tao Bao2016-12-011-0/+16
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | bootable/recovery: cleanup compiler warnings (unused value)Rahul Chaudhry2016-11-301-0/+16
| | | | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix inconsistent code."Tao Bao2016-12-011-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | updater: Fix inconsistent code.Tao Bao2016-12-011-1/+3
* | | | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 am: be54feda58 am: 83b649ee1dTao Bao2016-11-301-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 am: be54feda58Tao Bao2016-11-301-0/+4
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1Tao Bao2016-11-301-0/+4
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)"Tao Bao2016-11-301-0/+4
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)"Tao Bao2016-11-301-0/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | bootable/recovery: cleanup compiler warnings (potential leak of memory)Rahul Chaudhry2016-11-161-0/+4
* | | | | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" am: 1528def46e am: ae2463bb35 am: 95beb966e2Connor O'Brien2016-11-302-15/+21
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" am: 1528def46e am: ae2463bb35Connor O'Brien2016-11-302-15/+21
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" am: 1528def46eConnor O'Brien2016-11-302-15/+21
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL"Connor O'Brien2016-11-302-15/+21
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL"Connor O'Brien2016-11-302-15/+21
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | Switch update verifier to HIDL HALConnor O'Brien2016-11-212-15/+21
* | | | | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 am: 1f934beedd am: 8762a560fcTao Bao2016-11-294-89/+93
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 am: 1f934beeddTao Bao2016-11-294-89/+93
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08Tao Bao2016-11-294-89/+93
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)."Tao Bao2016-11-294-89/+93
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)."Tao Bao2016-11-294-89/+93
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Remove ota_close(int) and ota_fclose(FILE*).Tao Bao2016-11-284-89/+93
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf am: 839fbbdad3 am: 6a8e0eb164Tao Bao2016-11-293-9/+25
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf am: 839fbbdad3Tao Bao2016-11-293-9/+25
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cfTao Bao2016-11-293-9/+25
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)."Tao Bao2016-11-293-9/+25
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)."Tao Bao2016-11-293-9/+25
| | | | |\| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&).Tao Bao2016-11-233-9/+25
* | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." am: d226f28e87 am: fcfdda98da am: 5e52ac31d4Tao Bao2016-11-291-31/+144
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." am: d226f28e87 am: fcfdda98daTao Bao2016-11-291-31/+144
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." am: d226f28e87Tao Bao2016-11-291-31/+144
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets."Tao Bao2016-11-291-31/+144
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets."Tao Bao2016-11-291-31/+144
| | | | |\| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | tests: Add testcases for EMMC targets.Tao Bao2016-11-221-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 oursAndriy Naborskyy2016-11-230-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 oursAndriy Naborskyy2016-11-230-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 oursAndriy Naborskyy2016-11-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE updater: Add "write_value()" function. am: 1bf1772625 -s oursTao Bao2016-11-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | DO NOT MERGE updater: Add "write_value()" function.Tao Bao2016-11-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | DO NOT MERGE updater: Add "write_value()" function.Tao Bao2016-11-181-1/+28
* | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407 am: 1aa41a106d am: b4aae79230Tao Bao2016-11-211-5/+5
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407 am: 1aa41a106dTao Bao2016-11-211-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407Tao Bao2016-11-211-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close."Tao Bao2016-11-211-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close."Treehugger Robot2016-11-211-5/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | applypatch: Release FD when explicitly calling close.Tao Bao2016-11-211-5/+5
| | | | | | |_|/ / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f am: 2a962adc85 am: 5713071c81Tao Bao2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f am: 2a962adc85Tao Bao2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364fTao Bao2016-11-210-0/+0
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary"Tao Bao2016-11-210-0/+0
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary"Tao Bao2016-11-211-0/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | Fail gracefully when we fail to fork the update binaryMatthew Bouyack2016-11-211-0/+8
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cf589f523a -s ours am: 92ac9041c1 -s oursBill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cf589f523a -s oursBill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2016-11-210-0/+0
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-11-2178-312/+390
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 9a4ff5a900 -s ours am: 8d7399f553 -s oursBill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 9a4ff5a900 -s oursBill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-11-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-11-2178-312/+390
* | | | | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc am: fa62ae6d0b am: 4cbedcc679Tao Bao2016-11-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc am: fa62ae6d0bTao Bao2016-11-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." am: 1d77c93bccTao Bao2016-11-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery."Tao Bao2016-11-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / | | | |/| / / / / / / / / / / / / / / / / / | | | | |/ / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery."Tao Bao2016-11-202-39/+186
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | Call update_engine_sideload from recovery.Alex Deymo2016-11-202-39/+186
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486 am: 146f92ab3e am: 062a2cffb3Tao Bao2016-11-206-91/+193
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486 am: 146f92ab3eTao Bao2016-11-206-91/+193
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486Tao Bao2016-11-206-91/+193
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions."Tao Bao2016-11-206-91/+193
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions."Tao Bao2016-11-206-91/+193
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | updater: Refactor set_stage() and get_stage() functions.Tao Bao2016-11-186-91/+193
* | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master am: ad57e2ca2c am: 9f4d385704Tao Bao2016-11-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master am: ad57e2ca2cTao Bao2016-11-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-masterTao Bao2016-11-200-0/+0
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-masterTao Bao2016-11-201-2/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master. am: 5422d80961 am: ca64fa7bb9Tao Bao2016-11-201-2/+6
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master. am: 5422d80961Tao Bao2016-11-201-2/+6
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master.Tao Bao2016-11-201-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master.Tao Bao2016-11-191-2/+6
* | | | | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line. am: fbde508ace am: 52b4d869b0Tao Bao2016-11-191-1/+0
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line. am: fbde508aceTao Bao2016-11-191-1/+0
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line.Tao Bao2016-11-191-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line.Tao Bao2016-11-191-1/+0
| | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aosp am: 692e95aa87Connor O'Brien2016-11-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aospConnor O'Brien2016-11-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aospConnor O'Brien2016-11-182-25/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL" am: 7206ec7a1dConnor O'Brien2016-11-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL"Connor O'Brien2016-11-182-25/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL"Connor O'Brien2016-11-182-25/+15
* | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours am: 6fd51ffdaa am: b5cf492040Connor O'Brien2016-11-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours am: 6fd51ffdaaConnor O'Brien2016-11-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s oursConnor O'Brien2016-11-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL""Connor O'Brien2016-11-180-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL""Connor O'Brien2016-11-182-21/+15
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL"Connor O'Brien2016-11-182-21/+15
* | | | | | | | | | | | | | | | | | | | | | | Skip this change on AOSP.Yifan Hong2016-11-180-0/+0
* | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e am: d109c788ad am: 9b1a791e3cTao Bao2016-11-183-17/+119
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e am: d109c788adTao Bao2016-11-183-17/+119
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." am: 23e785935eTao Bao2016-11-183-17/+119
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()."Tao Bao2016-11-183-17/+119
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()."Tao Bao2016-11-183-17/+119
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | updater: Add testcase for package_extract_dir().Tao Bao2016-11-183-17/+119
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL""Connor O'Brien2016-11-182-25/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL"Connor O'Brien2016-11-182-25/+15
* | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc am: d2cd8b4d30 am: 776ea9b464Tao Bao2016-11-182-282/+280
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc am: d2cd8b4d30Tao Bao2016-11-182-282/+280
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bcTao Bao2016-11-182-282/+280
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs."Tao Bao2016-11-182-282/+280
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs."Tao Bao2016-11-182-282/+280
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | applypatch: Use unique_fd to avoid leaking FDs.Tao Bao2016-11-172-282/+280
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." am: d00046b691 am: 100dba35f9 am: 29dc892c07Tao Bao2016-11-182-3/+64
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." am: d00046b691 am: 100dba35f9Tao Bao2016-11-182-3/+64
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." am: d00046b691Tao Bao2016-11-182-3/+64
| | |\| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function."Tao Bao2016-11-182-3/+64
| | | |\| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function."Tao Bao2016-11-182-3/+64
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | updater: Add "write_value()" function.Tao Bao2016-11-172-3/+64
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df am: 9e4ba70b7f am: c43acc9938Tao Bao2016-11-171-283/+257
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df am: 9e4ba70b7fTao Bao2016-11-171-283/+257
| |\| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8dfTao Bao2016-11-171-283/+257
| | |\| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()."Tao Bao2016-11-171-283/+257
| | | |\| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()."Tao Bao2016-11-171-283/+257
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | applypatch: Clean up LoadPartitionContents().Tao Bao2016-11-171-283/+257
| | | | | |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s ours am: b9d1cd7713 -s ours am: 97f6af8d34 -s oursConnor O'Brien2016-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s ours am: b9d1cd7713 -s oursConnor O'Brien2016-11-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s oursConnor O'Brien2016-11-170-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL"Connor O'Brien2016-11-170-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL"Connor O'Brien2016-11-172-15/+21
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | / / / / / / / / / / / / / / / / / | | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HALConnor O'Brien2016-11-162-15/+21
| | | | | | |_|_|/ / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HAL am: 86199a47e1Connor O'Brien2016-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HALConnor O'Brien2016-11-172-15/+25
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HALConnor O'Brien2016-11-172-15/+25
* | | | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 am: 849a911dee am: 6a6e54da04Rahul Chaudhry2016-11-162-3/+3
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 am: 849a911deeRahul Chaudhry2016-11-162-3/+3
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681Rahul Chaudhry2016-11-162-3/+3
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast."Rahul Chaudhry2016-11-162-3/+3
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast."Treehugger Robot2016-11-162-3/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Remove unnecessary uses of reinterpret_cast.Rahul Chaudhry2016-11-162-3/+3
* | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL"Connor O'Brien2016-11-162-15/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HALConnor O'Brien2016-11-162-15/+25
* | | | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c am: 0c15140dad am: b8c4ae9f80Tao Bao2016-11-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c am: 0c15140dadTao Bao2016-11-166-29/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14cTao Bao2016-11-166-29/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap."Tao Bao2016-11-166-29/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap."Tao Bao2016-11-166-29/+29
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap.Rahul Chaudhry2016-11-166-29/+29
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-master am: f83101a911 am: 7563bad2acTao Bao2016-11-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-master am: f83101a911Tao Bao2016-11-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-masterTao Bao2016-11-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-masterTao Bao2016-11-166-137/+197
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "updater: Fix the wrong return value for package_extract_file()."Tao Bao2016-11-166-137/+197
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | updater: Fix the wrong return value for package_extract_file().Tao Bao2016-11-156-137/+197
| | | | | | |/ / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' am: d6137a2ae0 am: 38236d0f35 am: 2e55280df2Tao Bao2016-11-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' am: d6137a2ae0 am: 38236d0f35Tao Bao2016-11-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' am: d6137a2ae0Tao Bao2016-11-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick'Tao Bao2016-11-160-0/+0
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick'Tao Bao2016-11-165-67/+93
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: 97eda9db70 am: c2f6ebf15b am: 9c29567c67Damien Bargiacchi2016-11-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: 97eda9db70 am: c2f6ebf15bDamien Bargiacchi2016-11-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: 97eda9db70Damien Bargiacchi2016-11-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the fontDamien Bargiacchi2016-11-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the fontDamien Bargiacchi2016-11-162-8/+16
* | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-master am: 03eb766a56 am: 7f0a56dbf1Tao Bao2016-11-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-master am: 03eb766a56Tao Bao2016-11-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-masterTao Bao2016-11-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-masterTao Bao2016-11-160-0/+0
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Support use of custom fonts in miniuiDamien Bargiacchi2016-11-155-65/+83
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | / / / / / / / / / / / / / / / / updater: Fix the wrong return value for package_extract_file(). am: 2274e57f67Tao Bao2016-11-166-137/+197
|\| | | | | | | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | updater: Fix the wrong return value for package_extract_file().Tao Bao2016-11-166-137/+197
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | updater: Fix the wrong return value for package_extract_file().Tao Bao2016-11-166-137/+197
* | | | | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." am: b76960c984 am: 1f0af0c2ea am: db50f8863aTao Bao2016-11-141-0/+14
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." am: b76960c984 am: 1f0af0c2eaTao Bao2016-11-141-0/+14
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." am: b76960c984Tao Bao2016-11-141-0/+14
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "Add .clang-format style file."Tao Bao2016-11-141-0/+14
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "Add .clang-format style file."Tao Bao2016-11-141-0/+14
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | Add .clang-format style file.Tao Bao2016-11-071-0/+14
* | | | | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649 am: 08c4130493 am: 0f81984970Tao Bao2016-11-141-1/+1
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649 am: 08c4130493Tao Bao2016-11-141-1/+1
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649Tao Bao2016-11-141-1/+1
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"."Tao Bao2016-11-141-1/+1
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"."Tao Bao2016-11-141-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | Fix "ordered comparison between pointer and zero".MinSeong Kim2016-11-111-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 am: f2574b8206 am: 91f736fe1aTianjie Xu2016-11-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 am: f2574b8206Tianjie Xu2016-11-121-2/+18
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98Tianjie Xu2016-11-121-2/+18
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication"Tianjie Xu2016-11-121-2/+18
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication"Tianjie Xu2016-11-121-2/+18
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | Allow uncrypt to work without socket communicationTianjie Xu2016-11-111-2/+18
* | | | | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfe am: 62aaba5a3fVineela Tummalapalli2016-11-102-0/+22
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfeVineela Tummalapalli2016-11-102-0/+22
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8Vineela Tummalapalli2016-11-102-0/+22
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message."Vineela Tummalapalli2016-11-102-0/+22
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message."Treehugger Robot2016-11-102-0/+22
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Add 'reboot bootloader' to bootloader_message.Vineela Tummalapalli2016-11-102-0/+22
| | | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap."TreeHugger Robot2016-11-106-30/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap.Rahul Chaudhry2016-11-096-30/+30
* | | | | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours am: 96c3c32b66 am: b86af2577cTianjie Xu2016-11-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours am: 96c3c32b66Tianjie Xu2016-11-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s oursTianjie Xu2016-11-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier"Tianjie Xu2016-11-100-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier"Tianjie Xu2016-11-102-12/+128
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Touch blocks in care_map in update_verifierTianjie Xu2016-11-092-12/+128
| | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 am: 2c175c302c am: 7da0c7e439Tao Bao2016-11-092-26/+56
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 am: 2c175c302cTao Bao2016-11-092-26/+56
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8Tao Bao2016-11-092-26/+56
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()."Tao Bao2016-11-092-26/+56
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()."Tao Bao2016-11-092-26/+56
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | updater: Add more testcase for symlink().Tao Bao2016-11-092-26/+56
| | | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23 am: d9d435cd83Tao Bao2016-11-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23Tao Bao2016-11-092-12/+1
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." am: b80d136dcaTao Bao2016-11-092-12/+1
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes."Tao Bao2016-11-092-12/+1
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes."Tao Bao2016-11-092-12/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | otautil: Clean up obsolete includes.Tao Bao2016-11-082-12/+1
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes."Tao Bao2016-11-092-12/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | otautil: Clean up obsolete includes.Tao Bao2016-11-082-12/+0
| | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "healthd: change how charger is launched in recovery."Sandeep Patil2016-11-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | healthd: change how charger is launched in recovery.Sandeep Patil2016-11-011-2/+2
* | | | | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7 am: 260573b3c2Tianjie Xu2016-11-082-19/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7Tianjie Xu2016-11-082-19/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" am: 52e2a97aa7Tianjie Xu2016-11-082-19/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument"Tianjie Xu2016-11-082-19/+49
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument"Treehugger Robot2016-11-082-19/+49
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Make make_parent() to take const argumentTianjie Xu2016-11-082-19/+49
* | | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 am: e9390679c9 am: a1c121e034Tianjie Xu2016-11-084-92/+112
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 am: e9390679c9Tianjie Xu2016-11-084-92/+112
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8Tianjie Xu2016-11-084-92/+112
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test"Tianjie Xu2016-11-084-92/+112
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test"Treehugger Robot2016-11-084-92/+112
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Move recovery_test.cpp out of unit testTianjie Xu2016-11-084-92/+112
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660d am: 5d52303488Tao Bao2016-11-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660dTao Bao2016-11-084-200/+349
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-masterTao Bao2016-11-084-200/+349
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-masterTao Bao2016-11-084-200/+349
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up SysUtil.cpp."Tao Bao2016-11-084-195/+344
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | otautil: Clean up SysUtil.cpp.Tao Bao2016-11-074-195/+344
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | otautil: Clean up SysUtil.cpp.Tao Bao2016-11-084-201/+350
* | | | | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 am: f46041a7d4 am: a99c6eab22Tao Bao2016-11-071-59/+50
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 am: f46041a7d4Tao Bao2016-11-071-59/+50
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4Tao Bao2016-11-071-59/+50
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp."Tao Bao2016-11-071-59/+50
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp."Tao Bao2016-11-071-59/+50
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | tests: Fix unit/zip_test.cpp.Tao Bao2016-11-041-59/+50
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df am: 05a801ca8e am: 8269eb0d1fTao Bao2016-11-042-1/+33
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df am: 05a801ca8eTao Bao2016-11-042-1/+33
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7dfTao Bao2016-11-042-1/+33
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()."Tao Bao2016-11-042-1/+33
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()."Tao Bao2016-11-042-1/+33
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | updater: Add a testcase for RenameFn().Tao Bao2016-11-042-1/+33
* | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 am: 99adda9d67 am: 92097726efTianjie Xu2016-11-046-182/+178
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 am: 99adda9d67Tianjie Xu2016-11-046-182/+178
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658Tianjie Xu2016-11-046-182/+178
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions"Tianjie Xu2016-11-046-182/+178
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions"Tianjie Xu2016-11-046-182/+178
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Cleanup the duplicates of logs rotation functionsTianjie Xu2016-11-046-182/+178
* | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0 am: 4f91ca78b9 am: 786b083b8eTao Bao2016-11-042-9/+46
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0 am: 4f91ca78b9Tao Bao2016-11-042-9/+46
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0Tao Bao2016-11-042-9/+46
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()."Tao Bao2016-11-042-9/+46
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()."Tao Bao2016-11-042-9/+46
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | updater: Fix a bug in DeleteFn().Tao Bao2016-11-042-9/+46
* | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 am: cb3cbaffac am: b9c3411de7Tao Bao2016-11-047-70/+69
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 am: cb3cbaffacTao Bao2016-11-047-70/+69
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944Tao Bao2016-11-047-70/+69
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery."""Tao Bao2016-11-047-70/+69
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery."""Tao Bao2016-11-047-70/+69
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Revert "Revert "Some cleanups to recovery.""Tao Bao2016-11-037-70/+69
| | | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0 am: 917be35f0f am: 4098285e8cTao Bao2016-11-042-6/+59
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0 am: 917be35f0fTao Bao2016-11-042-6/+59
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0Tao Bao2016-11-042-6/+59
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()."Tao Bao2016-11-042-6/+59
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()."Tao Bao2016-11-042-6/+59
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | updater: Fix an off-by-1 bug in file_getprop().Tao Bao2016-11-032-6/+59
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161a am: a98b4e4bef am: f35ce240a1Tao Bao2016-11-034-31/+23
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161a am: a98b4e4befTao Bao2016-11-034-31/+23
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161aTao Bao2016-11-034-31/+23
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests."Tao Bao2016-11-034-31/+23
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests."Tao Bao2016-11-034-31/+23
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | tests: Set up testdata path for continuous native tests.Tao Bao2016-11-034-31/+23
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4 am: 4fc42365ac am: 24356d778fTao Bao2016-11-0211-287/+426
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4 am: 4fc42365acTao Bao2016-11-0211-287/+426
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4Tao Bao2016-11-0211-287/+426
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable."Tao Bao2016-11-0211-287/+426
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable."Treehugger Robot2016-11-0211-287/+426
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | applypatch: Add testcases for applypatch executable.Tao Bao2016-11-0111-287/+426
* | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c am: 88fc75ee54 am: 0b6085a341Tianjie Xu2016-11-024-632/+424
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c am: 88fc75ee54Tianjie Xu2016-11-024-632/+424
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887cTianjie Xu2016-11-024-632/+424
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage"Tianjie Xu2016-11-024-632/+424
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage"Tianjie Xu2016-11-024-632/+424
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | Cleanup ReadArgs & ReadValueArgs usageTianjie Xu2016-11-014-632/+424
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | / / / / / / / / / / / / / / / / Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef am: bc48de6bf0 am: edf2928edfTao Bao2016-11-015-152/+162
|\| | | | | | | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef am: bc48de6bf0Tao Bao2016-11-015-152/+162
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0efTao Bao2016-11-015-152/+162
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector."Tao Bao2016-11-015-152/+162
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector."Tao Bao2016-11-015-152/+162
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | applypatch: Switch the parameter of Value** to std::vector.Tao Bao2016-10-295-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 oursAndriy Naborskyy2016-10-270-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 oursAndriy Naborskyy2016-10-270-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 oursAndriy Naborskyy2016-10-270-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 oursAndriy Naborskyy2016-10-270-0/+0
| | |/| | | | | | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s oursAndriy Naborskyy2016-10-270-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s oursAndriy Naborskyy2016-10-270-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / / / / | | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s oursAndriy Naborskyy2016-10-270-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|/ / / / / / / / / / | | | | | | |/| | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-initAndriy Naborskyy2016-10-270-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|/ / / / / / / / / | | | | | | | |/| | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-initAndriy Naborskyy2016-10-251-1/+0
* | | | | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 am: 0c571e5923 am: 3456ee19f9Dan Albert2016-10-277-63/+70
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 am: 0c571e5923Dan Albert2016-10-277-63/+70
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" am: 9514eb1934Dan Albert2016-10-277-63/+70
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery.""Dan Albert2016-10-277-63/+70
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery.""Treehugger Robot2016-10-277-63/+70
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Revert "Some cleanups to recovery."Dan Albert2016-10-277-63/+70
* | | | | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." am: 46fb0a6a6f am: 00f893fe23 am: 05c68a8775Tao Bao2016-10-277-70/+63
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." am: 46fb0a6a6f am: 00f893fe23Tao Bao2016-10-277-70/+63
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." am: 46fb0a6a6fTao Bao2016-10-277-70/+63
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery."Tao Bao2016-10-277-70/+63
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "Some cleanups to recovery."Treehugger Robot2016-10-277-70/+63
| | | | |\| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | Some cleanups to recovery.Tao Bao2016-10-267-70/+63
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2 am: 750bb46305 am: 74851d8191Tao Bao2016-10-260-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2 am: 750bb46305Tao Bao2016-10-260-0/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2Tao Bao2016-10-260-0/+0
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist"Tao Bao2016-10-260-0/+0
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist"Tao Bao2016-10-262-14/+41
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Skip update-on-boot for bootreason in blacklistTianjie Xu2016-10-262-14/+41
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc am: 8f9672c0db am: ab526b1246Tao Bao2016-10-261-1/+12
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc am: 8f9672c0dbTao Bao2016-10-261-1/+12
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." am: 16e88679dcTao Bao2016-10-261-1/+12
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch."Tao Bao2016-10-261-1/+12
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch."Tao Bao2016-10-261-1/+12
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | tests: Generate testdata for 2nd arch.Tao Bao2016-10-261-1/+12
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba am: 565273839e am: 6d9f8993b0Tao Bao2016-10-251-2/+3
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba am: 565273839eTao Bao2016-10-251-2/+3
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428baTao Bao2016-10-251-2/+3
| |/| | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB."Tao Bao2016-10-251-2/+3
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB."Tao Bao2016-10-251-2/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | applypatch: Fix the bug when constructing VAL_BLOB.Tao Bao2016-10-251-2/+3
| | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Shrink all recovery loop images with zopflipng am: 2f2c723d1bDamien Bargiacchi2016-10-20455-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Shrink all recovery loop images with zopflipngDamien Bargiacchi2016-10-20455-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Shrink all recovery loop images with zopflipngDamien Bargiacchi2016-10-20455-0/+0
* | | | | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." am: fd796317c3 am: a866b12c2dYabin Cui2016-10-190-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." am: fd796317c3Yabin Cui2016-10-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery."Yabin Cui2016-10-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery."Treehugger Robot2016-10-196-204/+140
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Verify wipe package when wiping A/B device in recovery.Yabin Cui2016-10-196-204/+140
| | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check" am: 06603c76c5 am: d7d7f3c792Tianjie Xu2016-10-191-0/+5
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check" am: 06603c76c5Tianjie Xu2016-10-191-0/+5
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check"Tianjie Xu2016-10-191-0/+5
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check"Treehugger Robot2016-10-191-0/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Add a unit test for applypatch_checkTianjie Xu2016-10-191-0/+5
* | | | | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery" am: 94f4494613 am: 7691800c2eTianjie Xu2016-10-191-29/+13
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery" am: 94f4494613Tianjie Xu2016-10-191-29/+13
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery"Tianjie Xu2016-10-191-29/+13
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery"Treehugger Robot2016-10-191-29/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Clean up bootloader_message usage in recoveryTianjie Xu2016-10-191-29/+13
| | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37 am: ece0b68ca6Tianjie Xu2016-10-191-1/+1
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37Tianjie Xu2016-10-191-1/+1
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler"Tianjie Xu2016-10-191-1/+1
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler"Tianjie Xu2016-10-191-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Fix applypatch_check failure when applying update on anglerTianjie Xu2016-10-181-1/+1
* | | | | | | | | | | | | | | | | | | Merge "Fix bootloader_message." am: 7c95fe10de am: 83e4e6d35cYabin Cui2016-10-190-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Fix bootloader_message." am: 7c95fe10deYabin Cui2016-10-190-0/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Fix bootloader_message."Yabin Cui2016-10-190-0/+0
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Fix bootloader_message."Treehugger Robot2016-10-191-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Fix bootloader_message.Yabin Cui2016-10-191-1/+1
| | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of e89bf25 to stage-aosp-master am: 69c117c2ffTao Bao2016-10-191-5/+6
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of e89bf25 to stage-aosp-masterTao Bao2016-10-191-5/+6
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | resolve merge conflicts of e89bf25 to stage-aosp-masterTao Bao2016-10-191-5/+6
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Create bootloader_message static library."Tao Bao2016-10-188-207/+354
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Create bootloader_message static library.Yabin Cui2016-10-188-207/+354
| | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 434697f to masterTianjie Xu2016-10-1934-2342/+472
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 6fba98c to stage-aosp-masterTianjie Xu2016-10-1934-2345/+476
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | resolve merge conflicts of 6fba98c to stage-aosp-masterTianjie Xu2016-10-1834-2345/+476
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Replace minzip with libziparchive"Tianjie Xu2016-10-1833-2322/+448
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Replace minzip with libziparchiveTianjie Xu2016-10-1833-2322/+448
| | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Change StringValue to use std::string" am: 2b17b24ae5 am: 430b7ae469Tianjie Xu2016-10-1816-528/+505
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Change StringValue to use std::string" am: 2b17b24ae5Tianjie Xu2016-10-1816-528/+505
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Change StringValue to use std::string"Tianjie Xu2016-10-1816-528/+505
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Change StringValue to use std::string"Treehugger Robot2016-10-1816-528/+505
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Change StringValue to use std::stringTianjie Xu2016-10-1516-528/+505
* | | | | | | | | | | | | | | | | | | Merge "init: move healthd to late-init" am: a01ffc73ef am: 4de11bb370Tao Bao2016-10-171-1/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "init: move healthd to late-init" am: a01ffc73efTao Bao2016-10-171-1/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "init: move healthd to late-init"Tao Bao2016-10-171-1/+0
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "init: move healthd to late-init"Tao Bao2016-10-171-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | init: move healthd to late-initAndriy Naborskyy2016-10-111-1/+0
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 08d0ae9 to stage-aosp-master am: ddf293aa0cTao Bao2016-10-150-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 08d0ae9 to stage-aosp-masterTao Bao2016-10-150-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | resolve merge conflicts of 08d0ae9 to stage-aosp-masterTao Bao2016-10-150-0/+0
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "Fix the prefix matching for uncrypt status."Treehugger Robot2016-10-151-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status.Tao Bao2016-10-141-2/+2
| | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status.Tao Bao2016-10-140-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status.Tao Bao2016-10-141-1/+1
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status.Tao Bao2016-10-141-1/+1
* | | | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify." am: c5b4b71913 am: 039e9dc5ca am: bd16939bbfTao Bao2016-10-138-98/+70
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify." am: c5b4b71913 am: 039e9dc5caTao Bao2016-10-138-98/+70
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "edify: Some clean-ups to libedify." am: c5b4b71913Tao Bao2016-10-138-98/+70
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify."Tao Bao2016-10-138-98/+70
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify."Tao Bao2016-10-138-98/+70
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | edify: Some clean-ups to libedify.Tao Bao2016-10-138-98/+70
| | | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 am: 3ac1995cfd am: aa9f017cebTao Bao2016-10-122-43/+55
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 am: 3ac1995cfdTao Bao2016-10-122-43/+55
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7Tao Bao2016-10-122-43/+55
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp."Tao Bao2016-10-122-43/+55
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp."Tao Bao2016-10-122-43/+55
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | updater: Kill the duplicate PrintSha1() in install.cpp.Tao Bao2016-10-112-43/+55
| | | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." am: a7995d7581 am: f2cbf0fbe0 am: 44864a75edTao Bao2016-10-110-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." am: a7995d7581 am: f2cbf0fbe0Tao Bao2016-10-110-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." am: a7995d7581Tao Bao2016-10-110-0/+0
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module."Tao Bao2016-10-110-0/+0
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module."Tao Bao2016-10-119-85/+196
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. am: 0c7839ac14 am: cf1dbfa854 am: 8ff7cd20baTao Bao2016-10-119-85/+196
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. am: 0c7839ac14 am: cf1dbfa854Tao Bao2016-10-119-85/+196
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. am: 0c7839ac14Tao Bao2016-10-119-85/+196
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module.Tao Bao2016-10-119-85/+196
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Refactor libupdater into a seperate module.Tao Bao2016-10-119-85/+196
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." am: 2bd94433f8 am: 00a9050815 am: 514dc15399Tao Bao2016-10-110-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." am: 2bd94433f8 am: 00a9050815Tao Bao2016-10-114-11/+5
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." am: 2bd94433f8Tao Bao2016-10-104-11/+5
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils."Tao Bao2016-10-104-11/+5
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils."Tao Bao2016-10-104-11/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Update the header path for ext4_utils.Tao Bao2016-10-094-11/+5
* | | | | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils."Tao Bao2016-10-104-11/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Update the header path for ext4_utils.Tao Bao2016-10-074-11/+5
* | | | | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfd am: 5ceada5beaMark Salyzyn2016-10-101-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfdMark Salyzyn2016-10-101-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" am: b330559fb6Mark Salyzyn2016-10-101-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h"Mark Salyzyn2016-10-101-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "No longer need android/log.h"Mark Salyzyn2016-10-101-1/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | No longer need android/log.hMark Salyzyn2016-10-071-1/+0
* | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 09ab9a6 to nyc-mr1-dev-plus-aospTao Bao2016-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 09ab9a6 to nyc-mr1-dev-plus-aospTao Bao2016-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "Disable the meaningless parts of the UI for A/B." am: aa4924cab1Tao Bao2016-10-092-14/+44
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "Disable the meaningless parts of the UI for A/B."Tao Bao2016-10-092-14/+44
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "Disable the meaningless parts of the UI for A/B."Tao Bao2016-10-092-14/+44
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | Disable the meaningless parts of the UI for A/B.Elliott Hughes2016-10-092-14/+44
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 713ad36 to masterTao Bao2016-10-050-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "edify: Move State.script and State.errmsg to std::string." am: 8810634773 am: 6674f22a2fTao Bao2016-10-055-86/+55
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "edify: Move State.script and State.errmsg to std::string." am: 8810634773Tao Bao2016-10-055-86/+55
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "edify: Move State.script and State.errmsg to std::string."Tao Bao2016-10-055-86/+55
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "edify: Move State.script and State.errmsg to std::string."Treehugger Robot2016-10-055-86/+55
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | edify: Move State.script and State.errmsg to std::string.Tao Bao2016-10-045-86/+55
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | edify: Move State.script and State.errmsg to std::string.Tao Bao2016-10-055-86/+55
* | | | | | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h" am: 38b923ff6c am: 7cf7e6ce4f am: 0467a905ccMark Salyzyn2016-10-042-2/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h" am: 38b923ff6c am: 7cf7e6ce4fMark Salyzyn2016-10-042-2/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h" am: 38b923ff6cMark Salyzyn2016-10-042-2/+0
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h"Mark Salyzyn2016-10-042-2/+0
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h"Mark Salyzyn2016-10-042-2/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | recovery: drop log/logger.hMark Salyzyn2016-10-042-2/+0
* | | | | | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest." am: 0bc2df1696 am: 6fbed10fa5 am: bace857dbbTao Bao2016-10-045-227/+267
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest." am: 0bc2df1696 am: 6fbed10fa5Tao Bao2016-10-045-227/+267
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest." am: 0bc2df1696Tao Bao2016-10-045-227/+267
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest."Tao Bao2016-10-045-227/+267
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest."Tao Bao2016-10-045-227/+267
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | edify: Move the testcases to gtest.Tao Bao2016-10-045-227/+267
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" into nyc-mr1-dev-plus-aospTianjie Xu2016-09-300-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" into nyc-mr1-dev-plus-aospTianjie Xu2016-09-3011-13/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Turn on -Werror for recoveryTianjie Xu2016-09-3011-13/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Turn on -Werror for recoveryTianjie Xu2016-09-3011-13/+27
* | | | | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" am: 695ef7cacc am: 5269808bb0 am: dbde5cf1d5 -s oursTianjie Xu2016-09-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" am: 695ef7cacc am: 5269808bb0Tianjie Xu2016-09-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" am: 695ef7caccTianjie Xu2016-09-3010-13/+28
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery"Tianjie Xu2016-09-3010-13/+28
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery"Tianjie Xu2016-09-3010-13/+28
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Turn on -Werror for recoveryTianjie Xu2016-09-3010-13/+28
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" into nyc-mr1-dev-plus-aospTianjie Xu2016-09-290-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" into nyc-mr1-dev-plus-aospTreeHugger Robot2016-09-293-25/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Report uncrypt errors in detailsTianjie Xu2016-09-293-25/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Report uncrypt errors in detailsTianjie Xu2016-09-293-25/+14
* | | | | | | | | | | | | | | | | | | | DO NOT MERGE Report uncrypt errors in details am: 37d7d67ca2 am: 4c53af080d -s oursTianjie Xu2016-09-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | DO NOT MERGE Report uncrypt errors in details am: 37d7d67ca2Tianjie Xu2016-09-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | DO NOT MERGE Report uncrypt errors in detailsTianjie Xu2016-09-293-40/+75
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | DO NOT MERGE Report uncrypt errors in detailsTianjie Xu2016-09-293-40/+75
* | | | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" am: af8b9363c6 am: 7582609d61 am: fc887a8fbaTianjie Xu2016-09-273-41/+88
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" am: af8b9363c6 am: 7582609d61Tianjie Xu2016-09-273-41/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" am: af8b9363c6Tianjie Xu2016-09-273-41/+88
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details"Tianjie Xu2016-09-273-41/+88
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Report uncrypt errors in details"Treehugger Robot2016-09-273-41/+88
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Report uncrypt errors in detailsTianjie Xu2016-09-273-41/+88
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 64b92df to nyc-mr1-dev-plus-aospTao Bao2016-09-270-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 64b92df to nyc-mr1-dev-plus-aospTao Bao2016-09-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | DO NOT MERGE Duplicate the last_install content into last_log.Tao Bao2016-09-272-39/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | DO NOT MERGE Duplicate the last_install content into last_log.Tao Bao2016-09-272-39/+41
* | | | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." am: 95afc912fb am: 5ac819a51f am: c064b01898Tao Bao2016-09-270-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." am: 95afc912fb am: 5ac819a51fTao Bao2016-09-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." am: 95afc912fbTao Bao2016-09-270-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log."Tao Bao2016-09-270-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log."Tao Bao2016-09-272-38/+42
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of bfee61b to nyc-mr1-dev-plus-aospTao Bao2016-09-270-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of bfee61b to nyc-mr1-dev-plus-aospTao Bao2016-09-270-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Duplicate the last_install content into last_log. am: f4885adc18Tao Bao2016-09-272-38/+42
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Duplicate the last_install content into last_log.Tao Bao2016-09-272-38/+42
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Duplicate the last_install content into last_log.Tao Bao2016-09-262-38/+42
* | | | | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." into nyc-mr1-dev-plus-aospTao Bao2016-09-270-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." into nyc-mr1-dev-plus-aospTao Bao2016-09-272-38/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Duplicate the last_install content into last_log.Tao Bao2016-09-272-38/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Duplicate the last_install content into last_log.Tao Bao2016-09-262-38/+41
* | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5c7d6b to nyc-mr1-dev-plus-aospElliott Hughes2016-09-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5c7d6b to nyc-mr1-dev-plus-aospElliott Hughes2016-09-268-49/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge "Switch to <android-base/properties.h>." am: cc02f9652fElliott Hughes2016-09-268-49/+40
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "Switch to <android-base/properties.h>."Elliott Hughes2016-09-268-49/+40
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "Switch to <android-base/properties.h>."Elliott Hughes2016-09-268-49/+40
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | Switch to <android-base/properties.h>.Elliott Hughes2016-09-268-49/+40
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Fail gracefully when we fail to fork the update binaryMatthew Bouyack2016-09-261-0/+8
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fail gracefully when we fail to fork the update binaryMatthew Bouyack2016-09-211-0/+8
* | | | | | | | | | | | | | | | | | | Switch to <android-base/properties.h>.Elliott Hughes2016-09-248-49/+40
* | | | | | | | | | | | | | | | | | | Revert "DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067"Matthew Bouyack2016-09-210-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Revert "DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067"Matthew Bouyack2016-09-211-8/+0
* | | | | | | | | | | | | | | | | | | DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067Matthew Bouyack2016-09-210-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | DO NOT MERGE Fail gracefully when we fail to fork the update binaryMatthew Bouyack2016-09-201-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | DO NOT MERGE Fail gracefully when we fail to fork the update binaryMatthew Bouyack2016-09-201-0/+8
* | | | | | | | | | | | | | | | | | | Check corruption when reading uncrypt_status file am: 41a3fd4e20 am: 914f39d2d3Tianjie Xu2016-09-140-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Check corruption when reading uncrypt_status file am: 41a3fd4e20Tianjie Xu2016-09-140-0/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Check corruption when reading uncrypt_status fileTianjie Xu2016-09-141-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Check corruption when reading uncrypt_status fileTianjie Xu2016-09-131-0/+2
* | | | | | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 am: 40bae5e1c6 am: 1d55666106Tianjie Xu2016-09-141-0/+2
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 am: 40bae5e1c6Tianjie Xu2016-09-141-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9Tianjie Xu2016-09-141-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file"Tianjie Xu2016-09-141-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file"Treehugger Robot2016-09-141-0/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Check corruption when reading uncrypt_status fileTianjie Xu2016-09-131-0/+2
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Have gr_init_font alloc memory for the font" into cw-f-dev am: 7a97733f7aDamien Bargiacchi2016-09-130-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Have gr_init_font alloc memory for the font" into cw-f-devDamien Bargiacchi2016-09-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Have gr_init_font alloc memory for the font" into cw-f-devDamien Bargiacchi2016-09-132-8/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: d00f5eb63aDamien Bargiacchi2016-09-132-8/+16
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the fontDamien Bargiacchi2016-09-132-8/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the fontDamien Bargiacchi2016-09-092-8/+16
* | | | | | | | | | | | | | | | | | | | save uncrypt status to last_install am: e16e799dfd am: 4769f209dcTianjie Xu2016-09-132-0/+34
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | save uncrypt status to last_install am: e16e799dfdTianjie Xu2016-09-132-0/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | save uncrypt status to last_installTianjie Xu2016-09-132-0/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | save uncrypt status to last_installTianjie Xu2016-09-132-0/+34
| | | | |_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "save uncrypt status to last_install" am: cdf509cce2 am: 6048138e10 am: 86ea1724ae -s oursTianjie Xu2016-09-130-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "save uncrypt status to last_install" am: cdf509cce2 am: 6048138e10Tianjie Xu2016-09-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "save uncrypt status to last_install" am: cdf509cce2Tianjie Xu2016-09-132-1/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "save uncrypt status to last_install"Tianjie Xu2016-09-132-1/+34
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "save uncrypt status to last_install"Tianjie Xu2016-09-132-1/+34
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | save uncrypt status to last_installTianjie Xu2016-09-132-1/+34
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of ad8b5a6 to nyc-mr1-dev-plus-aospElliott Hughes2016-09-102-54/+6
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of ad8b5a6 to nyc-mr1-dev-plus-aospElliott Hughes2016-09-092-54/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Remove duplicate thread loopDamien Bargiacchi2016-09-092-54/+6
| | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Remove debug log statement; fix build am: 43d186021aDamien Bargiacchi2016-09-081-2/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Remove debug log statement; fix buildDamien Bargiacchi2016-09-081-2/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Remove debug log statement; fix buildDamien Bargiacchi2016-09-081-2/+0
* | | | | | | | | | | | | | | | | | Remove duplicate methods and variables from WearRecoveryUI am: 5e7cfb9af6Damien Bargiacchi2016-09-084-334/+148
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Remove duplicate methods and variables from WearRecoveryUIDamien Bargiacchi2016-09-084-334/+148
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Remove duplicate methods and variables from WearRecoveryUIDamien Bargiacchi2016-09-074-334/+148
* | | | | | | | | | | | | | | | | | Merge "Switch recovery to libbase logging" am: 61590bbf0d am: c5becf0ef8 am: ec6a47ae46 -s oursTianjie Xu2016-09-020-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Switch recovery to libbase logging" am: 61590bbf0d am: c5becf0ef8Tianjie Xu2016-09-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Switch recovery to libbase logging" am: 61590bbf0dTianjie Xu2016-09-0222-512/+323
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Switch recovery to libbase logging"Tianjie Xu2016-09-0222-512/+323
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Switch recovery to libbase logging"Tianjie Xu2016-09-0222-512/+323
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Switch recovery to libbase loggingTianjie Xu2016-09-0122-512/+323
* | | | | | | | | | | | | | | | | | | Fix a typo of variable name in install.cppTianjie Xu2016-09-021-6/+6
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix a typo of variable name in install.cppTianjie Xu2016-09-021-6/+6
* | | | | | | | | | | | | | | | | | | Switch recovery to libbase loggingTianjie Xu2016-09-020-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Switch recovery to libbase loggingTianjie Xu2016-09-0120-546/+352
* | | | | | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4 am: 852ae8d0fb am: 0ae9d80082Tianjie Xu2016-09-013-8/+12
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4 am: 852ae8d0fbTianjie Xu2016-09-013-8/+12
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4Tianjie Xu2016-09-013-8/+12
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0"Tianjie Xu2016-09-013-8/+12
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0"Treehugger Robot2016-09-013-8/+12
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | Check an edge case when read(2) returns 0Tianjie Xu2016-09-013-8/+12
| | | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Switch recovery to libbase loggingTianjie Xu2016-09-0120-545/+351
* | | | | | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d am: aad4cef0f3 am: a331d85806Josh Gao2016-08-304-3/+28
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d am: aad4cef0f3Josh Gao2016-08-304-3/+28
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869dJosh Gao2016-08-304-3/+28
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main."Josh Gao2016-08-304-3/+28
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main."Josh Gao2016-08-304-3/+28
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | minadbd: rename adb_server_main to minadbd_main.Josh Gao2016-08-304-3/+28
* | | | | | | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 am: 9968866e86 am: d987fe1d57Chih-Hung Hsieh2016-08-273-4/+4
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 am: 9968866e86Chih-Hung Hsieh2016-08-273-4/+4
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85Chih-Hung Hsieh2016-08-273-4/+4
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery."Chih-Hung Hsieh2016-08-273-4/+4
| | | |\| | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery."Treehugger Robot2016-08-273-4/+4
| | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Fix clang-tidy warnings in bootable/recovery.Chih-Hung Hsieh2016-08-263-4/+4
| | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Support use of custom fonts in miniui" into cw-f-dev am: 929ffefdccDamien Bargiacchi2016-08-240-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Support use of custom fonts in miniui" into cw-f-devDamien Bargiacchi2016-08-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Support use of custom fonts in miniui" into cw-f-devDamien Bargiacchi2016-08-245-65/+83
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | Support use of custom fonts in miniui am: 35fff61b1cDamien Bargiacchi2016-08-245-65/+83
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Support use of custom fonts in miniuiDamien Bargiacchi2016-08-245-65/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Support use of custom fonts in miniuiDamien Bargiacchi2016-08-195-65/+83
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 7f8dc84 to nyc-mr1-dev-plus-aospTao Bao2016-08-180-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 7f8dc84 to nyc-mr1-dev-plus-aospTao Bao2016-08-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Free mmaped area if keys fail to load" am: f599414aecTao Bao2016-08-181-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Free mmaped area if keys fail to load"Tao Bao2016-08-181-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Free mmaped area if keys fail to load"Tao Bao2016-08-181-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Free mmaped area if keys fail to loadWiZarD2016-08-181-0/+1
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.log am: 62ab2a0fbc am: a44d4355baTianjie Xu2016-08-180-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.log am: 62ab2a0fbcTianjie Xu2016-08-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.logTianjie Xu2016-08-181-31/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.logTianjie Xu2016-08-181-31/+36
* | | | | | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 am: 4e4474c9c5 am: e254b4e9e4Tianjie Xu2016-08-181-31/+36
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 am: 4e4474c9c5Tianjie Xu2016-08-181-31/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14Tianjie Xu2016-08-181-31/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log"Tianjie Xu2016-08-181-31/+36
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log"Tianjie Xu2016-08-181-31/+36
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.logTianjie Xu2016-08-171-31/+36
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails" am: cb76857147 am: 2f5cfdbb9d am: d7865e81f1Johan Harvyl2016-08-151-1/+14
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails" am: cb76857147 am: 2f5cfdbb9dJohan Harvyl2016-08-151-1/+14
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails" am: cb76857147Johan Harvyl2016-08-151-1/+14
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails"Johan Harvyl2016-08-151-1/+14
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails"Treehugger Robot2016-08-151-1/+14
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Format formattable partitions if mount failsJohan Harvyl2016-08-121-1/+14
* | | | | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64. am: 53c107f068 am: 0d345b6731Alex Deymo2016-08-130-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64. am: 53c107f068Alex Deymo2016-08-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64.Alex Deymo2016-08-131-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64.Alex Deymo2016-08-121-0/+1
* | | | | | | | | | | | | | | | | | | | Merge "Add inttypes.h for PRIu64." into nyc-mr1-dev-plus-aospAlex Deymo2016-08-120-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Add inttypes.h for PRIu64." into nyc-mr1-dev-plus-aospAlex Deymo2016-08-121-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add inttypes.h for PRIu64.Alex Deymo2016-08-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64.Alex Deymo2016-08-121-0/+1
* | | | | | | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers." am: e4cf854dbf am: c687a72d9f am: d7067c7feaJosh Gao2016-08-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers." am: e4cf854dbf am: c687a72d9fJosh Gao2016-08-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | / / / / / / / / / / / / / / / / | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers." am: e4cf854dbfJosh Gao2016-08-121-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers."Josh Gao2016-08-121-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers."Josh Gao2016-08-121-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | adb headers now refer to openssl headers.Elliott Hughes2016-08-101-1/+1
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 66940b9 to nyc-mr1-dev-plus-aospAlex Deymo2016-08-122-42/+189
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 66940b9 to nyc-mr1-dev-plus-aospAlex Deymo2016-08-122-42/+189
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Call update_engine_sideload from recovery.Alex Deymo2016-08-122-42/+189
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / | | | |/| | | | / / / / / / / / / / / / | | | |_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Call update_engine_sideload from recovery.Alex Deymo2016-08-122-42/+189
| | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9 am: a550ee0df7 am: b33a6f8342Johan Harvyl2016-08-091-4/+6
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9 am: a550ee0df7Johan Harvyl2016-08-091-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9Johan Harvyl2016-08-091-4/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery"Johan Harvyl2016-08-091-4/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery"Treehugger Robot2016-08-091-4/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Handle error from fopen_path in finish_recoveryJohan Harvyl2016-08-081-4/+6
* | | | | | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0 am: dc97404346 am: e6a4195bf7Josh Gao2016-08-084-12/+12
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0 am: dc97404346Josh Gao2016-08-084-12/+12
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0Josh Gao2016-08-084-12/+12
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static."Josh Gao2016-08-084-12/+12
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static."Josh Gao2016-08-084-12/+12
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Fix references to libcrypto_utils_static.Josh Gao2016-08-064-12/+12
| | | | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Recovery mode UI flicker" am: 629bde8c6c am: a5734c2ad8 am: 1e324fa459xinglong.zhu2016-08-082-1/+24
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Recovery mode UI flicker" am: 629bde8c6c am: a5734c2ad8xinglong.zhu2016-08-082-1/+24
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Recovery mode UI flicker" am: 629bde8c6cxinglong.zhu2016-08-082-1/+24
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Recovery mode UI flicker"xinglong.zhu2016-08-082-1/+24
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Recovery mode UI flicker"Treehugger Robot2016-08-082-1/+24
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Recovery mode UI flickerxinglong.zhu2016-08-062-1/+24
* | | | | | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng" am: 61240f88ea am: 3e244dc301 am: 5a84cecd26Tianjie Xu2016-08-0326-0/+2
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng" am: 61240f88ea am: 3e244dc301Tianjie Xu2016-08-0326-0/+2
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng" am: 61240f88eaTianjie Xu2016-08-0326-0/+2
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng"Tianjie Xu2016-08-0326-0/+2
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng"Tianjie Xu2016-08-0326-0/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Further compress the text images with zopflipngTianjie Xu2016-08-0326-0/+2
| | | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge \\\"Clean up verifier testcases.\\\" am: e91aef0ee9 am: 717b49254b am: 73d3acf50eTao Bao2016-08-0121-41/+30
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge \\\"Clean up verifier testcases.\\\" am: e91aef0ee9 am: 717b49254bTao Bao2016-08-0121-41/+30
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge \\"Clean up verifier testcases.\\" am: e91aef0ee9Tao Bao2016-08-0121-41/+30
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge \"Clean up verifier testcases.\"Tao Bao2016-08-0121-41/+30
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Clean up verifier testcases."Treehugger Robot2016-08-0121-41/+30
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Clean up verifier testcases.Tao Bao2016-08-0121-41/+30
| | | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge \\\\"Add docs on regeneration background text image\\\\" am: 5aa2e104c0 am: b02a58740e am: 698f75467aTianjie Xu2016-07-294-2/+35
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge \\\"Add docs on regeneration background text image\\\" am: 5aa2e104c0 am: b02a58740eTianjie Xu2016-07-294-2/+35
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge \\"Add docs on regeneration background text image\\" am: 5aa2e104c0Tianjie Xu2016-07-294-2/+35
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge \"Add docs on regeneration background text image\"Tianjie Xu2016-07-294-2/+35
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Add docs on regeneration background text image"Tianjie Xu2016-07-294-2/+35
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Add docs on regeneration background text imageTianjie Xu2016-07-294-2/+35
* | | | | | | | | | | | | | | | | | | Merge \\\\"Regenerate the background text with pngcrush\\\\" am: 7b6263960f am: c6d607f6ba am: a26823d96dTianjie Xu2016-07-2925-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge \\\"Regenerate the background text with pngcrush\\\" am: 7b6263960f am: c6d607f6baTianjie Xu2016-07-2925-0/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge \\"Regenerate the background text with pngcrush\\" am: 7b6263960fTianjie Xu2016-07-2925-0/+0
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge \"Regenerate the background text with pngcrush\"Tianjie Xu2016-07-2925-0/+0
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Regenerate the background text with pngcrush"Tianjie Xu2016-07-2925-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | Regenerate the background text with pngcrushTianjie Xu2016-07-2925-0/+0
| | | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Resolve merge conflicts of 286848e to stage-aosp-master am: 9da825940d am: 53c34ebdc4Tianjie Xu2016-07-2825-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Resolve merge conflicts of 286848e to stage-aosp-master am: 9da825940dTianjie Xu2016-07-2825-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Resolve merge conflicts of 286848e to stage-aosp-masterTianjie Xu2016-07-2825-0/+0
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Resolve merge conflicts of 286848e to stage-aosp-masterTianjie Xu2016-07-2825-0/+0
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Update background text images under recovery"Tianjie Xu2016-07-2825-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Update background text images under recoveryTianjie Xu2016-07-2825-0/+0
| | | | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge \\\\"Fix clang-tidy performance warnings.\\\\" am: 2a3b695168 am: 977903da49 am: fc7cbe465fChih-hung Hsieh2016-07-275-5/+5
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge \\\"Fix clang-tidy performance warnings.\\\" am: 2a3b695168 am: 977903da49Chih-Hung Hsieh2016-07-275-5/+5
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge \\"Fix clang-tidy performance warnings.\\" am: 2a3b695168Chih-hung Hsieh2016-07-275-5/+5
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge \"Fix clang-tidy performance warnings.\"Chih-Hung Hsieh2016-07-275-5/+5
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Fix clang-tidy performance warnings."Chih-hung Hsieh2016-07-275-5/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Fix clang-tidy performance warnings.Chih-Hung Hsieh2016-07-275-5/+5
| | | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e49c0d6406 -s oursBill Yi2016-07-210-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-07-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-07-213-12/+12
* | | | | | | | | | | | | | | | | Skip update verification if care_map is not found am: da654af606Tianjie Xu2016-07-161-2/+5
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Skip update verification if care_map is not foundTianjie Xu2016-07-161-2/+5
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Skip update verification if care_map is not foundTianjie Xu2016-07-161-2/+5
* | | | | | | | | | | | | | | | | Fix a typo when comparing the verity mode am: 4bbe0c93c8Tianjie Xu2016-07-151-2/+2
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix a typo when comparing the verity modeTianjie Xu2016-07-151-2/+2
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix a typo when comparing the verity modeTianjie Xu2016-07-151-2/+2
* | | | | | | | | | | | | | | | | Merge \\"Touch blocks in care_map in update_verifier\\" into nyc-mr1-dev am: 13f44939b1Tianjie Xu2016-07-152-14/+122
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge \"Touch blocks in care_map in update_verifier\" into nyc-mr1-devTianjie Xu2016-07-152-14/+122
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" into nyc-mr1-devTianjie Xu2016-07-152-14/+122
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Touch blocks in care_map in update_verifierTianjie Xu2016-07-142-14/+122
* | | | | | | | | | | | | | | | | | Skip update-on-boot for bootreason in blacklist am: 27b9fc8a36Tianjie Xu2016-07-132-10/+38
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Skip update-on-boot for bootreason in blacklistTianjie Xu2016-07-132-10/+38
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Skip update-on-boot for bootreason in blacklistTianjie Xu2016-07-122-10/+38
| | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Support landscape layouts. am: 6d089a955fElliott Hughes2016-07-092-15/+31
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Support landscape layouts.Elliott Hughes2016-07-092-15/+31
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Support landscape layouts.Elliott Hughes2016-07-092-15/+31
* | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication"Tianjie Xu2016-07-081-2/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Allow uncrypt to work without socket communicationTianjie Xu2016-07-011-2/+18
* | | | | | | | | | | | | | | | | | Fix bootloader_message. am: 9da04d595fYabin Cui2016-07-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix bootloader_message.Yabin Cui2016-07-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fix bootloader_message.Yabin Cui2016-07-061-1/+1
* | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 34e2854786 -s ours am: 93d2e08ef2 -s oursBill Yi2016-07-010-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 34e2854786 -s oursBill Yi2016-07-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-07-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-07-0178-312/+390
* | | | | | | | | | | | | | | | | | updater: Fix the broken ReadFileFn. am: ccb0ba908aTao Bao2016-07-010-0/+0
|\| | | | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | updater: Fix the broken ReadFileFn.Tao Bao2016-07-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | updater: Fix the broken ReadFileFn.Tao Bao2016-07-011-1/+1
* | | | | | | | | | | | | | | | | resolve merge conflicts of 2f272c0 to nyc-mr1-dev-plus-aospYabin Cui2016-07-0110-397/+328
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | resolve merge conflicts of 2f272c0 to nyc-mr1-dev-plus-aospYabin Cui2016-07-0110-397/+328
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Create bootloader_message static library.Yabin Cui2016-06-3010-381/+227
* | | | | | | | | | | | | | | | | Merge \\\\"Fix install.h\\\\'s use of attribute printf.\\\\" am: a82ee456bb am: 691db7ba77 am: 7c4a34195fElliott Hughes2016-06-302-4/+3
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge \\\"Fix install.h\\\'s use of attribute printf.\\\" am: a82ee456bb am: 691db7ba77Elliott Hughes2016-06-302-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge \\"Fix install.h\\'s use of attribute printf.\\" am: a82ee456bbElliott Hughes2016-06-302-4/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge \"Fix install.h\'s use of attribute printf.\"Elliott Hughes2016-06-302-4/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "Fix install.h's use of attribute printf."Treehugger Robot2016-06-302-4/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | Fix install.h's use of attribute printf.Elliott Hughes2016-06-302-4/+3
* | | | | | | | | | | | | | | | | | Merge \\\\"Fix google-explicit-constructor warnings in bootable/recovery.\\\\" am: a9f648f010 am: 8e6e4bc979 am: a4cd854625Chih-Hung Hsieh2016-06-301-1/+1
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge \\\"Fix google-explicit-constructor warnings in bootable/recovery.\\\" am: a9f648f010 am: 8e6e4bc979Chih-Hung Hsieh2016-06-301-1/+1
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge \\"Fix google-explicit-constructor warnings in bootable/recovery.\\" am: a9f648f010Chih-Hung Hsieh2016-06-301-1/+1
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge \"Fix google-explicit-constructor warnings in bootable/recovery.\"Chih-Hung Hsieh2016-06-301-1/+1
| | |/| | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings in bootable/recovery."Treehugger Robot2016-06-301-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Fix google-explicit-constructor warnings in bootable/recovery.Chih-Hung Hsieh2016-06-301-1/+1
| | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Increase EIO retry count am: c37c5c3410 am: e5c6d47f52Tianjie Xu2016-06-240-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Increase EIO retry count am: c37c5c3410Tianjie Xu2016-06-240-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Increase EIO retry countTianjie Xu2016-06-241-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | Increase EIO retry count am: c37c5c3410 am: 6074099cb9Tianjie Xu2016-06-241-1/+2
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Increase EIO retry count am: c37c5c3410Tianjie Xu2016-06-241-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Increase EIO retry countTianjie Xu2016-06-241-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Increase EIO retry countTianjie Xu2016-06-241-1/+2
* | | | | | | | | | | | | | | | resolve merge conflicts of ed4c49c to nyc-mr1-dev-plus-aospYabin Cui2016-06-218-77/+232
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | resolve merge conflicts of ed4c49c to nyc-mr1-dev-plus-aospYabin Cui2016-06-218-77/+232
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." into nyc-mr1-devYabin Cui2016-06-218-76/+231
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Verify wipe package when wiping A/B device in recovery.Yabin Cui2016-06-218-76/+231
* | | | | | | | | | | | | | | | | Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 2c709ccef9 -s ours am: bf44cb7363 -s oursBill Yi2016-06-170-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 2c709ccef9 -s oursBill Yi2016-06-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge \"Import translations. DO NOT MERGE\" into stage-aosp-masterBill Yi2016-06-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2016-06-1778-312/+390
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-06-1678-312/+390
* | | | | | | | | | | | | | | | | | | Merge \\\\"Minor minadbd cleanup.\\\\" am: a49c8a19da am: 98c97c8932 am: aaa7c08cfaElliott Hughes2016-06-174-8/+3
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge \\\"Minor minadbd cleanup.\\\" am: a49c8a19da am: 98c97c8932Elliott Hughes2016-06-174-8/+3
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge \\"Minor minadbd cleanup.\\" am: a49c8a19daElliott Hughes2016-06-174-8/+3
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge \"Minor minadbd cleanup.\"Elliott Hughes2016-06-174-8/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | / / / / / / / / / / / | | | | | |_|_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Minor minadbd cleanup."Treehugger Robot2016-06-174-8/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Minor minadbd cleanup.Elliott Hughes2016-06-174-8/+3
* | | | | | | | | | | | | | | | | | | Check the results from applypatch am: 31f8cc84cf am: 93110c767fTianjie Xu2016-06-160-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Check the results from applypatch am: 31f8cc84cfTianjie Xu2016-06-160-0/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Check the results from applypatchTianjie Xu2016-06-161-4/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Check the results from applypatch am: 31f8cc84cf am: d0dcbddd31Tianjie Xu2016-06-161-4/+10
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Check the results from applypatch am: 31f8cc84cfTianjie Xu2016-06-161-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Check the results from applypatchTianjie Xu2016-06-161-4/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Check the results from applypatchTianjie Xu2016-06-161-4/+10
* | | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. am: 7eb60efa8d am: 28a425aa1fTao Bao2016-06-160-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. am: 7eb60efa8dTao Bao2016-06-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support.Tao Bao2016-06-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | tests: Remove obsolete MTD support.Tao Bao2016-06-161-1/+0
* | | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. am: ab2fb94bf4Tao Bao2016-06-160-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support.Tao Bao2016-06-161-1/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support.Tao Bao2016-06-161-1/+0
* | | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support.Tao Bao2016-06-161-1/+0
* | | | | | | | | | | | | | | | | | | Merge \\\\"Remove an abused global so we can actually see logging.\\\\" am: 37450d7f42 am: 4692e5d8c8 am: d71cf2eee3Elliott Hughes2016-06-161-19/+11
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge \\\"Remove an abused global so we can actually see logging.\\\" am: 37450d7f42 am: 4692e5d8c8Elliott Hughes2016-06-161-19/+11
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge \\"Remove an abused global so we can actually see logging.\\" am: 37450d7f42Elliott Hughes2016-06-161-19/+11
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge \"Remove an abused global so we can actually see logging.\"Elliott Hughes2016-06-161-19/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Remove an abused global so we can actually see logging."Treehugger Robot2016-06-161-19/+11
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Remove an abused global so we can actually see logging.Elliott Hughes2016-06-161-19/+11
| | | | | | |_|/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge \\\\"init now uses libprocessgroup, so set up /acct.\\\\" am: 279876c932 am: c58d7dda8c am: a087302da7Elliott Hughes2016-06-161-0/+3
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge \\\"init now uses libprocessgroup, so set up /acct.\\\" am: 279876c932 am: c58d7dda8cElliott Hughes2016-06-161-0/+3
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge \\"init now uses libprocessgroup, so set up /acct.\\" am: 279876c932Elliott Hughes2016-06-161-0/+3
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge \"init now uses libprocessgroup, so set up /acct.\"Elliott Hughes2016-06-161-0/+3
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "init now uses libprocessgroup, so set up /acct."Elliott Hughes2016-06-161-0/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | init now uses libprocessgroup, so set up /acct.Elliott Hughes2016-06-161-0/+3
| | | | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 179c0d8 to stage-aosp-master am: 274d17dc0f am: eaddde6888Elliott Hughes2016-06-1616-1490/+242
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 179c0d8 to stage-aosp-master am: 274d17dc0fElliott Hughes2016-06-1616-1490/+242
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | resolve merge conflicts of 179c0d8 to stage-aosp-masterElliott Hughes2016-06-1616-1490/+242
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | resolve merge conflicts of 179c0d8 to stage-aosp-masterElliott Hughes2016-06-1616-1490/+242
| | |/| | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | Merge "Remove obsolete MTD support."Elliott Hughes2016-06-1516-1490/+242
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Remove obsolete MTD support.Elliott Hughes2016-06-1016-1490/+242
* | | | | | | | | | | | | | | | | | Merge \\\\"Add bootloader_message_ab struct.\\\\" am: 59f04b9982 am: f57d7f02c9 am: 2fc7cd69fdTao Bao2016-06-141-13/+58
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge \\\"Add bootloader_message_ab struct.\\\" am: 59f04b9982 am: f57d7f02c9Tao Bao2016-06-141-13/+58
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge \\"Add bootloader_message_ab struct.\\" am: 59f04b9982Tao Bao2016-06-141-13/+58
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Merge \"Add bootloader_message_ab struct.\"Tao Bao2016-06-141-13/+58
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Add bootloader_message_ab struct."Tao Bao2016-06-141-13/+58
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Add bootloader_message_ab struct.Tao Bao2016-06-101-13/+58
| | | | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp am: 38afad46d8Tao Bao2016-06-140-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 490fad6 to nyc-dev-plus-aospTao Bao2016-06-140-0/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | resolve merge conflicts of 490fad6 to nyc-dev-plus-aospTao Bao2016-06-141-57/+66
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 2a4386f to nyc-mr1-dev-plus-aospTao Bao2016-06-141-57/+66
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 2a4386f to nyc-mr1-dev-plus-aospTao Bao2016-06-141-57/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | applypatch: Don\'t call inflate() when it expects zero-length output.Tao Bao2016-06-141-57/+66
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | / / / / / / / / / / / | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | applypatch: Don't call inflate() when it expects zero-length output.Tao Bao2016-06-141-57/+66
* | | | | | | | | | | | | | | | | | Merge \\"recovery: Track the name change for wipe_ab.\\" into nyc-mr1-dev am: dc1393d09bTao Bao2016-06-131-12/+12
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge \"recovery: Track the name change for wipe_ab.\" into nyc-mr1-devTao Bao2016-06-131-12/+12
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "recovery: Track the name change for wipe_ab." into nyc-mr1-devTao Bao2016-06-131-12/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | recovery: Track the name change for wipe_ab.Tao Bao2016-06-101-12/+12
* | | | | | | | | | | | | | | | | | | Merge \\\\"updater: Fix the broken ReadFileFn.\\\\" am: 4ddd5edf31 am: 89dfe730d4 am: 1e67422f37Tao Bao2016-06-111-1/+1
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge \\\"updater: Fix the broken ReadFileFn.\\\" am: 4ddd5edf31 am: 89dfe730d4Tao Bao2016-06-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge \\"updater: Fix the broken ReadFileFn.\\" am: 4ddd5edf31Tao Bao2016-06-111-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge \"updater: Fix the broken ReadFileFn.\"Tao Bao2016-06-111-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "updater: Fix the broken ReadFileFn."Tao Bao2016-06-111-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | updater: Fix the broken ReadFileFn.Tao Bao2016-06-111-1/+1
| | | | | | |_|_|/ / / / / / / / / / / | | | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Log source/target build version to last_install am: b0ddae55e5 am: dcf1089771Tianjie Xu2016-06-100-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Log source/target build version to last_install am: b0ddae55e5Tianjie Xu2016-06-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Log source/target build version to last_installTianjie Xu2016-06-101-0/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | / / / / / / / / / / / | | | | |_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Log source/target build version to last_install am: b0ddae55e5 am: 9d2657fbb7Tianjie Xu2016-06-101-0/+55
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Log source/target build version to last_install am: b0ddae55e5Tianjie Xu2016-06-101-0/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Log source/target build version to last_installTianjie Xu2016-06-101-0/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Log source/target build version to last_installTianjie Xu2016-06-101-0/+55
* | | | | | | | | | | | | | | | | | Merge \\\\"Remove etc/META-INF/com/google/android/update-script.\\\\" am: 5b2191a9d6 am: 5be6ae12b5 am: 21c4f4e6e6Elliott Hughes2016-06-101-8/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge \\\"Remove etc/META-INF/com/google/android/update-script.\\\" am: 5b2191a9d6 am: 5be6ae12b5Elliott Hughes2016-06-101-8/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge \\"Remove etc/META-INF/com/google/android/update-script.\\" am: 5b2191a9d6Elliott Hughes2016-06-101-8/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge \"Remove etc/META-INF/com/google/android/update-script.\"Elliott Hughes2016-06-101-8/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Remove etc/META-INF/com/google/android/update-script."Elliott Hughes2016-06-101-8/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Remove etc/META-INF/com/google/android/update-script.Elliott Hughes2016-06-101-8/+0
| | | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge \"resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 91d78acbd3\" into nyc-mr1-dev-plus-aospAlain Vongsouvanh2016-06-080-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 91d78acbd3" into nyc-mr1-dev-plus-aospAndroid Build Merger (Role)2016-06-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9Alain Vongsouvanh2016-06-081-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-devAlain Vongsouvanh2016-06-081-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 2a697feb39Alain Vongsouvanh2016-06-081-1/+1
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9Alain Vongsouvanh2016-06-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | / / / / / / / / / / / / / | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-devAlain Vongsouvanh2016-06-081-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-devAlain Vongsouvanh2016-06-081-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | recovery: Make wear recovery more customizable.Alain Vongsouvanh2016-06-082-3/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / / | | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | | recovery: Make wear recovery more customizable.Alain Vongsouvanh2016-06-072-3/+4
* | | | | | | | | | | | | | | | | resolve merge conflicts of 1afa4d7 to nyc-mr1-dev-plus-aospTao Bao2016-06-040-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | resolve merge conflicts of 1afa4d7 to nyc-mr1-dev-plus-aospTao Bao2016-06-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "recovery: Add support to brick a device." into nyc-mr1-devTao Bao2016-06-041-1/+91
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | recovery: Add support to brick a device.Tao Bao2016-06-031-1/+91
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp am: 64f46fb16cTianjie Xu2016-06-040-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 7ce287d to nyc-dev-plus-aospTianjie Xu2016-06-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | resolve merge conflicts of 7ce287d to nyc-dev-plus-aospTianjie Xu2016-06-044-14/+76
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aospTianjie Xu2016-06-044-14/+76
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aospTianjie Xu2016-06-044-14/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Call ioctl before each write on retryTianjie Xu2016-06-044-14/+76
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| / / / / / / / / / / / / / | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Call ioctl before each write on retryTianjie Xu2016-06-034-14/+76
* | | | | | | | | | | | | | | | | resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp am: ba33da2884Tao Bao2016-06-041-1/+91
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | resolve merge conflicts of fe8e356 to nyc-dev-plus-aospTao Bao2016-06-041-1/+91
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | resolve merge conflicts of fe8e356 to nyc-dev-plus-aospTao Bao2016-06-031-1/+91
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "recovery: Add support to brick a device."Tao Bao2016-06-031-1/+91
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "recovery: Add support to brick a device."Tao Bao2016-06-031-1/+91
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | recovery: Add support to brick a device.Tao Bao2016-06-031-1/+91
| | | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 am: a7fca9402d am: e13a690c16Tao Bao2016-06-020-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 am: a7fca9402dTao Bao2016-06-011-38/+40
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6Tao Bao2016-06-011-38/+40
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector.""Tao Bao2016-06-011-38/+40
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector.""Tao Bao2016-06-011-38/+40
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."Tao Bao2016-06-011-38/+40
| | | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector.""Tao Bao2016-06-011-38/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."Tao Bao2016-06-011-38/+40
* | | | | | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 am: 11c794b1a7 am: 23bb1d210dAdam Buchbinder2016-06-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 am: 11c794b1a7Adam Buchbinder2016-06-011-40/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5Adam Buchbinder2016-06-011-40/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."Adam Buchbinder2016-06-011-40/+38
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."Treehugger Robot2016-06-011-40/+38
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector.Adam Buchbinder2016-06-011-40/+38
| | | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb am: fd49adbdaf am: d8a518d711Tao Bao2016-06-011-2/+1
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb am: fd49adbdafTao Bao2016-06-011-2/+1
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510ebTao Bao2016-06-011-2/+1
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff.""Tao Bao2016-06-011-2/+1
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff.""Tao Bao2016-06-011-2/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Revert "imgdiff: Generate statically linked imgdiff."Tao Bao2016-06-011-2/+1
* | | | | | | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc am: a83b798c57 am: f90090d429Tao Bao2016-06-011-1/+2
|\| | | | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc am: a83b798c57Tao Bao2016-06-011-1/+2
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff." am: 680d783eccTao Bao2016-06-011-1/+2
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff."Tao Bao2016-06-011-1/+2
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff."Tao Bao2016-06-011-1/+2
| | | | |\| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | imgdiff: Generate statically linked imgdiff.Tao Bao2016-05-311-1/+2
| | | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector.Adam Buchbinder2016-05-261-40/+38
* | | | | | | | | | | | | | | | | Disable the meaningless parts of the UI for A/B. am: 01fcbe160bElliott Hughes2016-05-242-14/+44
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Disable the meaningless parts of the UI for A/B.Elliott Hughes2016-05-242-14/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Disable the meaningless parts of the UI for A/B.Elliott Hughes2016-05-242-14/+44
* | | | | | | | | | | | | | | | | resolve merge conflicts of 50f6417 am: 3f6eb86390Tianjie Xu2016-05-240-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | resolve merge conflicts of 50f6417Tianjie Xu2016-05-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | resolve merge conflicts of 50f6417Tianjie Xu2016-05-231-1/+0
* | | | | | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c am: 1ae2434c11 am: f5e2831bf3Jeremy Compostella2016-05-241-1/+4
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c am: 1ae2434c11Jeremy Compostella2016-05-241-1/+4
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field" am: 3788001b2cJeremy Compostella2016-05-231-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field"Jeremy Compostella2016-05-231-1/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field"Treehugger Robot2016-05-231-1/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | slot_metadata: add verity_corrupted fieldJeremy Compostella2016-05-231-1/+4
| | | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | resolve merge conflicts of 84478e8 to nyc-mr1-dev-plus-aospTianjie Xu2016-05-240-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | resolve merge conflicts of 84478e8 to nyc-mr1-dev-plus-aospTianjie Xu2016-05-240-0/+0
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | resolve merge conflicts of 50f6417 to nyc-dev-plus-aospTianjie Xu2016-05-2311-105/+267
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aospTianjie Xu2016-05-2311-105/+266
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aospTianjie Xu2016-05-2311-105/+266
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Allow recovery to return error codes" into nyc-devTianjie Xu2016-05-2311-104/+265
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Allow recovery to return error codes" into nyc-devTianjie Xu2016-05-2311-104/+265
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Allow recovery to return error codesTianjie Xu2016-05-2011-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: bd43d7e92bMatt Sarett2016-05-200-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: 75dea9ca3aMatt Sarett2016-05-200-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: b02b2fe392Matt Sarett2016-05-200-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: 8a55c65345Matt Sarett2016-05-200-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: 75dea9ca3aMatt Sarett2016-05-200-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: b02b2fe392Matt Sarett2016-05-200-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: fc1d9a49d1Matt Sarett2016-05-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | / / / / / / / / / / | | | | | |_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779dMatt Sarett2016-05-200-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / / | | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55Matt Sarett2016-05-200-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|/ / / / / / / / | | | | | | |/| | | | | | | | | |
| | | | | | * | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97adMatt Sarett2016-05-200-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|/ / / / / / / | | | | | | | |/| | | | | | | | |
| | | | | | | * | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27Matt Sarett2016-05-200-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630Matt Sarett2016-05-200-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|_|/ / / / / / | | | | | | | | | |/| | | | | | | |
| | | | | | | | | * | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7eMatt Sarett2016-05-200-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | |_|_|/ / / / / | | | | | | | | | | |/| | | | | | |
| | | | | | | | | | * | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620fMatt Sarett2016-05-200-0/+0
| | | | | | | | | |/| | | | | | | | | | | | | | | | | | | |_|_|/ / / / | | | | | | | | | | |/| | | | | |
| | | | | | | | | | * | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-devMatt Sarett2016-05-200-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|/ / / | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | * | | | | | resolve merge conflicts of 86a28d0 to klp-modular-devMatt Sarett2016-05-190-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | |_|_|/ / | | | | | | | | | | | | |/| | | |
| | | | | | | | | | | | * | | | | DO NOT MERGE Use updated libpng APIMatt Sarett2016-05-191-10/+10
| | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | |_|_|/ | | | | | | | | | | | | | |/| | |
| | | | | | | | | | | | | * | | | DO NOT MERGE Use updated libpng APIMatt Sarett2016-05-171-10/+10
| | | | | | | | | | | | |/ / / /
* | | | | | | | | | | | | | | | Add time and I/O info to last_install am: dd874b1c87 am: 142b864ba1Tianjie Xu2016-05-180-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add time and I/O info to last_install am: dd874b1c87Tianjie Xu2016-05-180-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add time and I/O info to last_installTianjie Xu2016-05-182-4/+35
| | |\| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Add time and I/O info to last_install am: dd874b1c87 am: 027b403e8aTianjie Xu2016-05-182-4/+35
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add time and I/O info to last_install am: dd874b1c87Tianjie Xu2016-05-182-4/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add time and I/O info to last_installTianjie Xu2016-05-182-4/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Add time and I/O info to last_installTianjie Xu2016-05-162-4/+35
* | | | | | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0 am: 32c2e78726 am: 0cc7e28ffdJonathan Hamilton2016-05-121-6/+8
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0 am: 32c2e78726Jonathan Hamilton2016-05-121-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0Jonathan Hamilton2016-05-121-6/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend"Jonathan Hamilton2016-05-121-6/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend"Treehugger Robot2016-05-121-6/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | Keep ADF device alive for the lifetime of the minui backendJonathan Hamilton2016-05-061-6/+8
* | | | | | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 am: d03ee52eb7 am: eef053fda1Tao Bao2016-05-082-2/+2
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 am: d03ee52eb7Alistair Strachan2016-05-082-2/+2
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225Tao Bao2016-05-082-2/+2
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags."Alistair Strachan2016-05-082-2/+2
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags."Tao Bao2016-05-082-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | updater, minzip: Remove unnecessary O_SYNC flags.Alistair Strachan2016-05-062-2/+2
| | | | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff." am: 704cac2f99 am: 7caebae682 am: 22431741ceSen Jiang2016-05-063-425/+10
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff." am: 704cac2f99 am: 7caebae682Sen Jiang2016-05-063-425/+10
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff." am: 704cac2f99Sen Jiang2016-05-063-425/+10
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff."Sen Jiang2016-05-063-425/+10
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff."Treehugger Robot2016-05-063-425/+10
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | applypatch: Use bsdiff from external/bsdiff.Sen Jiang2016-05-043-425/+10
| | | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "recovery: Always log the update attempt." am: ecd6e2af50 am: 88234ad84b am: c66a83dac0Tao Bao2016-05-030-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "recovery: Always log the update attempt." am: ecd6e2af50 am: 88234ad84bTao Bao2016-05-030-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "recovery: Always log the update attempt." am: ecd6e2af50Tao Bao2016-05-030-0/+0
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "recovery: Always log the update attempt."Tao Bao2016-05-031-0/+4
| | | |\| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge "recovery: Always log the update attempt."Treehugger Robot2016-05-031-0/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | recovery: Always log the update attempt.Tao Bao2016-05-031-0/+4
| | | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Make text for recovery larger on angler am: 087c5edd8d am: 26f5ab0e9c" into nyc-mr1-dev-plus-aospTianjie Xu2016-05-020-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Make text for recovery larger on angler am: 087c5edd8d am: 26f5ab0e9c" into nyc-mr1-dev-plus-aospAndroid Build Merger (Role)2016-05-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Make text for recovery larger on angler am: 087c5edd8dTianjie Xu2016-05-021-1/+1
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Make text for recovery larger on anglerTianjie Xu2016-05-021-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Make text for recovery larger on angler am: 087c5edd8d am: ba4e7977e4Tianjie Xu2016-05-021-1/+1
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Make text for recovery larger on angler am: 087c5edd8dTianjie Xu2016-05-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | / / / / / / / / / / | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Make text for recovery larger on anglerTianjie Xu2016-05-021-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Make text for recovery larger on anglerTianjie Xu2016-05-021-1/+1
* | | | | | | | | | | | | | | | resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp am: cacb47b2a3Tianjie Xu2016-05-020-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | resolve merge conflicts of 5823dd4 to nyc-dev-plus-aospTianjie Xu2016-05-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | resolve merge conflicts of 5823dd4 to nyc-dev-plus-aospTianjie Xu2016-05-025-1/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | resolve merge conflicts of 23c7af7 to nyc-mr1-dev-plus-aospTianjie Xu2016-05-025-1/+23
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | resolve merge conflicts of 23c7af7 to nyc-mr1-dev-plus-aospTianjie Xu2016-05-025-1/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Add ability to show "installing security update"" into nyc-devTianjie Xu2016-05-025-1/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "Add ability to show "installing security update"" into nyc-devTianjie Xu2016-05-025-1/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Add ability to show "installing security update"Tianjie Xu2016-04-295-1/+23
* | | | | | | | | | | | | | | | | Merge "recovery: Always log the update attempt. am: 5687001895 am: f13662a349" into nyc-mr1-dev-plus-aospTao Bao2016-05-020-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "recovery: Always log the update attempt. am: 5687001895 am: f13662a349" into nyc-mr1-dev-plus-aospAndroid Build Merger (Role)2016-05-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | recovery: Always log the update attempt. am: 5687001895Tao Bao2016-05-021-0/+4
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | recovery: Always log the update attempt.Tao Bao2016-05-021-0/+4
| | | |\| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | recovery: Always log the update attempt. am: 5687001895 am: e0c8a9bb02Tao Bao2016-05-021-0/+4
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | recovery: Always log the update attempt. am: 5687001895Tao Bao2016-05-021-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | recovery: Always log the update attempt.Tao Bao2016-05-021-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | recovery: Always log the update attempt.Tao Bao2016-04-301-0/+4
| | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings." am: fafa6a6531 am: 77d7cb1d0a am: 8d3b85a320Chih-hung Hsieh2016-04-301-1/+1
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings." am: fafa6a6531 am: 77d7cb1d0aChih-Hung Hsieh2016-04-301-1/+1
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings." am: fafa6a6531Chih-hung Hsieh2016-04-301-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings."Chih-Hung Hsieh2016-04-301-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings."Chih-hung Hsieh2016-04-301-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | Fix google-explicit-constructor warnings.Chih-Hung Hsieh2016-04-291-1/+1
* | | | | | | | | | | | | | | | | Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee am: 4458d3e am: 6bfe76eTao Bao2016-04-281-2/+1
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee am: 4458d3eTao Bao2016-04-281-2/+1
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59ceeTao Bao2016-04-281-2/+1
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "updater: Don\'t zero out CommandParameters with memset(3)."Tao Bao2016-04-281-2/+1
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "updater: Don't zero out CommandParameters with memset(3)."Tao Bao2016-04-281-2/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | updater: Don't zero out CommandParameters with memset(3).Tao Bao2016-04-271-2/+1
| | | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: 1dc396f" into nyc-mr1-dev-plus-aospTreeHugger Robot2016-04-280-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: 1dc396f" into nyc-mr1-dev-plus-aospAndroid Build Merger (Role)2016-04-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev am: 343eb72TreeHugger Robot2016-04-281-8/+10
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-devElliott Hughes2016-04-281-8/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: a7f7e70Elliott Hughes2016-04-281-8/+10
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev am: 343eb72TreeHugger Robot2016-04-281-8/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | / / / / / / / / / / | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-devElliott Hughes2016-04-281-8/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-devTreeHugger Robot2016-04-281-8/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Improve the layout-related comments.Elliott Hughes2016-04-281-8/+10
* | | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev am: eeca191 am: e890e19Tianjie Xu2016-04-280-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev am: eeca191Tianjie Xu2016-04-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-devTianjie Xu2016-04-2825-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev am: 2f1eedd am: 21092a9Elliott Hughes2016-04-280-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev am: 2f1eeddElliott Hughes2016-04-280-0/+0
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-devElliott Hughes2016-04-28502-50/+80
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev am: eeca191 am: d57691eTianjie Xu2016-04-2825-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev am: eeca191Tianjie Xu2016-04-2825-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-devTianjie Xu2016-04-2825-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-devTianjie Xu2016-04-2825-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Update background text for recovery UITianjie Xu2016-04-2825-0/+0
* | | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev am: 2f1eedd am: 75191f3Elliott Hughes2016-04-28502-50/+80
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev am: 2f1eeddElliott Hughes2016-04-28502-50/+80
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-devElliott Hughes2016-04-28502-50/+80
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-devElliott Hughes2016-04-28502-50/+80
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Update recovery UI.Elliott Hughes2016-04-27502-50/+80
* | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours am: a42bca8 -s oursBaligh Uddin2016-04-280-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s oursBaligh Uddin2016-04-280-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-04-280-0/+0
| | |\| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours am: 06be362 -s oursBaligh Uddin2016-04-280-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s oursBaligh Uddin2016-04-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-04-280-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-04-270-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-04-263-11/+7
* | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: abd0988 -s oursBaligh Uddin2016-04-280-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBaligh Uddin2016-04-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBaligh Uddin2016-04-270-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-04-2678-312/+312
* | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2016-04-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-04-263-11/+7
* | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: ca5003e -s ours am: 97ee2b1 -s oursBill Yi2016-04-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: ca5003e -s oursBill Yi2016-04-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-270-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: ca5003e -s ours am: e84e73a -s oursBill Yi2016-04-270-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: ca5003e -s oursBill Yi2016-04-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-270-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-273-11/+7
| | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: a004356 -s oursBill Yi2016-04-270-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-270-0/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-2778-312/+312
| | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-273-11/+7
| |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e59f5de -s ours am: 29c7a34 -s oursBill Yi2016-04-250-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e59f5de -s oursBill Yi2016-04-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e59f5de -s ours am: d210dc0 -s oursBill Yi2016-04-250-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e59f5de -s oursBill Yi2016-04-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-2581-324/+328
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-2581-324/+328
* | | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089 am: 2f9be55Tao Bao2016-04-230-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089Tao Bao2016-04-230-0/+0
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-devTao Bao2016-04-232-3/+20
| | |\| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089 am: 5e3aa78Tao Bao2016-04-232-3/+20
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089Tao Bao2016-04-232-3/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-devTao Bao2016-04-232-3/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-devTao Bao2016-04-232-3/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | recovery: Dump the signature in the zip package.Tao Bao2016-04-202-3/+20
* | | | | | | | | | | | | | | | | Merge "Go back to the old ear-wiggling Android animation. am: 692941be79 am: 87b0654f00" into nyc-mr1-dev-plus-aospElliott Hughes2016-04-220-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Go back to the old ear-wiggling Android animation. am: 692941be79 am: 87b0654f00" into nyc-mr1-dev-plus-aospAndroid Build Merger (Role)2016-04-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Go back to the old ear-wiggling Android animation. am: 692941be79Elliott Hughes2016-04-22457-15/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation.Elliott Hughes2016-04-22457-15/+48
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation. am: 692941be79 am: 17266d9a65Elliott Hughes2016-04-22457-15/+48
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation. am: 692941be79Elliott Hughes2016-04-22457-15/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | / / / / / / / / / / / / / | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation.Elliott Hughes2016-04-22457-15/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation.Elliott Hughes2016-04-21457-15/+48
* | | | | | | | | | | | | | | | | Merge "Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 4cc6145423" into nyc-mr1-dev-plus-aospTianjie Xu2016-04-210-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 4cc6145423" into nyc-mr1-dev-plus-aospAndroid Build Merger (Role)2016-04-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512Tianjie Xu2016-04-2125-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-devTianjie Xu2016-04-2125-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 8bb3bd9209Tianjie Xu2016-04-2125-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512Tianjie Xu2016-04-2125-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | / / / / / / / / / / / / / | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-devTianjie Xu2016-04-2125-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-devTianjie Xu2016-04-2125-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Regenerate background text imgs in recoveryTianjie Xu2016-04-1925-0/+0
* | | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev am: 8b86373 am: 210b0a5Tianjie Xu2016-04-210-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev am: 8b86373Tianjie Xu2016-04-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-devTianjie Xu2016-04-214-14/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev am: 8b86373 am: 45609d3Tianjie Xu2016-04-214-14/+44
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev am: 8b86373Tianjie Xu2016-04-214-14/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-devTianjie Xu2016-04-214-14/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-devTianjie Xu2016-04-204-14/+44
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Fix matches_locale functionTianjie Xu2016-04-204-14/+44
| | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: 0e52921" into nyc-mr1-dev-plus-aospElliott Hughes2016-04-200-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: 0e52921" into nyc-mr1-dev-plus-aospAndroid Build Merger (Role)2016-04-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72dElliott Hughes2016-04-201-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Remove trailing punctuation from recovery strings." into nyc-devElliott Hughes2016-04-201-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: c15177b" into nyc-mr1-dev-plus-aospElliott Hughes2016-04-201-4/+4
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: c15177b" into nyc-mr1-dev-plus-aospAndroid Build Merger (Role)2016-04-201-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72dElliott Hughes2016-04-201-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Remove trailing punctuation from recovery strings." into nyc-devElliott Hughes2016-04-201-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Remove trailing punctuation from recovery strings." into nyc-devElliott Hughes2016-04-201-4/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Remove trailing punctuation from recovery strings.Elliott Hughes2016-04-201-4/+4
| | | | | | |_|/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Decrease OTA package verification times further. am: dd895d0 am: 5be36da" into nyc-mr1-dev-plus-aospElliott Hughes2016-04-200-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Decrease OTA package verification times further. am: dd895d0 am: 5be36da" into nyc-mr1-dev-plus-aospAndroid Build Merger (Role)2016-04-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Decrease OTA package verification times further. am: dd895d0Elliott Hughes2016-04-201-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Decrease OTA package verification times further.Elliott Hughes2016-04-201-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| / / / / / / / / / / / / | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Decrease OTA package verification times further. am: dd895d0 am: 1864febElliott Hughes2016-04-201-4/+4
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Decrease OTA package verification times further. am: dd895d0Elliott Hughes2016-04-201-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | / / / / / / / / / / / / | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Decrease OTA package verification times further.Elliott Hughes2016-04-201-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Decrease OTA package verification times further.Elliott Hughes2016-04-201-4/+4
| | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "Fix google-runtime-int warnings." am: a1f4a1e am: bcad1d1 am: 0231e70Chih-hung Hsieh2016-04-1912-46/+53
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Fix google-runtime-int warnings." am: a1f4a1e am: bcad1d1Chih-Hung Hsieh2016-04-1912-46/+53
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Fix google-runtime-int warnings." am: a1f4a1eChih-hung Hsieh2016-04-1912-46/+53
| |/| | | | | | | | | | | | | | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Fix google-runtime-int warnings."Chih-Hung Hsieh2016-04-1912-46/+53
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge "Fix google-runtime-int warnings."Chih-hung Hsieh2016-04-1912-46/+53
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Fix google-runtime-int warnings.Chih-Hung Hsieh2016-04-1812-46/+53
| | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | Merge "Fix IWYU errors." am: 51dcd0d am: 405db92David Benjamin2016-04-161-0/+1
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Fix IWYU errors." am: 51dcd0dTreehugger Robot2016-04-161-0/+1
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Fix IWYU errors."David Benjamin2016-04-161-0/+1
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "Fix IWYU errors."Treehugger Robot2016-04-161-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Fix IWYU errors.David Benjamin2016-04-161-0/+1
| | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | Merge "Update the system update animation." into nyc-dev am: e8d0eccElliott Hughes2016-04-15466-73/+164
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Update the system update animation." into nyc-devElliott Hughes2016-04-15466-73/+164
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Update the system update animation." into nyc-devElliott Hughes2016-04-15466-73/+164
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Update the system update animation.Elliott Hughes2016-04-15466-73/+164
* | | | | | | | | | | | | | | Merge "Define the Bootloader Control A/B structure" am: e6af522 am: b30c6f6Jeremy Compostella2016-04-151-1/+53
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Define the Bootloader Control A/B structure" am: e6af522Tao Bao2016-04-151-1/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Define the Bootloader Control A/B structure"Jeremy Compostella2016-04-151-1/+53
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "Define the Bootloader Control A/B structure"Tao Bao2016-04-151-1/+53
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Define the Bootloader Control A/B structureJeremy Compostella2016-04-061-1/+53
* | | | | | | | | | | | | | | | Explicitly set the font face and color. am: 70ae70bElliott Hughes2016-04-152-7/+6
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Explicitly set the font face and color.Elliott Hughes2016-04-152-7/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Explicitly set the font face and color.Elliott Hughes2016-04-152-7/+6
| | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | resolve merge conflicts of 8febafa to nyc-dev-plus-aospElliott Hughes2016-04-142-10/+14
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | resolve merge conflicts of 8febafa to nyc-dev-plus-aospElliott Hughes2016-04-142-10/+14
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Use BoringSSL instead of mincrypt to speed up package verification.Elliott Hughes2016-04-1410-257/+285
* | | | | | | | | | | | | | | resolve merge conflicts of 2bf95ac to nyc-dev-plus-aospMattias Nissler2016-04-1311-247/+274
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | resolve merge conflicts of 2bf95ac to nyc-dev-plus-aospElliott Hughes2016-04-1311-247/+274
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Convert recovery to use BoringSSL instead of mincrypt."Mattias Nissler2016-04-1311-247/+275
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "Convert recovery to use BoringSSL instead of mincrypt."Elliott Hughes2016-04-1311-247/+275
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Convert recovery to use BoringSSL instead of mincrypt.Mattias Nissler2016-04-0611-247/+275
* | | | | | | | | | | | | | | | resolve merge conflicts of a58a6db to nyc-dev-plus-aospYabin Cui2016-04-094-45/+160
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | resolve merge conflicts of a58a6db to nyc-dev-plus-aospYabin Cui2016-04-094-45/+160
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | uncrypt: split libbootloader_message_writer for reuse.Yabin Cui2016-04-084-44/+160
* | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-061-1/+1
* | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: b162551 -s oursBill Yi2016-04-050-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBill Yi2016-04-050-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBill Yi2016-04-052-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-052-2/+2
* | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Bill Yi2016-04-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-051-1/+1
* | | | | | | | | | | | | | | | | | recovery-persist: pick up both pstore console files am: a569727Mark Salyzyn2016-04-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | recovery-persist: pick up both pstore console filesMark Salyzyn2016-04-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | recovery-persist: pick up both pstore console filesMark Salyzyn2016-04-051-2/+7
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "recovery-persist: pick up both pstore console files" am: 901f315 am: 4195388Mark Salyzyn2016-04-051-2/+7
|\| | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "recovery-persist: pick up both pstore console files" am: 901f315Mark Salyzyn2016-04-051-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "recovery-persist: pick up both pstore console files"Mark Salyzyn2016-04-051-2/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "recovery-persist: pick up both pstore console files"Mark Salyzyn2016-04-051-2/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | recovery-persist: pick up both pstore console filesMark Salyzyn2016-04-051-2/+7
| | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: f75b6e4 -s oursBill Yi2016-04-050-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-0581-229/+148
* | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-0581-229/+148
* | | | | | | | | | | | | | | Merge "Move selinux dependencies out of header files." am: 8124750 am: dc91161Elliott Hughes2016-04-028-11/+18
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Move selinux dependencies out of header files." am: 8124750Elliott Hughes2016-04-028-11/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Move selinux dependencies out of header files."Elliott Hughes2016-04-028-11/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "Move selinux dependencies out of header files."Elliott Hughes2016-04-028-11/+18
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Move selinux dependencies out of header files.Elliott Hughes2016-04-028-11/+18
| | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | recovery: use __android_log_pmsg_file_write for log files am: 13aca59Mark Salyzyn2016-03-310-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | recovery: use __android_log_pmsg_file_write for log filesMark Salyzyn2016-03-310-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | recovery: use __android_log_pmsg_file_write for log filesMark Salyzyn2016-03-318-12/+548
* | | | | | | | | | | | | | | Merge "recovery: use __android_log_pmsg_file_write for log files" am: 75da771 am: 6f83130Mark Salyzyn2016-03-318-12/+548
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "recovery: use __android_log_pmsg_file_write for log files" am: 75da771Mark Salyzyn2016-03-318-12/+548
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "recovery: use __android_log_pmsg_file_write for log files"Mark Salyzyn2016-03-318-12/+548
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "recovery: use __android_log_pmsg_file_write for log files"Mark Salyzyn2016-03-318-12/+548
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | recovery: use __android_log_pmsg_file_write for log filesMark Salyzyn2016-03-288-12/+548
* | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: f1b2785 -s oursBill Yi2016-03-310-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-03-310-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-03-3181-312/+498
* | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-03-3181-312/+498
* | | | | | | | | | | | | | | | Merge "uncrypt: remove --read-bcb option." am: ebd22be am: ecc068c -s oursYabin Cui2016-03-300-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "uncrypt: remove --read-bcb option." am: ebd22beYabin Cui2016-03-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "uncrypt: remove --read-bcb option."Yabin Cui2016-03-301-32/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "uncrypt: remove --read-bcb option."Yabin Cui2016-03-301-32/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | uncrypt: remove --read-bcb option.Yabin Cui2016-03-301-32/+0
| | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "uncrypt: fix call to close()." into nyc-dev am: 912e87e -s oursYabin Cui2016-03-300-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "uncrypt: fix call to close()." into nyc-devYabin Cui2016-03-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "uncrypt: fix call to close()." into nyc-devYabin Cui2016-03-301-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | uncrypt: fix call to close().Yabin Cui2016-03-301-2/+2
* | | | | | | | | | | | | | | | | Merge "Add string for Installing_security_update" am: 3568004 am: 2e21897Tianjie Xu2016-03-300-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Add string for Installing_security_update" am: 3568004Tianjie Xu2016-03-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Add string for Installing_security_update"Tianjie Xu2016-03-301-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Add string for Installing_security_update"Tianjie Xu2016-03-301-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Add string for Installing_security_updateTianjie Xu2016-03-291-0/+4
| | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | resolve merge conflicts of 61799ba to nyc-dev-plus-aospYabin Cui2016-03-301-32/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | resolve merge conflicts of 61799ba to nyc-dev-plus-aospYabin Cui2016-03-301-32/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | uncrypt: remove --read-bcb option.Yabin Cui2016-03-291-32/+0
| | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Add string for Installing_security_update am: 1ee0ff3Tianjie Xu2016-03-291-0/+4
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add string for Installing_security_updateTianjie Xu2016-03-291-0/+4
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add string for Installing_security_updateTianjie Xu2016-03-291-0/+4
* | | | | | | | | | | | | | | | Fix uncrypt.cpp unique_fd build breakage.Elliott Hughes2016-03-291-10/+10
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix uncrypt.cpp unique_fd build breakage.Elliott Hughes2016-03-291-10/+10
* | | | | | | | | | | | | | | | resolve merge conflicts of 5cf4701 to nyc-dev-plus-aospElliott Hughes2016-03-294-128/+56
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | resolve merge conflicts of 5cf4701 to nyc-dev-plus-aospElliott Hughes2016-03-294-128/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Switch to <android-base/unique_fd.h>."Elliott Hughes2016-03-294-143/+74
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| / / / / / / / / / / / | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "Switch to <android-base/unique_fd.h>."Elliott Hughes2016-03-294-143/+74
| | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Switch to <android-base/unique_fd.h>.Elliott Hughes2016-03-294-143/+74
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | Move recovery_l10n here from development/tools. am: cc79490Elliott Hughes2016-03-260-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Move recovery_l10n here from development/tools.Elliott Hughes2016-03-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Move recovery_l10n here from development/tools.Elliott Hughes2016-03-2683-0/+1038
* | | | | | | | | | | | | | Merge "Move recovery_l10n here from development/tools." am: 2dbd06cElliott Hughes2016-03-2683-0/+1038
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Move recovery_l10n here from development/tools."Elliott Hughes2016-03-2683-0/+1038
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Move recovery_l10n here from development/tools."Elliott Hughes2016-03-2683-0/+1038
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Move recovery_l10n here from development/tools.Elliott Hughes2016-03-2683-0/+1038
* | | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" am: 3123e5aTianjie Xu2016-03-250-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode"Tianjie Xu2016-03-250-0/+0
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode"Tianjie Xu2016-03-251-8/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Skip stashing source blocks in verify modeTianjie Xu2016-03-251-8/+46
* | | | | | | | | | | | | | | | Merge "Clean up intent_file related code in recovery.cpp" am: 7e18ce2Tianjie Xu2016-03-251-23/+5
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Clean up intent_file related code in recovery.cpp"Tianjie Xu2016-03-251-23/+5
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Clean up intent_file related code in recovery.cpp"Tianjie Xu2016-03-251-23/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Clean up intent_file related code in recovery.cppTianjie Xu2016-03-241-23/+5
| | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Correct caching behavior for should_inject_cache" am: 9afbf2aJed Estep2016-03-250-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Correct caching behavior for should_inject_cache"Jed Estep2016-03-250-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Correct caching behavior for should_inject_cache"Tao Bao2016-03-252-18/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Correct caching behavior for should_inject_cacheJed Estep2016-03-252-18/+23
| | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" into nyc-dev am: adca297Tianjie Xu2016-03-241-8/+46
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" into nyc-devTianjie Xu2016-03-241-8/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" into nyc-devTianjie Xu2016-03-241-8/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Skip stashing source blocks in verify modeTianjie Xu2016-03-231-8/+46
* | | | | | | | | | | | | | | | Correct caching behavior for should_inject_cache am: 88dd779Jed Estep2016-03-242-17/+17
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Correct caching behavior for should_inject_cacheJed Estep2016-03-242-17/+17
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Correct caching behavior for should_inject_cacheJed Estep2016-03-232-17/+17
* | | | | | | | | | | | | | | | Merge "Remove dead tools." am: 4cb6812Elliott Hughes2016-03-234-398/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Remove dead tools."Elliott Hughes2016-03-234-398/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Remove dead tools."Elliott Hughes2016-03-234-398/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Remove dead tools.Elliott Hughes2016-03-234-398/+0
| | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | Control fault injection with config files instead of build flags am: ff6df89Jed Estep2016-03-2110-137/+242
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Control fault injection with config files instead of build flagsJed Estep2016-03-2110-137/+242
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Control fault injection with config files instead of build flagsJed Estep2016-03-1910-137/+242
* | | | | | | | | | | | | | | Merge "Fix: full ota package larger than 2GB fails to upgrade" am: 867e60dcaozhiyuan2016-03-212-12/+14
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Fix: full ota package larger than 2GB fails to upgrade"caozhiyuan2016-03-212-12/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Fix: full ota package larger than 2GB fails to upgrade"Tao Bao2016-03-212-12/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fix: full ota package larger than 2GB fails to upgradecaozhiyuan2016-03-212-12/+14
| | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | recovery: Move SwipeDetector into common location am: 9020e0fPrashant Malani2016-03-183-0/+236
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | recovery: Move SwipeDetector into common locationPrashant Malani2016-03-183-0/+236
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | recovery: Move SwipeDetector into common locationPrashant Malani2016-03-183-0/+236
* | | | | | | | | | | | | | | resolve merge conflicts of ce58688 to nyc-dev-plus-aospTao Bao2016-03-1710-241/+139
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | resolve merge conflicts of ce58688 to nyc-dev-plus-aospTao Bao2016-03-1710-241/+139
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Revert "DO NOT MERGE Control fault injection with config files instead of build flags"Tao Bao2016-03-1710-237/+137
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | resolve merge conflicts of f73abf3 to nyc-dev-plus-aospJed Estep2016-03-170-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | resolve merge conflicts of f73abf3 to nyc-dev-plus-aospElliott Hughes2016-03-170-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | DO NOT MERGE Control fault injection with config files instead of build flagsJed Estep2016-03-1610-137/+237
* | | | | | | | | | | | | | Merge "Add include/ to the Makefile include path." am: 38234f4befAlex Deymo2016-03-141-1/+1
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Add include/ to the Makefile include path."Alex Deymo2016-03-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Add include/ to the Makefile include path."Alex Deymo2016-03-141-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Add include/ to the Makefile include path.Alex Deymo2016-03-141-1/+1
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | resolve merge conflicts of 0222db01fd to nyc-dev-plus-aospGreg Kaiser2016-03-140-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | resolve merge conflicts of 0222db01fd to nyc-dev-plus-aospGreg Kaiser2016-03-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "otafault: Fix setting of have_eio_error." into nyc-devGreg Kaiser2016-03-141-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | otafault: Fix setting of have_eio_error.Greg Kaiser2016-03-141-1/+1
* | | | | | | | | | | | | | | Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev am: 761653a4adJed Estep2016-03-127-7/+428
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-devJed Estep2016-03-127-7/+428
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-devJed Estep2016-03-127-8/+429
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Port applypatch.sh tests to recovery_component_testsJed Estep2016-03-127-8/+429
* | | | | | | | | | | | | | | | Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev am: 20df4adeadPrashant Malani2016-03-124-72/+31
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-devPrashant Malani2016-03-124-72/+31
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-devPrashant Malani2016-03-124-72/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | recovery: Remove SetColor, and other refactoring for WearUIPrashant Malani2016-03-124-72/+31
| | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | applypatch: use vector to store data in FileContents. am: 1c522df25f -s oursYabin Cui2016-03-120-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | applypatch: use vector to store data in FileContents.Yabin Cui2016-03-120-0/+0
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | applypatch: use vector to store data in FileContents.Yabin Cui2016-03-114-127/+78
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | recovery: Remove duplicate variables and functions am: 0ba21cff07Prashant Malani2016-03-114-18/+6
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | recovery: Remove duplicate variables and functionsPrashant Malani2016-03-114-18/+6
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | recovery: Remove duplicate variables and functionsPrashant Malani2016-03-114-18/+6
* | | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" into nyc-dev am: d345de66ef -s oursTianjie Xu2016-03-100-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" into nyc-devTianjie Xu2016-03-100-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Reboot and retry on I/O errors" into nyc-devTianjie Xu2016-03-105-12/+119
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Reboot and retry on I/O errorsTianjie Xu2016-03-105-12/+119
* | | | | | | | | | | | | | | Revert "recovery: More refactoring of WearUI" am: f7f9e50528Prashant Malani2016-03-104-4/+84
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Revert "recovery: More refactoring of WearUI"Prashant Malani2016-03-104-4/+84
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Revert "recovery: More refactoring of WearUI"Prashant Malani2016-03-104-4/+84
* | | | | | | | | | | | | | | recovery: More refactoring of WearUI am: 1c7b2230d8Prashant Malani2016-03-094-84/+4
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | recovery: More refactoring of WearUIPrashant Malani2016-03-094-84/+4
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | recovery: More refactoring of WearUIPrashant Malani2016-03-094-84/+4
* | | | | | | | | | | | | | | Merge "applypatch: add -fPIC for libimgpatch in Chrome OS." am: 5593342575Sen Jiang2016-03-091-0/+1
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "applypatch: add -fPIC for libimgpatch in Chrome OS."Sen Jiang2016-03-091-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "applypatch: add -fPIC for libimgpatch in Chrome OS."Sen Jiang2016-03-091-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | applypatch: add -fPIC for libimgpatch in Chrome OS.Sen Jiang2016-03-091-0/+1
* | | | | | | | | | | | | | | | recovery: Begin refactor of WearUI to use ScreenRecoveryUI am: 7d9fd96dc9Prashant Malani2016-03-092-35/+2
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | recovery: Begin refactor of WearUI to use ScreenRecoveryUIPrashant Malani2016-03-092-35/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | recovery: Begin refactor of WearUI to use ScreenRecoveryUIPrashant Malani2016-03-082-35/+2
| | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" am: 94dc34148c am: 90f01a4203Tianjie Xu2016-03-085-7/+93
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" am: 94dc34148cTianjie Xu2016-03-085-7/+93
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Reboot and retry on I/O errors"Tianjie Xu2016-03-085-7/+93
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Reboot and retry on I/O errors"Tianjie Xu2016-03-085-7/+93
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Reboot and retry on I/O errorsTianjie Xu2016-03-035-7/+93
| | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." into nyc-dev am: 1731f2980bAlex Deymo2016-03-050-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." into nyc-devAlex Deymo2016-03-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." into nyc-devAlex Deymo2016-03-051-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Restore labels on /postinstall during recovery.Alex Deymo2016-03-051-0/+3
* | | | | | | | | | | | | | | | | recovery: Handle devices without /cache partition. am: ae6408d1a2Tao Bao2016-03-040-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | recovery: Handle devices without /cache partition.Tao Bao2016-03-040-0/+0
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | recovery: Handle devices without /cache partition.Tao Bao2016-03-041-10/+29
| | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "recovery: Handle devices without /cache partition." am: 479d9dc2f2 am: f2726712eaTao Bao2016-03-041-10/+29
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "recovery: Handle devices without /cache partition." am: 479d9dc2f2Tao Bao2016-03-041-10/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "recovery: Handle devices without /cache partition."Tao Bao2016-03-041-10/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "recovery: Handle devices without /cache partition."Tao Bao2016-03-041-10/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | recovery: Handle devices without /cache partition.Tao Bao2016-03-031-10/+29
* | | | | | | | | | | | | | | | | Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." am: f639490a51 am: 038c294453Tao Bao2016-03-0410-60/+102
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." am: f639490a51Tao Bao2016-03-0410-60/+102
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES."Tao Bao2016-03-0410-60/+102
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES."Tao Bao2016-03-0410-60/+102
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES.Tao Bao2016-03-0310-60/+102
| | | | | |_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." am: 60eae72ac6 am: f6ffefb116Alex Deymo2016-03-041-0/+3
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." am: 60eae72ac6Alex Deymo2016-03-041-0/+3
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery."Alex Deymo2016-03-041-0/+3
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery."Alex Deymo2016-03-041-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Restore labels on /postinstall during recovery.Alex Deymo2016-03-021-0/+3
| | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | uncrypt: Communicate via /dev/socket/uncrypt. am: 3a2bb594dfTao Bao2016-03-042-79/+184
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | uncrypt: Communicate via /dev/socket/uncrypt.Tao Bao2016-03-042-79/+184
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | uncrypt: Communicate via /dev/socket/uncrypt.Tao Bao2016-03-032-79/+184
* | | | | | | | | | | | | | | | Merge "Remove dumpkey build guards after completing code move." am: 5ffc038be6 am: ea0e0faae6Mattias Nissler2016-03-011-10/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Remove dumpkey build guards after completing code move." am: 5ffc038be6Mattias Nissler2016-03-011-10/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Remove dumpkey build guards after completing code move."Mattias Nissler2016-03-011-10/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "Remove dumpkey build guards after completing code move."Mattias Nissler2016-03-011-10/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Remove dumpkey build guards after completing code move.Mattias Nissler2016-02-261-10/+0
| | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Fixes to wear recovery for N" into nyc-dev am: 9db7964834Prashant Malani2016-03-012-0/+35
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Fixes to wear recovery for N" into nyc-devPrashant Malani2016-02-292-0/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Fixes to wear recovery for N" into nyc-devPrashant Malani2016-02-292-0/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fixes to wear recovery for NPrashant Malani2016-02-272-0/+35
* | | | | | | | | | | | | | | | | Merge "uncrypt: Retire pre-recovery service." into nyc-dev am: 65f35b5c35Tao Bao2016-02-282-19/+2
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "uncrypt: Retire pre-recovery service." into nyc-devTao Bao2016-02-282-19/+2
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "uncrypt: Retire pre-recovery service." into nyc-devTao Bao2016-02-282-19/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | uncrypt: Retire pre-recovery service.Tao Bao2016-02-232-19/+2
* | | | | | | | | | | | | | | | | Merge "Move dumpkey tool to the recovery repo." am: 5197fde242 am: b652678953Mattias Nissler2016-02-263-0/+303
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Move dumpkey tool to the recovery repo." am: 5197fde242Mattias Nissler2016-02-263-0/+303
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Move dumpkey tool to the recovery repo."Mattias Nissler2016-02-263-0/+303
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Move dumpkey tool to the recovery repo."Mattias Nissler2016-02-263-0/+303
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Move dumpkey tool to the recovery repo.Mattias Nissler2016-02-243-0/+303
| | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Move recovery\'s convert_fbe folder to /tmp am: 661f8a69f2Paul Lawrence2016-02-251-4/+7
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Move recovery\'s convert_fbe folder to /tmpPaul Lawrence2016-02-251-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Move recovery's convert_fbe folder to /tmpPaul Lawrence2016-02-251-4/+7
* | | | | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change." into nyc-dev am: 0757a093c1Josh Gao2016-02-240-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change." into nyc-devJosh Gao2016-02-240-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change." into nyc-devJosh Gao2016-02-241-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | minadbd: update for adb_thread_create signature change.Josh Gao2016-02-231-2/+1
| | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | recovery: check battery level before installing package. am: 99281df8e2Yabin Cui2016-02-240-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | recovery: check battery level before installing package.Yabin Cui2016-02-240-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | recovery: check battery level before installing package.Yabin Cui2016-02-233-16/+89
* | | | | | | | | | | | | | | | Merge "Surpress warnings in minzip/Zip.c" am: 4b3cdce702 am: 0d63468171Tianjie Xu2016-02-231-4/+1
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Surpress warnings in minzip/Zip.c" am: 4b3cdce702Tianjie Xu2016-02-231-4/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Surpress warnings in minzip/Zip.c"Tianjie Xu2016-02-231-4/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "Surpress warnings in minzip/Zip.c"Tianjie Xu2016-02-231-4/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Surpress warnings in minzip/Zip.cTianjie Xu2016-02-231-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: 089fe38ac5Yabin Cui2016-02-230-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 am: ae68f02272 am: a3604da6e1Yabin Cui2016-02-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 am: ae68f02272Yabin Cui2016-02-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052Yabin Cui2016-02-230-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219Yabin Cui2016-02-230-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / / / / | | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3Yabin Cui2016-02-230-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|/ / / / / / | | | | | | |/| | | | | | | | | |
| | | | | | * | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47aYabin Cui2016-02-231-15/+54
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|/ / / / / | | | | | | | |/| | | | | | | | |
| | | | | | | * | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29Yabin Cui2016-02-231-15/+54
| | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|_|_|/ / / / | | | | | | | | |/| | | | | | | |
| | | | | | | | * | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69Yabin Cui2016-02-231-15/+54
| | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ Fix integer overflows in recovery procedure.Yabin Cui2016-02-231-15/+54
| | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | |_|_|_|_|/ / / | | | | | | | | | | |/| | | | | | |
| | | | | | | | | | * | | | | | | | Fix integer overflows in recovery procedure.Yabin Cui2016-02-231-15/+54
* | | | | | | | | | | | | | | | | | resolve merge conflicts of e5d3d15cd2 to nyc-dev am: 0d28ba452fYabin Cui2016-02-230-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | resolve merge conflicts of e5d3d15cd2 to nyc-devYabin Cui2016-02-231-15/+52
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | resolve merge conflicts of e5d3d15cd2 to nyc-devYabin Cui2016-02-231-15/+52
| | |\| | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 4f2df162c6Yabin Cui2016-02-231-15/+54
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Fix integer overflows in recovery procedure.Yabin Cui2016-02-231-15/+54
| | | | |\| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Fix integer overflows in recovery procedure.Yabin Cui2016-02-221-15/+54
* | | | | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags" am: ed796b046d am: 24b3622933Tao Bao2016-02-230-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags" am: ed796b046dTao Bao2016-02-2310-121/+242
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags"Tao Bao2016-02-2310-121/+242
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags"Tao Bao2016-02-2310-121/+242
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Control fault injection with config files instead of build flagsJed Estep2016-02-2310-121/+242
* | | | | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags"Jed Estep2016-02-2310-121/+242
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Control fault injection with config files instead of build flagsJed Estep2016-02-2010-121/+242
* | | | | | | | | | | | | | | | | | Merge "recovery: check battery level before installing package." am: 16d0a18514 am: d1b66ad6a1Yabin Cui2016-02-233-16/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "recovery: check battery level before installing package." am: 16d0a18514Yabin Cui2016-02-233-16/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "recovery: check battery level before installing package."Yabin Cui2016-02-233-16/+89
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "recovery: check battery level before installing package."Yabin Cui2016-02-223-16/+89
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | recovery: check battery level before installing package.Yabin Cui2016-02-203-16/+89
* | | | | | | | | | | | | | | | | | Fix verifier test base testdata directory after merge conflict am: e1305768f6Jed Estep2016-02-220-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix verifier test base testdata directory after merge conflictJed Estep2016-02-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fix verifier test base testdata directory after merge conflictJed Estep2016-02-221-1/+1
* | | | | | | | | | | | | | | | | | Merge "Check each value read from block map file."Yabin Cui2016-02-221-15/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Check each value read from block map file.Yabin Cui2016-02-201-15/+31
* | | | | | | | | | | | | | | | | | | Merge "Fix minui cleanup path on error." am: fa9af7dae6 am: af38cd9330Elliott Hughes2016-02-201-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Fix minui cleanup path on error." am: fa9af7dae6Elliott Hughes2016-02-201-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Fix minui cleanup path on error."Elliott Hughes2016-02-201-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Fix minui cleanup path on error."Elliott Hughes2016-02-201-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Fix minui cleanup path on error.Elliott Hughes2016-02-191-3/+3
| | | |/ / / / / / / / / / / / / / /
* | | | / / / / / / / / / / / / / / DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b -s ours am: 52991c4639 -s ours am: a4436f7b25 -s oursTao Bao2016-02-190-0/+0
|\| | | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b -s ours am: 52991c4639 -s oursTao Bao2016-02-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b -s oursTao Bao2016-02-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB.Tao Bao2016-02-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB.Tao Bao2016-02-191-7/+22
| | | |/ / / / / / / / / / / / /
* | | / / / / / / / / / / / / / Fix integer overflows in recovery procedure.Yabin Cui2016-02-182-12/+33
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge commit \'ce46828e08281dc507d4e40ba9e8b770bc21cf0b\' into HEADBill Yi2016-02-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge commit 'ce46828e08281dc507d4e40ba9e8b770bc21cf0b' into HEADBill Yi2016-02-171-12/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "applypatch: Add libimgpatch.pc"Sen Jiang2016-02-171-0/+6
|\| | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "applypatch: Add libimgpatch.pc"Sen Jiang2016-02-171-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | applypatch: Add libimgpatch.pcSen Jiang2016-02-161-0/+6
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change."Josh Gao2016-02-131-2/+1
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change."Josh Gao2016-02-131-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | minadbd: update for adb_thread_create signature change.Josh Gao2016-02-131-2/+1
| | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge "imgdiff: don\'t fail if gzip is corrupted."Sen Jiang2016-02-131-12/+10
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "imgdiff: don't fail if gzip is corrupted."Sen Jiang2016-02-121-12/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | imgdiff: don't fail if gzip is corrupted.Sen Jiang2016-02-121-12/+10
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "applypatch: use vector to store data in FileContents."Yabin Cui2016-02-124-126/+77
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "applypatch: use vector to store data in FileContents."Yabin Cui2016-02-124-126/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | applypatch: use vector to store data in FileContents.Yabin Cui2016-02-124-126/+77
* | | | | | | | | | | | | | Merge "Fix some memory leaks."Yabin Cui2016-02-114-60/+35
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Fix some memory leaks."Yabin Cui2016-02-114-60/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Fix some memory leaks.Yabin Cui2016-02-114-60/+35
* | | | | | | | | | | | | | resolve merge conflicts of 7043206503 to nyc-dev-plus-aosp.Tao Bao2016-02-104-20/+18
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "IO fault injection for OTA packages"Tao Bao2016-02-1010-62/+365
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | IO fault injection for OTA packagesJed Estep2016-02-1010-62/+365
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "applypatch: Add a Makefile to build imgdiff in Chrome OS."Sen Jiang2016-02-106-4/+39
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "applypatch: Add a Makefile to build imgdiff in Chrome OS."Sen Jiang2016-02-106-4/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | applypatch: Add a Makefile to build imgdiff in Chrome OS.Sen Jiang2016-02-106-4/+39
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "verifier_test: Suppress the unused parameter warnings."Tao Bao2016-02-091-8/+9
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "verifier_test: Suppress the unused parameter warnings."Tao Bao2016-02-091-8/+9
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | verifier_test: Suppress the unused parameter warnings.Tao Bao2016-02-051-8/+9
* | | | | | | | | | | | | | Merge "Change on-device directory for recovery test data"Tao Bao2016-02-082-2/+2
|\| | | | | | | | | | | | | | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Change on-device directory for recovery test data"Tao Bao2016-02-082-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Change on-device directory for recovery test dataJed Estep2016-02-052-2/+2
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | resolve merge conflicts of 715d8a203a to master.Yabin Cui2016-02-067-303/+204
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Merge "applypatch: fix memory leaks reported by static analysis."Yabin Cui2016-02-057-303/+202
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "applypatch: fix memory leaks reported by static analysis."Yabin Cui2016-02-057-303/+202
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | applypatch: fix memory leaks reported by static analysis.Yabin Cui2016-02-057-303/+202
* | | | | | | | | | | | | | Merge "Refactor existing tests to use gtest" am: 38b02cc6a0Tao Bao2016-02-0525-215/+145
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Refactor existing tests to use gtest"Tao Bao2016-02-0525-215/+145
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Refactor existing tests to use gtest"Tao Bao2016-02-0525-215/+145
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Refactor existing tests to use gtestJed Estep2016-02-0425-215/+145
* | | | | | | | | | | | | | | Merge "updater: fix memory leak based on static analysis." am: e50d447692Yabin Cui2016-02-051-44/+39
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "updater: fix memory leak based on static analysis."Yabin Cui2016-02-051-44/+39
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "updater: fix memory leak based on static analysis."Yabin Cui2016-02-051-44/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | updater: fix memory leak based on static analysis.Yabin Cui2016-02-041-44/+39
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | resolve merge conflicts of 7b6027dde4 to master.Tao Bao2016-02-0410-61/+59
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Switch from mincrypt to BoringSSL in applypatch and updater."Tao Bao2016-02-0410-61/+59
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Switch from mincrypt to BoringSSL in applypatch and updater."Tao Bao2016-02-0410-61/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Switch from mincrypt to BoringSSL in applypatch and updater.Sen Jiang2016-02-0410-61/+59
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge "uncrypt: add options to setup bcb and clear bcb." am: e3434279c8Yabin Cui2016-02-032-104/+198
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "uncrypt: add options to setup bcb and clear bcb."Yabin Cui2016-02-032-104/+198
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "uncrypt: add options to setup bcb and clear bcb."Yabin Cui2016-02-032-104/+198
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | uncrypt: add options to setup bcb and clear bcb.Yabin Cui2016-02-032-104/+198
* | | | | | | | | | | | | | Merge "recovery: Refactor verifier and verifier_test." am: 351ddbbc0aTao Bao2016-02-034-193/+168
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "recovery: Refactor verifier and verifier_test."Tao Bao2016-02-034-193/+168
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "recovery: Refactor verifier and verifier_test."Tao Bao2016-02-034-193/+168
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | recovery: Refactor verifier and verifier_test.Tao Bao2016-02-034-193/+168
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge "uncrypt: generate map file by renaming tmp file." am: 4c07a7ec05Yabin Cui2016-02-021-75/+93
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "uncrypt: generate map file by renaming tmp file."Yabin Cui2016-02-021-75/+93
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "uncrypt: generate map file by renaming tmp file."Yabin Cui2016-02-021-75/+93
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | uncrypt: generate map file by renaming tmp file.Yabin Cui2016-02-011-75/+93
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge "Fix build." am: 9d72d4175bTao Bao2016-01-291-0/+2
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Fix build."Tao Bao2016-01-291-0/+2
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Fix build."Tao Bao2016-01-291-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix build.Tao Bao2016-01-291-0/+2
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | resolve merge conflicts of 725833e024 to master.Tao Bao2016-01-294-2/+69
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "applypatch: Compile libimgpatch for target and host."Sen Jiang2016-01-294-2/+69
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "applypatch: Compile libimgpatch for target and host."Sen Jiang2016-01-294-2/+69
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | applypatch: Compile libimgpatch for target and host.Sen Jiang2016-01-284-2/+69
* | | | | | | | | | | | | | Merge "edify: accept long string literal." am: d379b4410bYabin Cui2016-01-282-13/+16
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "edify: accept long string literal."Yabin Cui2016-01-282-13/+16
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "edify: accept long string literal."Yabin Cui2016-01-282-13/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | edify: accept long string literal.Yabin Cui2016-01-272-13/+16
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge "Change BCB to perform synchronous writes." am: 5797bf9c90Tao Bao2016-01-221-59/+74
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Change BCB to perform synchronous writes."Tao Bao2016-01-221-59/+74
| |\| | | | | | | | | | | | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge "Change BCB to perform synchronous writes."Tao Bao2016-01-221-59/+74
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Change BCB to perform synchronous writes.Tao Bao2016-01-211-59/+74
| | |/ / / / / / / / / /
* | | | | | | | | | | | Merge "recovery: Fork a process for fuse when sideloading from SD card." am: 37e3c71da3Tao Bao2016-01-143-69/+69
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "recovery: Fork a process for fuse when sideloading from SD card."Tao Bao2016-01-143-69/+69
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "recovery: Fork a process for fuse when sideloading from SD card."Tao Bao2016-01-143-69/+69
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | recovery: Fork a process for fuse when sideloading from SD card.Tao Bao2016-01-143-69/+69
* | | | | | | | | | | | | Merge "uncrypt: avoid use-after-free" am: 0305fcecc5Tao Bao2016-01-141-3/+4
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "uncrypt: avoid use-after-free"Tao Bao2016-01-141-3/+4
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "uncrypt: avoid use-after-free"Tao Bao2016-01-141-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | uncrypt: avoid use-after-freeDaniel Micay2016-01-121-3/+4
* | | | | | | | | | | | | Revert "Byte swap to support BGRA in recovery mode" am: a5d5082222 am: 40cce13094Andriy Naborskyy2016-01-131-12/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Revert "Byte swap to support BGRA in recovery mode" am: a5d5082222Andriy Naborskyy2016-01-121-12/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Revert "Byte swap to support BGRA in recovery mode"Andriy Naborskyy2016-01-121-12/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Revert "Byte swap to support BGRA in recovery mode"Andriy Naborskyy2016-01-081-12/+0
* | | | | | | | | | | | | | Merge "Rename .l/.y to .ll/.yy" am: ab9db5284eYing Wang2016-01-130-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Rename .l/.y to .ll/.yy"Ying Wang2016-01-123-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Rename .l/.y to .ll/.yy"Ying Wang2016-01-123-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Rename .l/.y to .ll/.yyYing Wang2016-01-123-2/+2
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Rename .l/.y to .ll/.yyYing Wang2016-01-133-2/+2
* | | | | | | | | | | | | Merge "IO fault injection for OTA packages"Jed Estep2016-01-0910-45/+348
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | IO fault injection for OTA packagesJed Estep2016-01-0610-45/+348
* | | | | | | | | | | | | | Merge "updater: Add a function to check first block" am: 6f8b9b60dbTianjie Xu2016-01-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "updater: Add a function to check first block"Tianjie Xu2016-01-082-0/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "updater: Add a function to check first block"Tianjie Xu2016-01-082-0/+58
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | updater: Add a function to check first blockTianjie Xu2016-01-072-0/+58
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "updater: Add a function to check first block"Tianjie Xu2016-01-072-0/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | updater: Add a function to check first blockTianjie Xu2015-12-182-0/+58
* | | | | | | | | | | | | | Merge "imgdiff: skip spurious gzip headers in image files" am: 8e150a5b24David Riley2016-01-041-6/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "imgdiff: skip spurious gzip headers in image files"David Riley2016-01-041-6/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "imgdiff: skip spurious gzip headers in image files"David Riley2016-01-041-6/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | imgdiff: skip spurious gzip headers in image filesDavid Riley2015-12-231-6/+13
| | |/ / / / / / / / / / / /
* | | / / / / / / / / / / / Merge "res: Embed FPS into icon_installing.png." am: 29b0fbe160Tao Bao2015-12-1812-42/+82
|\| | | | | | | | | | | | | | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "res: Embed FPS into icon_installing.png."Tao Bao2015-12-1812-42/+82
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "res: Embed FPS into icon_installing.png."Tao Bao2015-12-1812-42/+82
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | res: Embed FPS into icon_installing.png.Tao Bao2015-12-1612-42/+82
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge "updater: Use O_SYNC and fsync() for package_extract_file()." am: 4e72d1a81eTao Bao2015-12-151-6/+13
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "updater: Use O_SYNC and fsync() for package_extract_file()."Tao Bao2015-12-151-6/+13
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "updater: Use O_SYNC and fsync() for package_extract_file()."Tao Bao2015-12-151-6/+13
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | updater: Use O_SYNC and fsync() for package_extract_file().Tao Bao2015-12-151-6/+13
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge "update_verifier: Track the API change for isSlotBootable()." am: e062645efaTao Bao2015-12-111-5/+6
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "update_verifier: Track the API change for isSlotBootable()."Tao Bao2015-12-111-5/+6
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "update_verifier: Track the API change for isSlotBootable()."Tao Bao2015-12-111-5/+6
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | update_verifier: Track the API change for isSlotBootable().Tao Bao2015-12-091-5/+6
* | | | | | | | | | | | | | Merge "uncrypt: Suppress the compiler warnings on LP64." am: ca18526760Tao Bao2015-12-111-10/+12
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "uncrypt: Suppress the compiler warnings on LP64."Tao Bao2015-12-111-10/+12
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "uncrypt: Suppress the compiler warnings on LP64."Tao Bao2015-12-111-10/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | uncrypt: Suppress the compiler warnings on LP64.Tao Bao2015-12-091-10/+12
| | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | Merge "updater: Output msg when recovery is called" am: 32f6298742Tianjie Xu2015-12-110-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "updater: Output msg when recovery is called"Tianjie Xu2015-12-111-1/+4
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "updater: Output msg when recovery is called"Tianjie Xu2015-12-111-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | updater: Output msg when recovery is calledTianjie Xu2015-12-111-1/+4
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge "updater: Output msg when recovery is called"Tianjie Xu2015-12-111-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | updater: Output msg when recovery is calledTianjie Xu2015-12-101-1/+4
* | | | | | | | | | | | | | Merge changes If00669a7,Ia5504ed2 am: ddde4676b6Tao Bao2015-12-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge changes If00669a7,Ia5504ed2Tao Bao2015-12-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge changes If00669a7,Ia5504ed2Tao Bao2015-12-083-0/+105
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | update_verifier: Log to logd instead of kernel log.Tao Bao2015-12-082-12/+8
| | | * | | | | | | | | | | | Add update_verifier for A/B OTA update.Tao Bao2015-12-083-0/+109
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "updater: Replace strtok() with android::base::Split()." am: d0acbb56edTao Bao2015-12-081-133/+144
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "updater: Replace strtok() with android::base::Split()."Tao Bao2015-12-081-133/+144
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "updater: Replace strtok() with android::base::Split()."Tao Bao2015-12-081-133/+144
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | updater: Replace strtok() with android::base::Split().Tao Bao2015-12-071-133/+144
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | update_verifier: Log to logd instead of kernel log. am: 45eac58ef1Tao Bao2015-12-082-12/+8
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | update_verifier: Log to logd instead of kernel log.Tao Bao2015-12-082-12/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | update_verifier: Log to logd instead of kernel log.Tao Bao2015-12-082-12/+8
* | | | | | | | | | | | | | Add update_verifier for A/B OTA update. am: 1171d3a12bTao Bao2015-12-083-0/+109
|\| | | | | | | | | | | | | | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add update_verifier for A/B OTA update.Tao Bao2015-12-083-0/+109
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Add update_verifier for A/B OTA update.Tao Bao2015-12-073-0/+109
* | | | | | | | | | | | | Merge "Track rename from base/ to android-base/." am: 06ca938ce2Elliott Hughes2015-12-057-13/+13
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Track rename from base/ to android-base/."Elliott Hughes2015-12-057-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Track rename from base/ to android-base/."Elliott Hughes2015-12-057-13/+13
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Track rename from base/ to android-base/.Elliott Hughes2015-12-057-13/+13
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge "Remove the building rules for applypatch_static." am: fc23a50cefTao Bao2015-12-051-13/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Remove the building rules for applypatch_static."Tao Bao2015-12-031-13/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Remove the building rules for applypatch_static."Tao Bao2015-12-021-13/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Remove the building rules for applypatch_static.Tao Bao2015-12-021-13/+0
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge "Track name change from adb_main to adb_server_main." am: ee5c87eea7Elliott Hughes2015-11-202-2/+2
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Track name change from adb_main to adb_server_main."Elliott Hughes2015-11-202-2/+2
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Track name change from adb_main to adb_server_main."Elliott Hughes2015-11-202-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Track name change from adb_main to adb_server_main.Elliott Hughes2015-11-202-2/+2
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Add slot_suffix field to struct bootloader_message. am: 846c094feeDavid Zeuthen2015-11-200-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Add slot_suffix field to struct bootloader_message.David Zeuthen2015-11-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Add slot_suffix field to struct bootloader_message.David Zeuthen2015-11-161-1/+9
* | | | | | | | | | | | | Merge commit \'8f90389966fabf532b24741d49245215279533e1\' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-200-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge commit '8f90389966fabf532b24741d49245215279533e1' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-190-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | recovery: Allow "Mount /system" for system_root_image.Tao Bao2015-11-163-19/+39
* | | | | | | | | | | | | Merge commit \'32ac97675bade3681203c46d001f76b11a359fd5\' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-200-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge commit '32ac97675bade3681203c46d001f76b11a359fd5' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-190-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | applypatch: Fix the checking in WriteToPartition().Tao Bao2015-11-161-3/+4
* | | | | | | | | | | | | Merge commit \'f47259b18492c921445d9e437a9f9ed11c52fac6\' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-200-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge commit 'f47259b18492c921445d9e437a9f9ed11c52fac6' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-190-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | applypatch: Support flash mode.Tao Bao2015-11-163-16/+97
* | | | | | | | | | | | | Merge commit \'3b199267d6d4c279cbef3286a74e16bf92dd8d8a\' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-200-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge commit '3b199267d6d4c279cbef3286a74e16bf92dd8d8a' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-190-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | updater: libapplypatch needs libbase now.Tao Bao2015-11-161-1/+1
* | | | | | | | | | | | | Merge commit \'27604fcbee0010b800bfc16b5bf7a48c365c2cf3\' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-200-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge commit '27604fcbee0010b800bfc16b5bf7a48c365c2cf3' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-190-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | applypatch: Refactor strtok().Tao Bao2015-11-162-86/+56
* | | | | | | | | | | | | DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp. am: 818fa781d1 -s oursTao Bao2015-11-190-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp.Tao Bao2015-11-190-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp.Tao Bao2015-11-1615-300/+304
* | | | | | | | | | | | | Add error and range checks to parse_range am: 806f72f9e6 -s oursSami Tolvanen2015-11-190-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Add error and range checks to parse_rangeSami Tolvanen2015-11-190-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Add error and range checks to parse_rangeSami Tolvanen2015-11-161-10/+71
* | | | | | | | | | | | | Stop using libstdc++. am: 56deefba73 -s oursDan Albert2015-11-190-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Stop using libstdc++.Dan Albert2015-11-190-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Stop using libstdc++.Dan Albert2015-11-163-5/+3
* | | | | | | | | | | | | recovery: Switch to clang am: 7101b2e285 -s oursTao Bao2015-11-190-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | recovery: Switch to clangTao Bao2015-11-190-0/+0
| |\| | | | | | | | | | | | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | recovery: Switch to clangTao Bao2015-11-1613-11/+38
| | |/ / / / / / / / /
* | | | | | | | | | | Merge "Create convert_fbe breadcrumb file to support conversion to FBE"Paul Lawrence2015-11-133-3/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Create convert_fbe breadcrumb file to support conversion to FBEPaul Lawrence2015-11-133-3/+35
* | | | | | | | | | | | Merge "We can use fclose directly in std::unique_ptr."Elliott Hughes2015-11-132-16/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / /
| * | | | | | | | | | Merge "We can use fclose directly in std::unique_ptr."Elliott Hughes2015-11-132-16/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | We can use fclose directly in std::unique_ptr.Elliott Hughes2015-11-132-16/+5
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "uncrypt: remove O_SYNC to avoid time-out failures"Tao Bao2015-11-051-1/+1
|\| | | | | | | | | |
| * | | | | | | | | | Merge "uncrypt: remove O_SYNC to avoid time-out failures"Tao Bao2015-11-051-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | uncrypt: remove O_SYNC to avoid time-out failuresJaegeuk Kim2015-11-041-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "recovery: Depend on mkfs.f2fs only if needed." am: a412198699Tao Bao2015-10-281-0/+2
|\| | | | | | | | | |
| * | | | | | | | | | Merge "recovery: Depend on mkfs.f2fs only if needed."Tao Bao2015-10-281-0/+2
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge "recovery: Depend on mkfs.f2fs only if needed."Tao Bao2015-10-281-0/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | recovery: Depend on mkfs.f2fs only if needed.Tao Bao2015-10-281-0/+2
| | |/ / / / / / / / / /
* | | | | | | | | | | | Merge "updater: Bump up the BBOTA version to 4." am: f204185f71Tao Bao2015-10-231-1/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "updater: Bump up the BBOTA version to 4."Tao Bao2015-10-231-1/+1
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "updater: Bump up the BBOTA version to 4."Tao Bao2015-10-231-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | updater: Bump up the BBOTA version to 4.Tao Bao2015-10-231-1/+1
| | |/ / / / / / / / / /
* | | | | | | | | | | | am 339ec2ef: am 78615fa5: Merge "Error correction: Use libfec in blockimg.cpp for recovery"Sami Tolvanen2015-10-192-1/+78
|\| | | | | | | | | | |
| * | | | | | | | | | | am 78615fa5: Merge "Error correction: Use libfec in blockimg.cpp for recovery"Sami Tolvanen2015-10-192-1/+78
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Error correction: Use libfec in blockimg.cpp for recovery"Sami Tolvanen2015-10-192-1/+78
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Error correction: Use libfec in blockimg.cpp for recoverySami Tolvanen2015-10-192-1/+78
| | |/ / / / / / / / / /
* | | | | | | | | | | | am 4c6c96a5: am 245b2da1: am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file."Tao Bao2015-10-011-0/+4
|\| | | | | | | | | | |
| * | | | | | | | | | | am 245b2da1: am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file."Tao Bao2015-10-011-0/+4
| |\| | | | | | | | | |
| | * | | | | | | | | | am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file."Tao Bao2015-10-011-0/+4
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge "updater: Skip empty lines in the transfer list file."Tao Bao2015-10-011-0/+4
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | updater: Skip empty lines in the transfer list file.Tao Bao2015-09-261-0/+4
* | | | | | | | | | | | | | am 6eb2668d: am aa59a989: am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread."Yabin Cui2015-09-301-2/+4
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | am aa59a989: am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread."Yabin Cui2015-09-301-2/+4
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread."Yabin Cui2015-09-301-2/+4
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "minadbd: use strdup() to create argument for sideload thread."Yabin Cui2015-09-301-2/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | minadbd: use strdup() to create argument for sideload thread.Yabin Cui2015-09-301-2/+4
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am d7156748: am f61eec3e: am 2bdac629: Merge changes Ic769eafc,I63f28b3bTao Bao2015-09-253-57/+42
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am f61eec3e: am 2bdac629: Merge changes Ic769eafc,I63f28b3bTao Bao2015-09-253-57/+42
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am 2bdac629: Merge changes Ic769eafc,I63f28b3bTao Bao2015-09-253-57/+42
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge changes Ic769eafc,I63f28b3bTao Bao2015-09-253-57/+42
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | updater: Use android::base::ParseInt() to parse integers.Tao Bao2015-09-242-52/+37
| | | | * | | | | | | | | | Suppress some compiler warnings due to signedness.Tao Bao2015-09-242-5/+5
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am 7c7d876d: am f7319f4d: am 3317d501: Merge "minadbd: move from D() to VLOG()."Yabin Cui2015-09-242-5/+2
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am f7319f4d: am 3317d501: Merge "minadbd: move from D() to VLOG()."Yabin Cui2015-09-242-5/+2
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am 3317d501: Merge "minadbd: move from D() to VLOG()."Yabin Cui2015-09-242-5/+2
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "minadbd: move from D() to VLOG()."Yabin Cui2015-09-242-5/+2
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | minadbd: move from D() to VLOG().Yabin Cui2015-09-242-5/+2
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am c66b9ead: am cd3c8c4e: am b739a32b: Merge "recovery: Add timestamps in update logs."Tao Bao2015-09-181-16/+98
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am cd3c8c4e: am b739a32b: Merge "recovery: Add timestamps in update logs."Tao Bao2015-09-181-16/+98
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am b739a32b: Merge "recovery: Add timestamps in update logs."Tao Bao2015-09-181-16/+98
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "recovery: Add timestamps in update logs."Tao Bao2015-09-181-16/+98
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | recovery: Add timestamps in update logs.Tao Bao2015-09-171-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 MERGENarayan Kamath2015-09-170-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 MERGENarayan Kamath2015-09-170-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 MERGENarayan Kamath2015-09-170-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 MERGENarayan Kamath2015-09-170-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 MERGENarayan Kamath2015-09-170-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / | | | | | |/| | | | | | |
| | | | | * | | | | | | | am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-170-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / | | | | | | |/| | | | | |
| | | | | | * | | | | | | am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-170-0/+0
| | | | | | |\ \ \ \ \ \ \ | | | | | | | | |_|/ / / / | | | | | | | |/| | | | |
| | | | | | | * | | | | | am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-120-0/+0
| | | | | | | |\ \ \ \ \ \ | | | | | | | | | |_|/ / / | | | | | | | | |/| | | |
| | | | | | | | * | | | | am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-100-0/+0
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | |_|/ / | | | | | | | | | |/| | |
| | | | | | | | | * | | | am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-101-0/+1
| | | | | | | | | |\ \ \ \ | | | | | | | | | | | |_|/ | | | | | | | | | | |/| |
| | | | | | | | | | * | | Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-091-0/+1
* | | | | | | | | | | | | am 6e9f726f: am f66e08a2: am a42a322d: Merge "updater: Manage buffers with std::vector."Tao Bao2015-09-161-228/+168
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am f66e08a2: am a42a322d: Merge "updater: Manage buffers with std::vector."Tao Bao2015-09-161-228/+168
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am a42a322d: Merge "updater: Manage buffers with std::vector."Tao Bao2015-09-161-228/+168
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "updater: Manage buffers with std::vector."Tao Bao2015-09-161-228/+168
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | updater: Manage buffers with std::vector.Tao Bao2015-09-101-228/+168
* | | | | | | | | | | | | | am cd3a68ce: am 49a49e4f: am ee17242f: Merge "minadbd: update service_to_fd() signature."David Pursell2015-09-141-1/+1
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | am 49a49e4f: am ee17242f: Merge "minadbd: update service_to_fd() signature."David Pursell2015-09-141-1/+1
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | am ee17242f: Merge "minadbd: update service_to_fd() signature."David Pursell2015-09-141-1/+1
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "minadbd: update service_to_fd() signature."David Pursell2015-09-141-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | minadbd: update service_to_fd() signature.David Pursell2015-09-041-1/+1
* | | | | | | | | | | | | | | am 8b2dcfb1: am 60524198: am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."Tao Bao2015-09-122-4/+1
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 60524198: am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."Tao Bao2015-09-122-4/+1
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."Tao Bao2015-09-122-4/+1
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "recovery: Remove redirect_stdio() when calling ShowFile()."Tao Bao2015-09-122-4/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | recovery: Remove redirect_stdio() when calling ShowFile().Tao Bao2015-09-102-4/+1
| | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | am 7c3d09c2: am 0cf19d9b: am 7a677807: Merge "updater: Fix the line breaks in ui_print commands."Tao Bao2015-09-101-26/+32
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 0cf19d9b: am 7a677807: Merge "updater: Fix the line breaks in ui_print commands."Tao Bao2015-09-101-26/+32
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | am 7a677807: Merge "updater: Fix the line breaks in ui_print commands."Tao Bao2015-09-101-26/+32
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "updater: Fix the line breaks in ui_print commands."Tao Bao2015-09-101-26/+32
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | updater: Fix the line breaks in ui_print commands.Tao Bao2015-09-101-26/+32
| | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | am 272d268c: am 50828f58: am e520f1d4: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."Tao Bao2015-09-091-29/+26
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | am 50828f58: am e520f1d4: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."Tao Bao2015-09-091-29/+26
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | am e520f1d4: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."Tao Bao2015-09-091-29/+26
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."Tao Bao2015-09-091-29/+26
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.Tao Bao2015-09-081-29/+26
| | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | am d4547c1d: am e5571a0f: am 585a50ce: Merge "imgdiff: fix file descriptor leak"Tao Bao2015-09-081-1/+9
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | am e5571a0f: am 585a50ce: Merge "imgdiff: fix file descriptor leak"Tao Bao2015-09-081-1/+9
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | am 585a50ce: Merge "imgdiff: fix file descriptor leak"Tao Bao2015-09-081-1/+9
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "imgdiff: fix file descriptor leak"Tao Bao2015-09-081-1/+9
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | imgdiff: fix file descriptor leakJeremy Compostella2015-09-081-1/+9
| | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | am 1e8e6a83: am cf11a160: am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc"Tom Cherry2015-09-042-0/+11
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | am cf11a160: am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc"Tom Cherry2015-09-042-0/+11
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc"Tom Cherry2015-09-042-0/+11
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "move uncrypt from init.rc to uncrypt.rc"Tom Cherry2015-09-042-0/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | move uncrypt from init.rc to uncrypt.rcTom Cherry2015-09-042-0/+11
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am 834c92b7: am 8e9c6801: recovery: Fix the bug that truncates menu entries.Tao Bao2015-09-031-1/+6
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 8e9c6801: recovery: Fix the bug that truncates menu entries.Tao Bao2015-09-031-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | recovery: Fix the bug that truncates menu entries.Tao Bao2015-09-021-1/+6
* | | | | | | | | | | | | am ceb81e49: am 1b3195cb: am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message."David Zeuthen2015-09-031-1/+9
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 1b3195cb: am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message."David Zeuthen2015-09-031-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message."David Zeuthen2015-09-031-1/+9
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Add slot_suffix field to struct bootloader_message."David Zeuthen2015-09-031-1/+9
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Add slot_suffix field to struct bootloader_message.David Zeuthen2015-09-021-1/+9
* | | | | | | | | | | | | | am 31dde162: am 6f1f2062: am 6997c287: Merge "updater: Clean up C codes."Tao Bao2015-09-031-602/+429
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | am 6f1f2062: am 6997c287: Merge "updater: Clean up C codes."Tao Bao2015-09-031-602/+429
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | am 6997c287: Merge "updater: Clean up C codes."Tao Bao2015-09-031-602/+429
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "updater: Clean up C codes."Tao Bao2015-09-021-602/+429
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | updater: Clean up C codes.Tao Bao2015-09-011-602/+429
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am d845a2d1: am 73468ee8: (-s ours) am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 73468ee8: (-s ours) am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."Tao Bao2015-08-261-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 Bao2015-08-270-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | am 304c65b8: (-s ours) am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"Tao Bao2015-08-261-46/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | am 1a42ebc1: am 822685a8: (-s ours) am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 822685a8: (-s ours) am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."Tao Bao2015-08-215-37/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | am b13fe892: am a9a50fef: (-s ours) am 4854e292: am ad509fd4: Merge "Fix potential crash"Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am a9a50fef: (-s ours) am 4854e292: am ad509fd4: Merge "Fix potential crash"Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am 4854e292: am ad509fd4: Merge "Fix potential crash"Tao Bao2015-08-111-5/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | am dffdd5eb: am 06e6ccb9: (-s ours) am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 06e6ccb9: (-s ours) am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."Tao Bao2015-08-103-16/+91
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | am 85afda17: am b65a9023: (-s ours) am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am b65a9023: (-s ours) am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."Tao Bao2015-08-105-288/+185
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | am 85a77d2a: am c2e91625: (-s ours) am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."Dan Albert2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am c2e91625: (-s ours) am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."Dan Albert2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."Dan Albert2015-08-081-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | am 34fa6d38: am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build."Elliott Hughes2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build."Elliott Hughes2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | am a9390df6: am 06689dc5: Merge "Fix recovery image build."Elliott Hughes2015-08-072-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | am 371ab905: am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aospTao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aospTao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | resolved conflicts for merge of be19dce8 to mnc-dev-plus-aospTao Bao2015-08-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | am ea5d8f0a: am 0e2efab3: (-s ours) am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | am 0e2efab3: (-s ours) am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."Tao Bao2015-08-041-0/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | am 3fd097f8: am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."Tao Bao2015-07-313-19/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | am 77de4783: am f3f27990: (-s ours) am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | am f3f27990: (-s ours) am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."Tao Bao2015-07-281-6/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | am 05c4b53e: am cb0e7f2d: (-s ours) am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am cb0e7f2d: (-s ours) am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."Tao Bao2015-07-251-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | am f6bebbd7: am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."Tao Bao2015-07-243-16/+97
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | am d37f91d1: am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."Tao Bao2015-07-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | am c73e18f0: am 7665d443: (-s ours) am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 7665d443: (-s ours) am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."Tao Bao2015-07-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am f075f9a1: am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."Tao Bao2015-07-242-86/+56
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ca66fc1c: am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."Tao Bao2015-07-245-29/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d33e21a7: am 0e7368a5: (-s ours) am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0e7368a5: (-s ours) am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."Tao Bao2015-07-173-20/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 9da33c67: am 3231c7ca: (-s ours) am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3231c7ca: (-s ours) am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."Tao Bao2015-07-1515-300/+304
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f0e341b4: am 5391dfdb: (-s ours) am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5391dfdb: (-s ours) am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""Tao Bao2015-07-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3ac4765a: am 1915dd56: (-s ours) am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-devPaul Lawrence2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1915dd56: (-s ours) am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-devPaul Lawrence2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-devPaul Lawrence2015-07-071-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b3f4921c: am 2fc4d435: (-s ours) am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2fc4d435: (-s ours) am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"Tao Bao2015-07-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 04d9b850: am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-devPaul Lawrence2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-devPaul Lawrence2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-devPaul Lawrence2015-07-061-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 165c6ad3: am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."Tao Bao2015-08-261-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."Tao Bao2015-08-261-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."Tao Bao2015-08-261-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | / / / / / / / / / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove the unused isunresumable in SaveStash()."Tao Bao2015-08-261-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Remove the unused isunresumable in SaveStash().Tao Bao2015-08-261-3/+3
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1a3ccc88: am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"Tao Bao2015-08-261-46/+48
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"Tao Bao2015-08-261-46/+48
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"Tao Bao2015-08-261-46/+48
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"Tao Bao2015-08-261-46/+48
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GOOGLEGMS-749 Fix integer overflow while applying block based OTA packageShrinivas Sahukar2015-08-221-46/+48
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ba781587: am 337db14f: recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.Tao Bao2015-08-253-0/+788
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 337db14f: recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.Tao Bao2015-08-253-0/+788
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.Tao Bao2015-08-253-0/+788
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f0355aeb: am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."Tao Bao2015-08-215-37/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."Tao Bao2015-08-215-37/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 93fa4b67: Merge "edify: Switch to C++."Tao Bao2015-08-215-37/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | / / / / / / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Switch to C++."Tao Bao2015-08-215-37/+27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | edify: Switch to C++.Tao Bao2015-08-205-37/+27
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e57ca0ec: am 4854e292: am ad509fd4: Merge "Fix potential crash"Tao Bao2015-08-111-5/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4854e292: am ad509fd4: Merge "Fix potential crash"Tao Bao2015-08-111-5/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ad509fd4: Merge "Fix potential crash"Tao Bao2015-08-111-5/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix potential crash"Tao Bao2015-08-111-5/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix potential crashJeremy Compostella2015-08-051-5/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0d42440e: am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."Tao Bao2015-08-103-16/+91
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."Tao Bao2015-08-103-16/+91
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."Tao Bao2015-08-103-16/+91
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use unique_ptr and unique_fd to manager FDs."Tao Bao2015-08-103-16/+91
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Use unique_ptr and unique_fd to manager FDs.Tao Bao2015-08-103-16/+91
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 36ca3800: am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."Tao Bao2015-08-105-288/+185
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."Tao Bao2015-08-105-288/+185
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7c511184: Merge "updater: Clean up char* with std::string."Tao Bao2015-08-105-288/+185
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up char* with std::string."Tao Bao2015-08-105-288/+185
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Clean up char* with std::string.Tao Bao2015-08-065-288/+185
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f2a23a94: am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."Dan Albert2015-08-081-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."Dan Albert2015-08-081-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."Dan Albert2015-08-081-4/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use CPPFLAGS instead of CFLAGS."Dan Albert2015-08-081-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Use CPPFLAGS instead of CFLAGS.Dan Albert2015-08-081-4/+4
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2496489c: am a9390df6: am 06689dc5: Merge "Fix recovery image build."Elliott Hughes2015-08-082-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a9390df6: am 06689dc5: Merge "Fix recovery image build."Elliott Hughes2015-08-072-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 06689dc5: Merge "Fix recovery image build."Elliott Hughes2015-08-072-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix recovery image build."Elliott Hughes2015-08-072-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Fix recovery image build.Elliott Hughes2015-08-072-2/+2
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am 68e77434: resolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aospTao Bao2015-08-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aospTao Bao2015-08-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am be19dce8: udpater: Call fsync() after rename().Tao Bao2015-08-041-0/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | udpater: Call fsync() after rename().Tao Bao2015-08-041-0/+20
| | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | am ddbfdf79: am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."Tao Bao2015-08-041-0/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."Tao Bao2015-08-041-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | am 27c1ab20: Merge "udpater: Call fsync() after rename()."Tao Bao2015-08-041-0/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | / / / / / / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "udpater: Call fsync() after rename()."Tao Bao2015-08-041-0/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | udpater: Call fsync() after rename().Tao Bao2015-08-041-0/+20
| | | |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | am 414c576c: am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."Tao Bao2015-08-013-19/+39
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."Tao Bao2015-08-013-19/+39
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."Tao Bao2015-07-313-19/+39
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Allow "Mount /system" for system_root_image."Tao Bao2015-07-313-19/+39
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | recovery: Allow "Mount /system" for system_root_image.Tao Bao2015-07-313-19/+39
| | | |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | am 7d71725d: am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."Tao Bao2015-07-281-6/+5
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."Tao Bao2015-07-281-6/+5
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | am 62e19231: Merge "updater: Hoist fsync() to outer loop."Tao Bao2015-07-281-6/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Hoist fsync() to outer loop."Tao Bao2015-07-281-6/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | updater: Hoist fsync() to outer loop.Tao Bao2015-07-271-6/+5
| | | |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | am 4b3ad009: am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."Tao Bao2015-07-251-3/+4
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."Tao Bao2015-07-251-3/+4
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."Tao Bao2015-07-251-3/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the checking in WriteToPartition()."Tao Bao2015-07-251-3/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | applypatch: Fix the checking in WriteToPartition().Tao Bao2015-07-251-3/+4
| | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | am 6a06034d: am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."Tao Bao2015-07-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."Tao Bao2015-07-243-16/+97
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | am dd738c11: Merge "applypatch: Support flash mode."Tao Bao2015-07-243-16/+97
| | |\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "applypatch: Support flash mode."Tao Bao2015-07-243-16/+97
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | applypatch: Support flash mode.Tao Bao2015-07-243-16/+97
* | | | | | | | | | | | | | | | | | | | | | am e657f0fb: am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."Tao Bao2015-07-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."Tao Bao2015-07-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | am afb8f320: Merge "uncrypt: Support file level encryption."Tao Bao2015-07-241-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "uncrypt: Support file level encryption."Tao Bao2015-07-241-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | uncrypt: Support file level encryption.Tao Bao2015-07-241-1/+1
| | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am 3f640620: am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."Tao Bao2015-07-240-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."Tao Bao2015-07-241-1/+1
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | am cc3c3414: Merge "updater: libapplypatch needs libbase now."Tao Bao2015-07-241-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "updater: libapplypatch needs libbase now."Tao Bao2015-07-241-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | updater: libapplypatch needs libbase now.Tao Bao2015-07-241-1/+1
* | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 49a24460 to masterTao Bao2015-07-240-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."Tao Bao2015-07-242-86/+56
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | am cfd9d9c7: Merge "applypatch: Refactor strtok()."Tao Bao2015-07-242-86/+56
| | |\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "applypatch: Refactor strtok()."Tao Bao2015-07-242-86/+56
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | applypatch: Refactor strtok().Tao Bao2015-07-242-86/+56
| | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | am 052796ea: am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."Tao Bao2015-07-240-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."Tao Bao2015-07-240-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 85090d0c: Merge "recovery: Switch fuse_* to C++."Tao Bao2015-07-205-29/+14
| | |\| | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "recovery: Switch fuse_* to C++."Tao Bao2015-07-205-29/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | recovery: Switch fuse_* to C++.Tao Bao2015-07-205-29/+14
| | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am 0d4e0026: recovery: Switch fuse_* to C++.Tao Bao2015-07-245-29/+14
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | recovery: Switch fuse_* to C++.Tao Bao2015-07-245-29/+14
* | | | | | | | | | | | | | | | | applypatch: Support flash mode.Tao Bao2015-07-223-16/+97
* | | | | | | | | | | | | | | | | Merge "updater: libapplypatch needs libbase now."Tao Bao2015-07-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | updater: libapplypatch needs libbase now.Tao Bao2015-07-171-1/+1
* | | | | | | | | | | | | | | | | | applypatch: Refactor strtok().Tao Bao2015-07-172-86/+56
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am f2c4e4ce: am 6e9dda70: uncrypt: Support file level encryption.Tao Bao2015-07-171-1/+1
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 6e9dda70: uncrypt: Support file level encryption.Tao Bao2015-07-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | uncrypt: Support file level encryption.Tao Bao2015-07-171-1/+1
* | | | | | | | | | | | | | | | | am ac780c90: am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."Tao Bao2015-07-170-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."Tao Bao2015-07-173-20/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am 025c0e79: Merge "Clean up LOG functions."Tao Bao2015-07-173-20/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | / / / / / / / | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "Clean up LOG functions."Tao Bao2015-07-173-20/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Clean up LOG functions.Tao Bao2015-07-173-20/+20
| | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Clean up LOG functions.Tao Bao2015-07-163-20/+20
* | | | | | | | | | | | | | | | am 48248273: am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."Tao Bao2015-07-140-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."Tao Bao2015-07-1415-300/+304
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."Tao Bao2015-07-1415-300/+304
| | |\| | | | | | | | | | | | | | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "recovery: Switch applypatch/ and updater/ to cpp."Tao Bao2015-07-1415-300/+304
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | recovery: Switch applypatch/ and updater/ to cpp.Tao Bao2015-07-1415-300/+304
| | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | recovery: Switch applypatch/ and updater/ to cpp.Tao Bao2015-07-1415-300/+304
* | | | | | | | | | | | | | | am a91335ae: am 90c75b0b: Change init sequence to support file level encryptionPaul Lawrence2015-07-141-3/+3
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 90c75b0b: Change init sequence to support file level encryptionPaul Lawrence2015-07-131-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Change init sequence to support file level encryptionPaul Lawrence2015-07-071-3/+3
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | am 79e95b2d: am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""Tao Bao2015-07-110-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""Tao Bao2015-07-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""Tao Bao2015-07-111-17/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | / / / / / / / | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge "Revert "Zero blocks before BLKDISCARD""Tao Bao2015-07-111-17/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Revert "Zero blocks before BLKDISCARD"Tao Bao2015-07-111-17/+1
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am b6b31549: am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-devPaul Lawrence2015-07-071-3/+3
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-devPaul Lawrence2015-07-071-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Revert "Change init sequence to support file level encryption"" into mnc-devPaul Lawrence2015-07-071-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Revert "Change init sequence to support file level encryption"Paul Lawrence2015-07-071-3/+3
* | | | | | | | | | | | | am e93fa6b7: am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"Tao Bao2015-07-070-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"Tao Bao2015-07-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 2490dbc9: Merge "Allow mounting squashfs partitions"Tao Bao2015-07-071-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Allow mounting squashfs partitions"Tao Bao2015-07-071-0/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Allow mounting squashfs partitionsMohamad Ayyash2015-07-071-0/+1
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am 3cc51480: am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-devPaul Lawrence2015-07-071-3/+3
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-devPaul Lawrence2015-07-061-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | / / / / / / / | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge "Change init sequence to support file level encryption" into mnc-devPaul Lawrence2015-07-061-3/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Change init sequence to support file level encryptionPaul Lawrence2015-07-061-3/+3
* | | | | | | | | | | | am 08b63396: am 501282a4: am b4b41daa: am 0ddfa329: Allow mounting squashfs partitionsMohamad Ayyash2015-07-031-0/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | am 501282a4: am b4b41daa: am 0ddfa329: Allow mounting squashfs partitionsMohamad Ayyash2015-07-021-0/+1
| |\| | | | | | | | | |
| | * | | | | | | | | | am b4b41daa: am 0ddfa329: Allow mounting squashfs partitionsMohamad Ayyash2015-07-021-0/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | am 0ddfa329: Allow mounting squashfs partitionsMohamad Ayyash2015-07-021-0/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Allow mounting squashfs partitionsMohamad Ayyash2015-07-011-0/+1
| | | | | |_|_|/ / / / / | | | | |/| | | | | | |
* | | | | | | | | | | | am 6284431d: am 8409b088: Merge "Add drm support to minui" into mnc-devVincent Palatin2015-07-034-0/+484
|\| | | | | | | | | | |
| * | | | | | | | | | | am 8409b088: Merge "Add drm support to minui" into mnc-devVincent Palatin2015-07-024-0/+484
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Add drm support to minui" into mnc-devVincent Palatin2015-07-024-0/+484
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Add drm support to minuiStéphane Marchesin2015-07-024-0/+484
* | | | | | | | | | | | am c4b6f87f: am 7125f959: Revert "Zero blocks before BLKDISCARD"Tao Bao2015-07-031-17/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | am 7125f959: Revert "Zero blocks before BLKDISCARD"Tao Bao2015-07-011-17/+1
| |\| | | | | | | | | |
| | * | | | | | | | | | Revert "Zero blocks before BLKDISCARD"Tao Bao2015-07-011-17/+1
| | |/ / / / / / / / /
* | | | | | | | | | | am 2b3c599c: am c3dddce2: More accurate checking for overlapped ranges.Tao Bao2015-06-270-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | am c3dddce2: More accurate checking for overlapped ranges.Tao Bao2015-06-260-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | More accurate checking for overlapped ranges.Tao Bao2015-06-261-1/+1
* | | | | | | | | | | am b102404d: am cb9450e1: Use f_bavail to calculate free spacecaozhiyuan2015-06-260-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | am cb9450e1: Use f_bavail to calculate free spacecaozhiyuan2015-06-260-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | Use f_bavail to calculate free spacecaozhiyuan2015-06-261-1/+1
* | | | | | | | | | | am f90651e4: am 89d3634f: am b36d9c3f: Merge "More accurate checking for overlapped ranges."Tao Bao2015-06-261-1/+1
|\| | | | | | | | | |
| * | | | | | | | | | am 89d3634f: am b36d9c3f: Merge "More accurate checking for overlapped ranges."Tao Bao2015-06-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am b36d9c3f: Merge "More accurate checking for overlapped ranges."Tao Bao2015-06-261-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "More accurate checking for overlapped ranges."Tao Bao2015-06-261-1/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | More accurate checking for overlapped ranges.Tao Bao2015-06-261-1/+1
| | | |/ / / / / / / /
* | | | | | | | | | | am 8f7a2afe: am 1572820c: am ec18d495: Merge "recovery: Use xxhdpi resources for 560dpi devices"Tao Bao2015-06-241-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | am 1572820c: am ec18d495: Merge "recovery: Use xxhdpi resources for 560dpi devices"Tao Bao2015-06-241-0/+1
| |\| | | | | | | | |
| | * | | | | | | | | am ec18d495: Merge "recovery: Use xxhdpi resources for 560dpi devices"Tao Bao2015-06-241-0/+1
| | |\| | | | | | | |
| | | * | | | | | | | Merge "recovery: Use xxhdpi resources for 560dpi devices"Tao Bao2015-06-241-0/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | recovery: Use xxhdpi resources for 560dpi devicesTao Bao2015-06-241-0/+1
| | | |/ / / / / / / /
* | | | | | | | | | | am 2c7fa669: am 4b619469: am 719e4e5d: Merge "Just use fstat in sysMapFile."Elliott Hughes2015-06-243-71/+24
|\| | | | | | | | | |
| * | | | | | | | | | am 4b619469: am 719e4e5d: Merge "Just use fstat in sysMapFile."Elliott Hughes2015-06-243-71/+24
| |\| | | | | | | | |
| | * | | | | | | | | am 719e4e5d: Merge "Just use fstat in sysMapFile."Elliott Hughes2015-06-243-71/+24
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Just use fstat in sysMapFile."Elliott Hughes2015-06-243-71/+24
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Just use fstat in sysMapFile.Elliott Hughes2015-06-233-71/+24
| | | |/ / / / / / / /
* | | | | | | | | | | am 997534d0: am c35f3ce3: Allow sideloading without authentication.Elliott Hughes2015-06-240-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | am c35f3ce3: Allow sideloading without authentication.Elliott Hughes2015-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Allow sideloading without authentication.Elliott Hughes2015-06-231-1/+5
* | | | | | | | | | | am 687bf071: am 6dd443fd: am ea13fe23: Merge "Allow sideloading without authentication."Elliott Hughes2015-06-231-1/+5
|\| | | | | | | | | |
| * | | | | | | | | | am 6dd443fd: am ea13fe23: Merge "Allow sideloading without authentication."Elliott Hughes2015-06-231-1/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am ea13fe23: Merge "Allow sideloading without authentication."Elliott Hughes2015-06-231-1/+5
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Allow sideloading without authentication."Elliott Hughes2015-06-231-1/+5
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Allow sideloading without authentication.Elliott Hughes2015-06-231-1/+5
| | | |/ / / / / / / /
* | | | | | | | | | | am deb4ebb2: am d2a59288: am 22ccc87a: Merge "Unmount sdcard if no package file is selected."Elliott Hughes2015-06-111-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | am d2a59288: am 22ccc87a: Merge "Unmount sdcard if no package file is selected."Elliott Hughes2015-06-111-0/+1
| |\| | | | | | | | |
| | * | | | | | | | | am 22ccc87a: Merge "Unmount sdcard if no package file is selected."Elliott Hughes2015-06-111-0/+1
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Unmount sdcard if no package file is selected."Elliott Hughes2015-06-111-0/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Unmount sdcard if no package file is selected.caozhiyuan2015-06-101-0/+1
* | | | | | | | | | | | am 7ccec497: am d7c9bf41: Merge "Zero blocks before BLKDISCARD" into mnc-devSami Tolvanen2015-06-110-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | am d7c9bf41: Merge "Zero blocks before BLKDISCARD" into mnc-devSami Tolvanen2015-06-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Zero blocks before BLKDISCARD" into mnc-devSami Tolvanen2015-06-101-1/+17
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Zero blocks before BLKDISCARDSami Tolvanen2015-06-101-1/+17
* | | | | | | | | | | | | am 1e8bc40b: am 0005f89c: Split WipeData into PreWipeData and PostWipeData.Elliott Hughes2015-06-110-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 0005f89c: Split WipeData into PreWipeData and PostWipeData.Elliott Hughes2015-06-110-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Split WipeData into PreWipeData and PostWipeData.Elliott Hughes2015-06-102-24/+22
| | |/ / / / / / / / / /
* | | | | | | | | | | | am 12c8ea68: am e21ff08e: am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData."Elliott Hughes2015-06-112-24/+22
|\| | | | | | | | | | |
| * | | | | | | | | | | am e21ff08e: am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData."Elliott Hughes2015-06-112-24/+22
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData."Elliott Hughes2015-06-102-24/+22
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Split WipeData into PreWipeData and PostWipeData."Elliott Hughes2015-06-102-24/+22
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Split WipeData into PreWipeData and PostWipeData.Elliott Hughes2015-06-102-24/+22
* | | | | | | | | | | | | am a66cdf40: am 915fc970: am 280cb6e9: Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-1/+17
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 915fc970: am 280cb6e9: Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-1/+17
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am 280cb6e9: Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-1/+17
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-1/+17
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Zero blocks before BLKDISCARDSami Tolvanen2015-06-101-1/+17
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am 11cad65d: am 059e391f: am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD""Sami Tolvanen2015-06-100-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 059e391f: am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD""Sami Tolvanen2015-06-100-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD""Sami Tolvanen2015-06-101-5/+9
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Revert "Zero blocks before BLKDISCARD""Sami Tolvanen2015-06-101-5/+9
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Revert "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-5/+9
* | | | | | | | | | | | | am 758f56ef: am 6abd52f6: Revert "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-5/+9
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 6abd52f6: Revert "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-5/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Revert "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-5/+9
* | | | | | | | | | | | | am 8ee89e7b: am b89452ef: am 1a03b400: Merge "uncrypt: Write status when it reboots to factory reset"Tao Bao2015-06-100-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am b89452ef: am 1a03b400: Merge "uncrypt: Write status when it reboots to factory reset"Tao Bao2015-06-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 1a03b400: Merge "uncrypt: Write status when it reboots to factory reset"Tao Bao2015-06-101-7/+10
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "uncrypt: Write status when it reboots to factory reset"Tao Bao2015-06-101-7/+10
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | uncrypt: Write status when it reboots to factory resetTao Bao2015-06-101-7/+10
* | | | | | | | | | | | | | am 5a1aa4c7: am 2880e0fc: (-s ours) am 2cf180f6: Merge "Separate uncrypt into two modes"Tao Bao2015-06-100-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | am 2880e0fc: (-s ours) am 2cf180f6: Merge "Separate uncrypt into two modes"Tao Bao2015-06-100-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | am 2cf180f6: Merge "Separate uncrypt into two modes"Tao Bao2015-06-102-95/+92
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "Separate uncrypt into two modes"Tao Bao2015-06-102-95/+92
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Separate uncrypt into two modesTao Bao2015-06-102-95/+92
| | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
* | | | | | | | | | | | | am 9df159da: am 604c583c: Zero blocks before BLKDISCARDSami Tolvanen2015-06-100-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 604c583c: Zero blocks before BLKDISCARDSami Tolvanen2015-06-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Zero blocks before BLKDISCARDSami Tolvanen2015-06-091-9/+5
* | | | | | | | | | | | | am 1692fc8b: am 2fd12979: am 69608fe7: Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-091-9/+5
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 2fd12979: am 69608fe7: Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-091-9/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 69608fe7: Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-091-9/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-091-9/+5
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | / / / / / / / | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Zero blocks before BLKDISCARDSami Tolvanen2015-06-091-9/+5
| | | |/ / / / / / / /
* | | | | | | | | | | am db553d5d: am 7baa13f6: am 3f9db6af: Merge "recovery: Switch to clang"Tao Bao2015-06-0413-11/+38
|\| | | | | | | | | |
| * | | | | | | | | | am 7baa13f6: am 3f9db6af: Merge "recovery: Switch to clang"Tao Bao2015-06-0413-11/+38
| |\| | | | | | | | |
| | * | | | | | | | | am 3f9db6af: Merge "recovery: Switch to clang"Tao Bao2015-06-0413-11/+38
| | |\| | | | | | | |
| | | * | | | | | | | Merge "recovery: Switch to clang"Tao Bao2015-06-0413-11/+38
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | recovery: Switch to clangTao Bao2015-06-0313-11/+38
| | | |/ / / / / / / /
* | | | | | | | | | | am 3ed20cff: am 028d216c: am 227069d7: Merge "Fix build: fprintf without modifier"Tao Bao2015-06-031-2/+1
|\| | | | | | | | | |
| * | | | | | | | | | am 028d216c: am 227069d7: Merge "Fix build: fprintf without modifier"Tao Bao2015-06-031-2/+1
| |\| | | | | | | | |
| | * | | | | | | | | am 227069d7: Merge "Fix build: fprintf without modifier"Tao Bao2015-06-031-2/+1
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Fix build: fprintf without modifier"Tao Bao2015-06-031-2/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix build: fprintf without modifierTao Bao2015-06-031-2/+1
| | | |/ / / / / / / /
* | | | | | | | | | | am 5393149d: am d107e6dc: am a69e608a: Merge "Log update outputs in order"Tao Bao2015-06-036-13/+44
|\| | | | | | | | | |
| * | | | | | | | | | am d107e6dc: am a69e608a: Merge "Log update outputs in order"Tao Bao2015-06-036-13/+44
| |\| | | | | | | | |
| | * | | | | | | | | am a69e608a: Merge "Log update outputs in order"Tao Bao2015-06-036-13/+44
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Log update outputs in order"Tao Bao2015-06-036-13/+44
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Log update outputs in orderTao Bao2015-06-036-13/+44
* | | | | | | | | | | | am 2c51ec95: am 02b64725: Merge "uncrypt: Write status when it reboots to factory reset" into mnc-devTao Bao2015-06-011-7/+10
|\| | | | | | | | | | |
| * | | | | | | | | | | am 02b64725: Merge "uncrypt: Write status when it reboots to factory reset" into mnc-devTao Bao2015-06-011-7/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "uncrypt: Write status when it reboots to factory reset" into mnc-devTao Bao2015-05-301-7/+10
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | uncrypt: Write status when it reboots to factory resetTao Bao2015-05-291-7/+10
* | | | | | | | | | | | | am 7132e792: am b5dabd25: Really don\'t use TEMP_FAILURE_RETRY with close in recovery.Elliott Hughes2015-06-010-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am b5dabd25: Really don\'t use TEMP_FAILURE_RETRY with close in recovery.Elliott Hughes2015-06-010-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Really don't use TEMP_FAILURE_RETRY with close in recovery.Elliott Hughes2015-05-291-1/+1
| | |/ / / / / / / / / /
* | | | | | | | | | | | am 07ec625a: am 92eea1bc: Handle BLKDISCARD failuresSami Tolvanen2015-06-010-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | am 92eea1bc: Handle BLKDISCARD failuresSami Tolvanen2015-06-010-0/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | Handle BLKDISCARD failuresSami Tolvanen2015-05-291-2/+1
* | | | | | | | | | | | am 8339bc67: am 5944bcd8: am 1441a965: Merge "Really don\'t use TEMP_FAILURE_RETRY with close in recovery."Elliott Hughes2015-05-291-1/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | am 5944bcd8: am 1441a965: Merge "Really don\'t use TEMP_FAILURE_RETRY with close in recovery."Elliott Hughes2015-05-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am 1441a965: Merge "Really don\'t use TEMP_FAILURE_RETRY with close in recovery."Elliott Hughes2015-05-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Really don't use TEMP_FAILURE_RETRY with close in recovery."Elliott Hughes2015-05-291-1/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Really don't use TEMP_FAILURE_RETRY with close in recovery.Elliott Hughes2015-05-291-1/+1
* | | | | | | | | | | | | am f827034f: am eec204be: am 74f5e0e0: Merge "Use f_bavail to calculate free space"Tao Bao2015-05-291-1/+1
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am eec204be: am 74f5e0e0: Merge "Use f_bavail to calculate free space"Tao Bao2015-05-291-1/+1
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am 74f5e0e0: Merge "Use f_bavail to calculate free space"Tao Bao2015-05-291-1/+1
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Use f_bavail to calculate free space"Tao Bao2015-05-291-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Use f_bavail to calculate free spacecaozhiyuan2015-05-291-1/+1
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am 127ab1fc: resolved conflicts for merge of 158e11d6 to mnc-dev-plus-aospTao Bao2015-05-292-95/+92
|\| | | | | | | | | | | |
| * | | | | | | | | | | | resolved conflicts for merge of 158e11d6 to mnc-dev-plus-aospTao Bao2015-05-292-95/+92
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Separate uncrypt into two modesTao Bao2015-05-282-98/+95
* | | | | | | | | | | | | am e938682e: am cd391c23: am aa4df5c4: Merge "Handle BLKDISCARD failures"Sami Tolvanen2015-05-281-2/+1
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am cd391c23: am aa4df5c4: Merge "Handle BLKDISCARD failures"Sami Tolvanen2015-05-281-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am aa4df5c4: Merge "Handle BLKDISCARD failures"Sami Tolvanen2015-05-281-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Handle BLKDISCARD failures"Sami Tolvanen2015-05-281-2/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Handle BLKDISCARD failuresSami Tolvanen2015-05-281-2/+1
| | | |/ / / / / / / / /
* | | | | | | | | | | | am d026a28c: am 9a5e2a26: am f272b9e7: Merge "Clean up the sleep()\'s after poking init services"Tao Bao2015-05-283-13/+20
|\| | | | | | | | | | |
| * | | | | | | | | | | am 9a5e2a26: am f272b9e7: Merge "Clean up the sleep()\'s after poking init services"Tao Bao2015-05-283-13/+20
| |\| | | | | | | | | |
| | * | | | | | | | | | am f272b9e7: Merge "Clean up the sleep()\'s after poking init services"Tao Bao2015-05-283-13/+20
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Clean up the sleep()'s after poking init services"Tao Bao2015-05-283-13/+20
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Clean up the sleep()'s after poking init servicesTao Bao2015-05-273-13/+20
| | | |/ / / / / / / / /
* | | | | | | | | | | | am e6f54e74: am 7b126d77: am 73151b51: Merge "recovery: change the way of rebooting when using power key combo"Tao Bao2015-05-281-1/+3
|\| | | | | | | | | | |
| * | | | | | | | | | | am 7b126d77: am 73151b51: Merge "recovery: change the way of rebooting when using power key combo"Tao Bao2015-05-281-1/+3
| |\| | | | | | | | | |
| | * | | | | | | | | | am 73151b51: Merge "recovery: change the way of rebooting when using power key combo"Tao Bao2015-05-271-1/+3
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "recovery: change the way of rebooting when using power key combo"Tao Bao2015-05-271-1/+3
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | recovery: change the way of rebooting when using power key comboGaelle Nassiet2015-05-271-1/+3
| | | | | |/ / / / / / / | | | | |/| | | | | | |
* | | | | | | | | | | | am 8af11cff: am 6f6e5bb8: am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo""Nick Kralevich2015-05-271-2/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | am 6f6e5bb8: am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo""Nick Kralevich2015-05-271-2/+1
| |\| | | | | | | | | |
| | * | | | | | | | | | am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo""Nick Kralevich2015-05-271-2/+1
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Revert "recovery: change the way of rebooting when using power key combo""Nick Kralevich2015-05-271-2/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Revert "recovery: change the way of rebooting when using power key combo"Nick Kralevich2015-05-271-2/+1
* | | | | | | | | | | | | am f0e2927d: am 6d1d7ffa: am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo"Nick Kralevich2015-05-271-1/+2
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 6d1d7ffa: am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo"Nick Kralevich2015-05-271-1/+2
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo"Nick Kralevich2015-05-271-1/+2
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "recovery: change the way of rebooting when using power key combo"Nick Kralevich2015-05-271-1/+2
| | | |\| | | | | | | | | | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | recovery: change the way of rebooting when using power key comboGaelle Nassiet2015-05-271-1/+2
| | | |/ / / / / / / /
* | | | | | | | | | | am 9e9cbc9b: am 0b1d1574: am a8cd96ad: Merge "Stop using libstdc++."Dan Albert2015-05-203-5/+3
|\| | | | | | | | | |
| * | | | | | | | | | am 0b1d1574: am a8cd96ad: Merge "Stop using libstdc++."Dan Albert2015-05-203-5/+3
| |\| | | | | | | | |
| | * | | | | | | | | am a8cd96ad: Merge "Stop using libstdc++."Dan Albert2015-05-203-5/+3
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Stop using libstdc++."Dan Albert2015-05-203-5/+3
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Stop using libstdc++.Dan Albert2015-05-193-5/+3
| | | |/ / / / / / / /
* | | | | | | | | | | am b135645c: am 6dc1e6a6: am 6253753a: Merge "Add error and range checks to parse_range"Sami Tolvanen2015-05-181-10/+71
|\| | | | | | | | | |
| * | | | | | | | | | am 6dc1e6a6: am 6253753a: Merge "Add error and range checks to parse_range"Sami Tolvanen2015-05-181-10/+71
| |\| | | | | | | | |
| | * | | | | | | | | am 6253753a: Merge "Add error and range checks to parse_range"Sami Tolvanen2015-05-181-10/+71
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Add error and range checks to parse_range"Sami Tolvanen2015-05-181-10/+71
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Add error and range checks to parse_rangeSami Tolvanen2015-05-151-10/+71
* | | | | | | | | | | | am 621fa7aa: am 1857a7f5: Don\'t use TEMP_FAILURE_RETRY on close in recovery.Elliott Hughes2015-05-160-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | am 1857a7f5: Don\'t use TEMP_FAILURE_RETRY on close in recovery.Elliott Hughes2015-05-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Don't use TEMP_FAILURE_RETRY on close in recovery.Elliott Hughes2015-05-161-2/+2
* | | | | | | | | | | | am 0b1e527a: am 09050fc9: am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery."Elliott Hughes2015-05-161-2/+2
|\| | | | | | | | | | |
| * | | | | | | | | | | am 09050fc9: am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery."Elliott Hughes2015-05-161-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery."Elliott Hughes2015-05-161-2/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Don't use TEMP_FAILURE_RETRY on close in recovery."Elliott Hughes2015-05-161-2/+2
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Don't use TEMP_FAILURE_RETRY on close in recovery.Elliott Hughes2015-05-161-2/+2
| | | |/ / / / / / / /
* | | | | | | | | | | am 1fce2426: am 5bb8d551: am 3badd563: Merge "init sets the default PATH itself, better."Elliott Hughes2015-05-131-1/+0
|\| | | | | | | | | |
| * | | | | | | | | | am 5bb8d551: am 3badd563: Merge "init sets the default PATH itself, better."Elliott Hughes2015-05-131-1/+0
| |\| | | | | | | | |
| | * | | | | | | | | am 3badd563: Merge "init sets the default PATH itself, better."Elliott Hughes2015-05-121-1/+0
| | |\| | | | | | | |
| | | * | | | | | | | Merge "init sets the default PATH itself, better."Elliott Hughes2015-05-121-1/+0
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | init sets the default PATH itself, better.Elliott Hughes2015-05-121-1/+0
| | | |/ / / / / / / /
* | | | | | | | | | | am 9cd94f87: am cfe46542: am 3128176e: Merge "Fix build following adb change."Dan Albert2015-05-081-5/+1
|\| | | | | | | | | |
| * | | | | | | | | | am cfe46542: am 3128176e: Merge "Fix build following adb change."Dan Albert2015-05-081-5/+1
| |\| | | | | | | | |
| | * | | | | | | | | am 3128176e: Merge "Fix build following adb change."Dan Albert2015-05-081-5/+1
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Fix build following adb change."Dan Albert2015-05-081-5/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix build following adb change.Dan Albert2015-05-081-5/+1
| | | |/ / / / / / / /
* | | | | | | | | | | am 81ad2bf8: am 3257155e: am 77a2c883: Merge "Add an alternate screen for viewing recovery logs."Elliott Hughes2015-05-070-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | am 3257155e: am 77a2c883: Merge "Add an alternate screen for viewing recovery logs."Elliott Hughes2015-05-070-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | am 77a2c883: Merge "Add an alternate screen for viewing recovery logs."Elliott Hughes2015-05-073-55/+79
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Add an alternate screen for viewing recovery logs."Elliott Hughes2015-05-073-55/+79
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Add an alternate screen for viewing recovery logs.Elliott Hughes2015-05-073-55/+79
* | | | | | | | | | | | am 92a13f56: am 25a67fde: am 7ff339ea: Merge "uncrypt: Switch to C++"Tao Bao2015-05-070-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | am 25a67fde: am 7ff339ea: Merge "uncrypt: Switch to C++"Tao Bao2015-05-070-0/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | am 7ff339ea: Merge "uncrypt: Switch to C++"Tao Bao2015-05-062-42/+40
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "uncrypt: Switch to C++"Tao Bao2015-05-062-42/+40
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | uncrypt: Switch to C++Tao Bao2015-05-062-42/+40
| | | |/ / / / / / / /
* | | | | | | | | | | am 11342f78: am df52e1e1: Add an alternate screen for viewing recovery logs.Elliott Hughes2015-05-073-55/+79
|\| | | | | | | | | |
| * | | | | | | | | | am df52e1e1: Add an alternate screen for viewing recovery logs.Elliott Hughes2015-05-073-55/+79
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Add an alternate screen for viewing recovery logs.Elliott Hughes2015-05-073-55/+79
* | | | | | | | | | | am 2ab0a572: resolved conflicts for merge of 550bd340 to mnc-dev-plus-aospTao Bao2015-05-070-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | resolved conflicts for merge of 550bd340 to mnc-dev-plus-aospTao Bao2015-05-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am aeb980bd: Merge "uncrypt: package on non-data partition should follow the right path"Tao Bao2015-05-061-20/+41
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "uncrypt: package on non-data partition should follow the right path"Tao Bao2015-05-061-20/+41
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | uncrypt: package on non-data partition should follow the right pathTao Bao2015-05-061-20/+41
* | | | | | | | | | | | am a6fb5418: am 48150842: am 41c7ef54: Merge "Track adb_thread_create API change."Elliott Hughes2015-05-071-4/+2
|\| | | | | | | | | | |
| * | | | | | | | | | | am 48150842: am 41c7ef54: Merge "Track adb_thread_create API change."Elliott Hughes2015-05-071-4/+2
| |\| | | | | | | | | |
| | * | | | | | | | | | am 41c7ef54: Merge "Track adb_thread_create API change."Elliott Hughes2015-05-051-4/+2
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Track adb_thread_create API change."Elliott Hughes2015-05-051-4/+2
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Track adb_thread_create API change.Elliott Hughes2015-05-051-4/+2
| | | | |/ / / / / / / /
* | | | | | | | | | | | am d5148f35: am 185e8204: am c7f64fdf: Merge "Keep multiple kernel logs"Tao Bao2015-05-070-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | am 185e8204: am c7f64fdf: Merge "Keep multiple kernel logs"Tao Bao2015-05-070-0/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | am c7f64fdf: Merge "Keep multiple kernel logs"Tao Bao2015-05-051-82/+73
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Keep multiple kernel logs"Tao Bao2015-05-051-82/+73
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Keep multiple kernel logsTao Bao2015-05-051-82/+73
| | | |/ / / / / / / /
* | | | | | | | | | | am c017c597: am 3e8d28b5: uncrypt: Switch to C++Tao Bao2015-05-062-42/+40
|\| | | | | | | | | |
| * | | | | | | | | | am 3e8d28b5: uncrypt: Switch to C++Tao Bao2015-05-062-42/+40
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | uncrypt: Switch to C++Tao Bao2015-05-062-42/+40
* | | | | | | | | | | am 8d312ed6: am 8853cb2f: uncrypt: package on non-data partition should follow the right pathTao Bao2015-05-061-20/+41
|\| | | | | | | | | |
| * | | | | | | | | | am 8853cb2f: uncrypt: package on non-data partition should follow the right pathTao Bao2015-05-061-20/+41
| |\| | | | | | | | |
| | * | | | | | | | | uncrypt: package on non-data partition should follow the right pathTao Bao2015-05-061-20/+41
* | | | | | | | | | | am 38fcdfe0: am 93cec9a0: Keep multiple kernel logsTao Bao2015-05-061-82/+73
|\| | | | | | | | | |
| * | | | | | | | | | am 93cec9a0: Keep multiple kernel logsTao Bao2015-05-051-82/+73
| |\| | | | | | | | |
| | * | | | | | | | | Keep multiple kernel logsTao Bao2015-05-051-82/+73
* | | | | | | | | | | am 6c3b7634: am 6d820f2c: Turn on text display for debuggable buildsTao Bao2015-05-040-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | am 6d820f2c: Turn on text display for debuggable buildsTao Bao2015-05-040-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | Turn on text display for debuggable buildsTao Bao2015-05-041-0/+7
* | | | | | | | | | | am e9ce252c: am 0a7b9276: am f8f88321: Merge "Turn on text display for debuggable builds"Tao Bao2015-05-041-0/+7
|\| | | | | | | | | |
| * | | | | | | | | | am 0a7b9276: am f8f88321: Merge "Turn on text display for debuggable builds"Tao Bao2015-05-041-0/+7
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am f8f88321: Merge "Turn on text display for debuggable builds"Tao Bao2015-05-041-0/+7
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Turn on text display for debuggable builds"Tao Bao2015-05-041-0/+7
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Turn on text display for debuggable buildsTao Bao2015-05-041-0/+7
| | | |/ / / / / / / /
* | | | | | | | | | | am 759febda: am 4cf34d5d: Fix mips64 minadbd_test build.Elliott Hughes2015-05-020-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | am 4cf34d5d: Fix mips64 minadbd_test build.Elliott Hughes2015-05-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Fix mips64 minadbd_test build.Elliott Hughes2015-05-021-1/+1
* | | | | | | | | | | am 007a7141: am 4b3004a6: am 59e1e3e7: Merge "Fix mips64 minadbd_test build."Elliott Hughes2015-05-021-1/+1
|\| | | | | | | | | |
| * | | | | | | | | | am 4b3004a6: am 59e1e3e7: Merge "Fix mips64 minadbd_test build."Elliott Hughes2015-05-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am 59e1e3e7: Merge "Fix mips64 minadbd_test build."Elliott Hughes2015-05-021-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Fix mips64 minadbd_test build."Elliott Hughes2015-05-021-1/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix mips64 minadbd_test build.Elliott Hughes2015-05-021-1/+1
| | | |/ / / / / / / /
* | | | | | | | | | | am 227dcf8a: am 15931924: Move minadb over to new API.Elliott Hughes2015-05-020-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | am 15931924: Move minadb over to new API.Elliott Hughes2015-05-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Move minadb over to new API.Elliott Hughes2015-05-022-13/+9
* | | | | | | | | | | am 0cd8f5b4: am 87ec73a2: Fix minadb_test build breakage.Elliott Hughes2015-05-020-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | am 87ec73a2: Fix minadb_test build breakage.Elliott Hughes2015-05-020-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | Fix minadb_test build breakage.Elliott Hughes2015-05-021-1/+1
* | | | | | | | | | | am 41e4f5ae: am c0537d68: am 6bc2d538: Merge "Move minadb over to new API."Elliott Hughes2015-05-022-13/+9
|\| | | | | | | | | |
| * | | | | | | | | | am c0537d68: am 6bc2d538: Merge "Move minadb over to new API."Elliott Hughes2015-05-022-13/+9
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am 6bc2d538: Merge "Move minadb over to new API."Elliott Hughes2015-05-022-13/+9
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Move minadb over to new API."Elliott Hughes2015-05-022-13/+9
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Move minadb over to new API.Elliott Hughes2015-05-022-14/+10
* | | | | | | | | | | | am ea874f8f: am c67e89ad: am 30cea3dc: Merge "Fix minadb_test build breakage."Elliott Hughes2015-05-021-1/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | am c67e89ad: am 30cea3dc: Merge "Fix minadb_test build breakage."Elliott Hughes2015-05-021-1/+1
| |\| | | | | | | | | |
| | * | | | | | | | | | am 30cea3dc: Merge "Fix minadb_test build breakage."Elliott Hughes2015-05-021-1/+1
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Fix minadb_test build breakage."Elliott Hughes2015-05-021-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Fix minadb_test build breakage.Elliott Hughes2015-05-021-1/+1
| | | |/ / / / / / / /
* | | | | | | | | | | am 073e3381: am 2f5feedf: Check all lseek calls succeed.Elliott Hughes2015-04-300-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | am 2f5feedf: Check all lseek calls succeed.Elliott Hughes2015-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Check all lseek calls succeed.Elliott Hughes2015-04-3014-128/+112
* | | | | | | | | | | am f6c7af28: am 34d3a3d0: am 34c7731a: Merge "Check all lseek calls succeed."Elliott Hughes2015-04-3014-128/+112
|\| | | | | | | | | |
| * | | | | | | | | | am 34d3a3d0: am 34c7731a: Merge "Check all lseek calls succeed."Elliott Hughes2015-04-3014-128/+112
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am 34c7731a: Merge "Check all lseek calls succeed."Elliott Hughes2015-04-3014-128/+112
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Check all lseek calls succeed."Elliott Hughes2015-04-3014-128/+112
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Check all lseek calls succeed.Elliott Hughes2015-04-3014-128/+112
| | | |/ / / / / / / /
* | | | | | | | | | | am 15a2e46b: am f7466f9f: Stop using adb_strtok, and check argument validity.Elliott Hughes2015-04-280-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | am f7466f9f: Stop using adb_strtok, and check argument validity.Elliott Hughes2015-04-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Stop using adb_strtok, and check argument validity.Elliott Hughes2015-04-281-9/+10
* | | | | | | | | | | am b1195d1c: am bc4e69fc: am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity."Elliott Hughes2015-04-281-9/+10
|\| | | | | | | | | |
| * | | | | | | | | | am bc4e69fc: am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity."Elliott Hughes2015-04-281-9/+10
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / /
| | * | | | | | | | am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity."Elliott Hughes2015-04-281-9/+10
| | |\| | | | | | |
| | | * | | | | | | Merge "Stop using adb_strtok, and check argument validity."Elliott Hughes2015-04-281-9/+10
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Stop using adb_strtok, and check argument validity.Elliott Hughes2015-04-281-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 Morales2015-04-270-0/+0
|\| | | | | | | | |
| * | | | | | | | | am 599fc2c0: (-s ours) am c94fa0b0: (-s ours) DO NOT MERGE Revert "Erase PST partition if its marked to be erased."Andres Morales2015-04-270-0/+0
|/| | | | | | | | | | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am c94fa0b0: (-s ours) DO NOT MERGE Revert "Erase PST partition if its marked to be erased."Andres Morales2015-04-260-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | |
| | * | | | | | DO NOT MERGE Revert "Erase PST partition if its marked to be erased."Andres Morales2015-04-023-44/+0
* | | | | | | | am 5a95719b: am 6725ebc7: Merge "Revert "Revert "init re-execs to set its security context now."""Elliott Hughes2015-04-241-7/+0
|\| | | | | | |
| * | | | | | | am 6725ebc7: Merge "Revert "Revert "init re-execs to set its security context now."""Elliott Hughes2015-04-241-7/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Revert "Revert "init re-execs to set its security context now."""Elliott Hughes2015-04-241-7/+0
| | |\ \ \ \ \ \
| | | * | | | | | Revert "Revert "init re-execs to set its security context now.""Elliott Hughes2015-04-241-7/+0
| | |/ / / / / /
* | | | | | | | am f6c03a80: am c690332c: Merge "Revert "init re-execs to set its security context now.""Nick Kralevich2015-04-241-0/+7
|\| | | | | | |
| * | | | | | | am c690332c: Merge "Revert "init re-execs to set its security context now.""Nick Kralevich2015-04-241-0/+7
| |\| | | | | |
| | * | | | | | Merge "Revert "init re-execs to set its security context now.""Nick Kralevich2015-04-241-0/+7
| | |\ \ \ \ \ \
| | | * | | | | | Revert "init re-execs to set its security context now."Nick Kralevich2015-04-241-0/+7
* | | | | | | | | am 7058b89f: am 38a82cac: Merge "init re-execs to set its security context now."Elliott Hughes2015-04-241-7/+0
|\| | | | | | | |
| * | | | | | | | am 38a82cac: Merge "init re-execs to set its security context now."Elliott Hughes2015-04-241-7/+0
| |\| | | | | | |
| | * | | | | | | Merge "init re-execs to set its security context now."Elliott Hughes2015-04-241-7/+0
| | |\| | | | | |
| | | * | | | | | init re-execs to set its security context now.Elliott Hughes2015-04-241-7/+0
| | |/ / / / / /
* | | | | | | | am 0391820c: am 0de2351e: Merge "Don\'t remove existing explicitly stashed blocks"Sami Tolvanen2015-04-171-10/+28
|\| | | | | | |
| * | | | | | | am 0de2351e: Merge "Don\'t remove existing explicitly stashed blocks"Sami Tolvanen2015-04-171-10/+28
| |\| | | | | |
| | * | | | | | Merge "Don't remove existing explicitly stashed blocks"Sami Tolvanen2015-04-171-10/+28
| | |\ \ \ \ \ \
| | | * | | | | | Don't remove existing explicitly stashed blocksSami Tolvanen2015-04-171-10/+28
| | |/ / / / / /
* | | | | | | | am 51f42b2d: am 4381767a: Merge "imgdiff: Avoid infinite loop if inflate fails"Tao Bao2015-04-161-0/+9
|\| | | | | | |
| * | | | | | | am 4381767a: Merge "imgdiff: Avoid infinite loop if inflate fails"Tao Bao2015-04-161-0/+9
| |\| | | | | |
| | * | | | | | Merge "imgdiff: Avoid infinite loop if inflate fails"Tao Bao2015-04-161-0/+9
| | |\ \ \ \ \ \
| | | * | | | | | imgdiff: Avoid infinite loop if inflate failsJohan Redestig2015-04-151-0/+9
* | | | | | | | | am 0a557b6b: am 7176a617: Merge "Don\'t use typedefs that hide *s."Elliott Hughes2015-04-158-59/+54
|\| | | | | | | |
| * | | | | | | | am 7176a617: Merge "Don\'t use typedefs that hide *s."Elliott Hughes2015-04-158-59/+54
| |\| | | | | | |
| | * | | | | | | Merge "Don't use typedefs that hide *s."Elliott Hughes2015-04-158-59/+54
| | |\ \ \ \ \ \ \
| | | * | | | | | | Don't use typedefs that hide *s.Elliott Hughes2015-04-158-59/+54
| | |/ / / / / / /
* | | | | | | | | am 98bfb6f7: am 6e435abf: Merge "Move the menu header out of the menu."Elliott Hughes2015-04-158-66/+72
|\| | | | | | | |
| * | | | | | | | am 6e435abf: Merge "Move the menu header out of the menu."Elliott Hughes2015-04-158-66/+72
| |\| | | | | | |
| | * | | | | | | Merge "Move the menu header out of the menu."Elliott Hughes2015-04-158-66/+72
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Move the menu header out of the menu.Elliott Hughes2015-04-148-66/+72
| | |/ / / / / /
* | | | | | | | am cbdc7e84: am 17b032e1: Merge "Add missing \n after "Mounting /system." message."Elliott Hughes2015-04-131-1/+1
|\| | | | | | |
| * | | | | | | am 17b032e1: Merge "Add missing \n after "Mounting /system." message."Elliott Hughes2015-04-131-1/+1
| |\| | | | | |
| | * | | | | | Merge "Add missing \n after "Mounting /system." message."Elliott Hughes2015-04-131-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Add missing \n after "Mounting /system." message.Elliott Hughes2015-04-131-1/+1
| | |/ / / / / /
* | | | | | | | am d7823c5d: am eab12de7: Merge "Remove unnecessary globals."Elliott Hughes2015-04-134-64/+55
|\| | | | | | |
| * | | | | | | am eab12de7: Merge "Remove unnecessary globals."Elliott Hughes2015-04-134-64/+55
| |\| | | | | |
| | * | | | | | Merge "Remove unnecessary globals."Elliott Hughes2015-04-134-64/+55
| | |\ \ \ \ \ \
| | | * | | | | | Remove unnecessary globals.Elliott Hughes2015-04-134-64/+55
* | | | | | | | | am 507630e9: am b68c4fc4: Merge "Treat KEY_ENTER the same as KEY_POWER in the pager."Elliott Hughes2015-04-131-1/+1
|\| | | | | | | |
| * | | | | | | | am b68c4fc4: Merge "Treat KEY_ENTER the same as KEY_POWER in the pager."Elliott Hughes2015-04-131-1/+1
| |\| | | | | | |
| | * | | | | | | Merge "Treat KEY_ENTER the same as KEY_POWER in the pager."Elliott Hughes2015-04-131-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Treat KEY_ENTER the same as KEY_POWER in the pager.Elliott Hughes2015-04-131-1/+1
| | |/ / / / / /
* | | | | | | | am d56e0f37: am 0e3781ef: Merge "Rewritten file pager."Elliott Hughes2015-04-112-65/+88
|\| | | | | | |
| * | | | | | | am 0e3781ef: Merge "Rewritten file pager."Elliott Hughes2015-04-112-65/+88
| |\| | | | | |
| | * | | | | | Merge "Rewritten file pager."Elliott Hughes2015-04-112-65/+88
| | |\ \ \ \ \ \
| | | * | | | | | Rewritten file pager.Elliott Hughes2015-04-112-65/+88
* | | | | | | | | am dd4d48be: am 558ba1ba: Merge "Revert "Append kernel logs to last_log file""Tao Bao2015-04-111-46/+42
|\| | | | | | | |
| * | | | | | | | am 558ba1ba: Merge "Revert "Append kernel logs to last_log file""Tao Bao2015-04-111-46/+42
| |\| | | | | | |
| | * | | | | | | Merge "Revert "Append kernel logs to last_log file""Tao Bao2015-04-111-46/+42
| | |\ \ \ \ \ \ \
| | | * | | | | | | Revert "Append kernel logs to last_log file"Tao Bao2015-04-111-46/+42
* | | | | | | | | | am fa51b50a: am 464c3e71: Merge "Append kernel logs to last_log file"Tao Bao2015-04-111-42/+46
|\| | | | | | | | |
| * | | | | | | | | am 464c3e71: Merge "Append kernel logs to last_log file"Tao Bao2015-04-111-42/+46
| |\| | | | | | | |
| | * | | | | | | | Merge "Append kernel logs to last_log file"Tao Bao2015-04-111-42/+46
| | |\| | | | | | |
| | | * | | | | | | Append kernel logs to last_log fileTao Bao2015-04-111-42/+46
* | | | | | | | | | am 57ca725d: am 6d1bd3d3: Merge "Update the comments for package installer commands"Tao Bao2015-04-111-1/+13
|\| | | | | | | | |
| * | | | | | | | | am 6d1bd3d3: Merge "Update the comments for package installer commands"Tao Bao2015-04-111-1/+13
| |\| | | | | | | |
| | * | | | | | | | Merge "Update the comments for package installer commands"Tao Bao2015-04-111-1/+13
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Update the comments for package installer commandsTao Bao2015-04-111-1/+13
| | | |/ / / / / /
* | | | | | | | | am 34bbc7d4: am f19007a5: Merge "Auto-detect whether to use the long-press UI."Elliott Hughes2015-04-116-41/+56
|\| | | | | | | |
| * | | | | | | | am f19007a5: Merge "Auto-detect whether to use the long-press UI."Elliott Hughes2015-04-116-41/+56
| |\| | | | | | |
| | * | | | | | | Merge "Auto-detect whether to use the long-press UI."Elliott Hughes2015-04-116-41/+56
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Auto-detect whether to use the long-press UI.Elliott Hughes2015-04-116-41/+56
| | |/ / / / / /
* | | | | | | | am a90ba39b: am 51697d27: Merge "Switch minadb over to C++."Elliott Hughes2015-04-109-31/+24
|\| | | | | | |
| * | | | | | | am 51697d27: Merge "Switch minadb over to C++."Elliott Hughes2015-04-109-31/+24
| |\| | | | | |
| | * | | | | | Merge "Switch minadb over to C++."Elliott Hughes2015-04-109-31/+24
| | |\ \ \ \ \ \
| | | * | | | | | Switch minadb over to C++.Elliott Hughes2015-04-109-31/+24
| | |/ / / / / /
* | | | | | | | am 53b8ca4b: am 23017c5d: Merge "Switch minui over to C++."Elliott Hughes2015-04-108-102/+82
|\| | | | | | |
| * | | | | | | am 23017c5d: Merge "Switch minui over to C++."Elliott Hughes2015-04-108-102/+82
| |\| | | | | |
| | * | | | | | Merge "Switch minui over to C++."Elliott Hughes2015-04-108-102/+82
| | |\ \ \ \ \ \
| | | * | | | | | Switch minui over to C++.Elliott Hughes2015-04-108-102/+82
| | |/ / / / / /
* | | | | | | | am 9b0ebf99: am 5d1630a9: Merge "Fix ScreenRecoveryUI to handle devices without power/up/down."Elliott Hughes2015-04-107-48/+96
|\| | | | | | |
| * | | | | | | am 5d1630a9: Merge "Fix ScreenRecoveryUI to handle devices without power/up/down."Elliott Hughes2015-04-107-48/+96
| |\| | | | | |
| | * | | | | | Merge "Fix ScreenRecoveryUI to handle devices without power/up/down."Elliott Hughes2015-04-107-48/+96
| | |\ \ \ \ \ \
| | | * | | | | | Fix ScreenRecoveryUI to handle devices without power/up/down.Elliott Hughes2015-04-107-48/+96
| | |/ / / / / /
* | | | | | | | am c22f5774: am 6b0dd1d7: Merge "Move "Mount /system" to the main menu."Elliott Hughes2015-04-106-55/+42
|\| | | | | | |
| * | | | | | | am 6b0dd1d7: Merge "Move "Mount /system" to the main menu."Elliott Hughes2015-04-106-55/+42
| |\| | | | | |
| | * | | | | | Merge "Move "Mount /system" to the main menu."Elliott Hughes2015-04-106-55/+42
| | |\ \ \ \ \ \
| | | * | | | | | Move "Mount /system" to the main menu.Elliott Hughes2015-04-106-55/+42
| | |/ / / / / /
* | | | | | | | am 10dacbce: am 18eaa0cf: Merge "Add ev_iterate_available_keys to minui."Elliott Hughes2015-04-103-94/+126
|\| | | | | | |
| * | | | | | | am 18eaa0cf: Merge "Add ev_iterate_available_keys to minui."Elliott Hughes2015-04-103-94/+126
| |\| | | | | |
| | * | | | | | Merge "Add ev_iterate_available_keys to minui."Elliott Hughes2015-04-103-94/+126
| | |\ \ \ \ \ \
| | | * | | | | | Add ev_iterate_available_keys to minui.Elliott Hughes2015-04-103-94/+126
| | |/ / / / / /
* | | | | | | | am 5f3dee94: am f471861e: Merge "Move the recovery image version out of the menu header."Elliott Hughes2015-04-101-21/+7
|\| | | | | | |
| * | | | | | | am f471861e: Merge "Move the recovery image version out of the menu header."Elliott Hughes2015-04-101-21/+7
| |\| | | | | |
| | * | | | | | Merge "Move the recovery image version out of the menu header."Elliott Hughes2015-04-101-21/+7
| | |\ \ \ \ \ \
| | | * | | | | | Move the recovery image version out of the menu header.Elliott Hughes2015-04-101-21/+7
| | |/ / / / / /
* | | | | | | | am 7b66aaeb: am e001074f: Merge "Move default implementations into Device."Elliott Hughes2015-04-104-84/+99
|\| | | | | | |
| * | | | | | | am e001074f: Merge "Move default implementations into Device."Elliott Hughes2015-04-104-84/+99
| |\| | | | | |
| | * | | | | | Merge "Move default implementations into Device."Elliott Hughes2015-04-104-84/+99
| | |\ \ \ \ \ \
| | | * | | | | | Move default implementations into Device.Elliott Hughes2015-04-094-84/+99
* | | | | | | | | am 0c23c97c: am 06522ef5: Merge "Remove some commented-out code."Elliott Hughes2015-04-091-10/+0
|\| | | | | | | |
| * | | | | | | | am 06522ef5: Merge "Remove some commented-out code."Elliott Hughes2015-04-091-10/+0
| |\| | | | | | |
| | * | | | | | | Merge "Remove some commented-out code."Elliott Hughes2015-04-091-10/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Remove some commented-out code.Elliott Hughes2015-04-091-10/+0
| | |/ / / / / /
* | | | | | | | am 382ec478: am 52222a58: Merge "Move file paging into ScreenRecoveryUI."Elliott Hughes2015-04-095-95/+104
|\| | | | | | |
| * | | | | | | am 52222a58: Merge "Move file paging into ScreenRecoveryUI."Elliott Hughes2015-04-095-95/+104
| |\| | | | | |
| | * | | | | | Merge "Move file paging into ScreenRecoveryUI."Elliott Hughes2015-04-095-95/+104
| | |\ \ \ \ \ \
| | | * | | | | | Move file paging into ScreenRecoveryUI.Elliott Hughes2015-04-095-95/+104
| | |/ / / / / /
* | | | | | | | am 36640972: am fbde407e: Merge "Enable printf format argument checking."Elliott Hughes2015-04-094-5/+5
|\| | | | | | |
| * | | | | | | am fbde407e: Merge "Enable printf format argument checking."Elliott Hughes2015-04-094-5/+5
| |\| | | | | |
| | * | | | | | Merge "Enable printf format argument checking."Elliott Hughes2015-04-094-5/+5
| | |\ \ \ \ \ \
| | | * | | | | | Enable printf format argument checking.Elliott Hughes2015-04-094-5/+5
| | |/ / / / / /
* | | | | | | | am 0d4f2b6d: am 900c9a61: Merge "Remove the fixed screen size assumptions."Elliott Hughes2015-04-092-32/+37
|\| | | | | | |
| * | | | | | | am 900c9a61: Merge "Remove the fixed screen size assumptions."Elliott Hughes2015-04-092-32/+37
| |\| | | | | |
| | * | | | | | Merge "Remove the fixed screen size assumptions."Elliott Hughes2015-04-092-32/+37
| | |\ \ \ \ \ \
| | | * | | | | | Remove the fixed screen size assumptions.Elliott Hughes2015-04-092-32/+37
* | | | | | | | | am 72ba6264: am 64346eae: Merge "Remove a couple of unused inlines from minzip/Zip.h."Elliott Hughes2015-04-091-10/+0
|\| | | | | | | |
| * | | | | | | | am 64346eae: Merge "Remove a couple of unused inlines from minzip/Zip.h."Elliott Hughes2015-04-091-10/+0
| |\| | | | | | |
| | * | | | | | | Merge "Remove a couple of unused inlines from minzip/Zip.h."Elliott Hughes2015-04-091-10/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Remove a couple of unused inlines from minzip/Zip.h.Elliott Hughes2015-04-081-10/+0
| | |/ / / / / /
* | | | | | | | am 0a7c1694: am ca7bf531: Merge "Rotate logs only when there are actual operations"Tao Bao2015-04-084-9/+33
|\| | | | | | |
| * | | | | | | am ca7bf531: Merge "Rotate logs only when there are actual operations"Tao Bao2015-04-084-9/+33
| |\| | | | | |
| | * | | | | | Merge "Rotate logs only when there are actual operations"Tao Bao2015-04-084-9/+33
| | |\ \ \ \ \ \
| | | * | | | | | Rotate logs only when there are actual operationsTao Bao2015-04-084-9/+33
| | |/ / / / / /
* | | | | | | | am 575e3739: am 6896f9d4: Merge "always use volume mount option when mounting a partition"Tao Bao2015-04-011-1/+1
|\| | | | | | |
| * | | | | | | am 6896f9d4: Merge "always use volume mount option when mounting a partition"Tao Bao2015-04-011-1/+1
| |\| | | | | |
| | * | | | | | Merge "always use volume mount option when mounting a partition"Tao Bao2015-04-011-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | always use volume mount option when mounting a partitionGaelle Nassiet2015-03-241-1/+1
* | | | | | | | | am 8cd389c8: am ccc82eca: Merge "Refactor the codes to call wipe_data/wipe_cache functions"Tao Bao2015-04-011-22/+36
|\| | | | | | | |
| * | | | | | | | am ccc82eca: Merge "Refactor the codes to call wipe_data/wipe_cache functions"Tao Bao2015-04-011-22/+36
| |\| | | | | | |
| | * | | | | | | Merge "Refactor the codes to call wipe_data/wipe_cache functions"Tao Bao2015-04-011-22/+36
| | |\ \ \ \ \ \ \
| | | * | | | | | | Refactor the codes to call wipe_data/wipe_cache functionsTao Bao2015-03-311-22/+36
| | |/ / / / / / /
* | | | | | | | | am 9e1bba1f: am 9295980a: Merge "Revert "Erase PST partition if its marked to be erased.""Tao Bao2015-03-310-0/+0
|\| | | | | | | |
| * | | | | | | | am 9295980a: Merge "Revert "Erase PST partition if its marked to be erased.""Tao Bao2015-03-313-44/+0
| |\| | | | | | |
| | * | | | | | | Merge "Revert "Erase PST partition if its marked to be erased.""Tao Bao2015-03-313-44/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | Revert "Erase PST partition if its marked to be erased."Andres Morales2015-03-313-44/+0
| | |/ / / / / / /
* | | | | | | | | resolved conflicts for merge of 5472176c to masterTao Bao2015-03-311-26/+49
|\| | | | | | | |
| * | | | | | | | am 20e82d4f: Merge "Add support to enter sideload mode directly"Tao Bao2015-03-311-26/+49
| |\| | | | | | |
| | * | | | | | | Merge "Add support to enter sideload mode directly"Tao Bao2015-03-311-26/+49
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add support to enter sideload mode directlyTao Bao2015-03-301-26/+49
| | |/ / / / / / /
* | / / / / / / / Revert "Erase PST partition if its marked to be erased."Andres Morales2015-03-303-44/+0
|/ / / / / / / /
* | | | | | | | am dac24865: Merge "Factor out the "yes/no" menu and use it for "Wipe cache" too."Elliott Hughes2015-03-261-60/+35
|\| | | | | | |
| * | | | | | | Merge "Factor out the "yes/no" menu and use it for "Wipe cache" too."Elliott Hughes2015-03-261-60/+35
| |\ \ \ \ \ \ \
| | * | | | | | | Factor out the "yes/no" menu and use it for "Wipe cache" too.Elliott Hughes2015-03-261-60/+35
| |/ / / / / / /
* | | | | | | | am 43b80810: Merge "Factor out option variables from int to bool types"Tao Bao2015-03-265-14/+16
|\| | | | | | |
| * | | | | | | Merge "Factor out option variables from int to bool types"Tao Bao2015-03-265-14/+16
| |\ \ \ \ \ \ \
| | * | | | | | | Factor out option variables from int to bool typesTao Bao2015-03-255-14/+16
| |/ / / / / / /
* | | | | | | | am e31f9565: Merge "Remove support for Cupcake kernels."Elliott Hughes2015-03-251-17/+0
|\| | | | | | |
| * | | | | | | Merge "Remove support for Cupcake kernels."Elliott Hughes2015-03-251-17/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Remove support for Cupcake kernels.Elliott Hughes2015-03-241-17/+0
| |/ / / / / / /
* | | | | | | | am 9460bb2c: Merge "Fix recovery image text rendering."Elliott Hughes2015-03-243-32/+25
|\| | | | | | |
| * | | | | | | Merge "Fix recovery image text rendering."Elliott Hughes2015-03-243-32/+25
| |\ \ \ \ \ \ \
| | * | | | | | | Fix recovery image text rendering.Elliott Hughes2015-03-243-32/+25
| |/ / / / / / /
* | | | | | | | am 47733eaf: Merge "Fix wipe command when using sideload in recovery"Elliott Hughes2015-03-241-52/+47
|\| | | | | | |
| * | | | | | | Merge "Fix wipe command when using sideload in recovery"Elliott Hughes2015-03-241-52/+47
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix wipe command when using sideload in recoveryChristian Poetzsch2015-03-241-52/+47
| |/ / / / / /
* | | | | | | am 733deb26: Merge "Make the recovery menus wrap."Elliott Hughes2015-03-241-2/+5
|\| | | | | |
| * | | | | | Merge "Make the recovery menus wrap."Elliott Hughes2015-03-241-2/+5
| |\ \ \ \ \ \
| | * | | | | | Make the recovery menus wrap.Elliott Hughes2015-03-231-2/+5
* | | | | | | | am 31e47876: Merge "Always use strerror to report errno in recovery."Elliott Hughes2015-03-233-26/+27
|\| | | | | | |
| * | | | | | | Merge "Always use strerror to report errno in recovery."Elliott Hughes2015-03-233-26/+27
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Always use strerror to report errno in recovery.Elliott Hughes2015-03-233-26/+27
| |/ / / / / /
* | | | | | | am e944944f: Merge "Add "Apply update from sdcard" to default recovery image."Elliott Hughes2015-03-233-20/+44
|\| | | | | |
| * | | | | | Merge "Add "Apply update from sdcard" to default recovery image."Elliott Hughes2015-03-233-20/+44
| |\ \ \ \ \ \
| | * | | | | | Add "Apply update from sdcard" to default recovery image.Elliott Hughes2015-03-233-20/+44
| |/ / / / / /
* | | | | | | am 8c637903: Merge "Remove unused libutils references."Dan Albert2015-03-142-2/+1
|\| | | | | |
| * | | | | | Merge "Remove unused libutils references."Dan Albert2015-03-142-2/+1
| |\ \ \ \ \ \
| | * | | | | | Remove unused libutils references.Dan Albert2015-03-142-2/+1
| |/ / / / / /
* | | | | | | git commit -m "resolved conflicts for merge of d29f641b to stage-aosp-master"Dan Albert2015-03-125-462/+1553
|\| | | | | |
| * | | | | | am d5369e5d: (-s ours) am 18f371d8: updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatchTao Bao2015-03-120-0/+0
| |\ \ \ \ \ \
| | * | | | | | am 18f371d8: updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatchTao Bao2015-03-112-14/+29
| | |\| | | | |
| | | * | | | | updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatchTao Bao2015-03-112-14/+29
| * | | | | | | am cc368fde: am 8290aa50: Merge "Install the recovery binary directly to the recovery image."Ying Wang2015-03-120-0/+0
| |\| | | | | |
| | * | | | | | am 8290aa50: Merge "Install the recovery binary directly to the recovery image."Ying Wang2015-03-111-5/+1
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge "Install the recovery binary directly to the recovery image."Ying Wang2015-03-111-5/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Install the recovery binary directly to the recovery image.Ying Wang2015-03-111-5/+1
|/ / / / / / / /
| * | | | | | | Install the recovery binary directly to the recovery image.Ying Wang2015-03-101-5/+1
| * | | | | | | am fb7d8965: am 023e4374: am 579b9299: (-s ours) Merge "Remove more dead code from minzip."Narayan Kamath2015-02-270-0/+0
| |\| | | | | |
| | * | | | | | am 023e4374: am 579b9299: (-s ours) Merge "Remove more dead code from minzip."Narayan Kamath2015-02-270-0/+0
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | am 579b9299: (-s ours) Merge "Remove more dead code from minzip."Narayan Kamath2015-02-270-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "Remove more dead code from minzip."Narayan Kamath2015-02-273-108/+59
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove more dead code from minzip.Narayan Kamath2015-02-273-108/+59
| |/ / / / / / / /
| | * | | | | | | am 66f94728: am 3deba524: am ecead276: Merge "Add tests for read_block_adb."Dan Albert2015-02-274-16/+124
| | |\| | | | | |
| | | * | | | | | am 3deba524: am ecead276: Merge "Add tests for read_block_adb."Dan Albert2015-02-274-16/+124
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | am ecead276: Merge "Add tests for read_block_adb."Dan Albert2015-02-274-16/+124
|\| | | | | | | |
| * | | | | | | | Merge "Add tests for read_block_adb."Dan Albert2015-02-274-16/+124
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add tests for read_block_adb.Dan Albert2015-02-274-16/+124
| |/ / / / / / / /
| | * | | | | | | Remove more dead code from minzip.Narayan Kamath2015-02-273-114/+65
| | * | | | | | | am 0257d107: am 71c45429: am f66bf339: am 3e91f691: Bump up max_map_count value.Jesse Zhao2015-02-270-0/+0
| | |\| | | | | |
| | | * | | | | | am 71c45429: am f66bf339: am 3e91f691: Bump up max_map_count value.Jesse Zhao2015-02-270-0/+0
| | | |\| | | | |
| | | | * | | | | am f66bf339: am 3e91f691: Bump up max_map_count value.Jesse Zhao2015-02-270-0/+0
| | | | |\| | | |
| | | | | * | | | am 3e91f691: Bump up max_map_count value.Jesse Zhao2015-02-271-0/+1
| | | | | |\| | |
| | | | | | * | | Bump up max_map_count value.Jesse Zhao2015-02-251-0/+1
| | * | | | | | | am 9b14c4b0: am 735a0f0f: am cab0beb9: Merge "This read accidentally got turned in to a write."Dan Albert2015-02-271-1/+1
| | |\| | | | | |
| | | * | | | | | am 735a0f0f: am cab0beb9: Merge "This read accidentally got turned in to a write."Dan Albert2015-02-271-1/+1
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | am cab0beb9: Merge "This read accidentally got turned in to a write."Dan Albert2015-02-271-1/+1
|\| | | | | | | |
| * | | | | | | | Merge "This read accidentally got turned in to a write."Dan Albert2015-02-261-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | This read accidentally got turned in to a write.Dan Albert2015-02-261-1/+1
| | | * | | | | | | am d9bbeaec: am 83e5d1dc: am c9bc3cc9: Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk"Narayan Kamath2015-02-261-4/+1
| | | |\| | | | | |
| | | | * | | | | | am 83e5d1dc: am c9bc3cc9: Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk"Narayan Kamath2015-02-261-4/+1
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | am c9bc3cc9: Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk"Narayan Kamath2015-02-261-4/+1
|\| | | | | | | | |
| * | | | | | | | | Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk"Narayan Kamath2015-02-261-4/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mkTrevor Drake2015-02-261-4/+1
| |/ / / / / / / /
| | * | | | | | | am 381f6416: am eef962bf: am 9255ad4a: Merge "Fix readx/writex names."Dan Albert2015-02-261-4/+6
| | |\| | | | | |
| | | * | | | | | am eef962bf: am 9255ad4a: Merge "Fix readx/writex names."Dan Albert2015-02-261-4/+6
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | am 9255ad4a: Merge "Fix readx/writex names."Dan Albert2015-02-261-4/+6
|\| | | | | | | |
| * | | | | | | | Merge "Fix readx/writex names."Dan Albert2015-02-261-4/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix readx/writex names.Dan Albert2015-02-261-4/+6
| |/ / / / / / / /
| | * | | | | | | am 94cb7fdc: am d795dcc5: am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."Dan Albert2015-02-251-2/+0
| | |\| | | | | |
| | | * | | | | | am d795dcc5: am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."Dan Albert2015-02-251-2/+0
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."Dan Albert2015-02-251-2/+0
|\| | | | | | | |
| * | | | | | | | Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."Dan Albert2015-02-251-2/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove _(GNU|XOPEN)_SORUCE makefile cruft.Dan Albert2015-02-251-2/+0
| | | * | | | | | | am 07d2542d: am b3f4ed86: am 82eea3fd: Merge "Fix LP64 build for minadbd."Narayan Kamath2015-02-251-2/+2
| | | |\| | | | | |
| | | | * | | | | | am b3f4ed86: am 82eea3fd: Merge "Fix LP64 build for minadbd."Narayan Kamath2015-02-251-2/+2
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | am 82eea3fd: Merge "Fix LP64 build for minadbd."Narayan Kamath2015-02-251-2/+2
|\| | | | | | | | |
| * | | | | | | | | Merge "Fix LP64 build for minadbd."Narayan Kamath2015-02-251-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix LP64 build for minadbd.Narayan Kamath2015-02-251-2/+2
| |/ / / / / / / /
| | * | | | | | | am 8007a21e: am 6deb3d5c: am 35fbf787: Merge "Fix build from implicit declaration."Dan Albert2015-02-254-18/+23
| | |\| | | | | |
| | | * | | | | | am 6deb3d5c: am 35fbf787: Merge "Fix build from implicit declaration."Dan Albert2015-02-254-18/+23
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | am 35fbf787: Merge "Fix build from implicit declaration."Dan Albert2015-02-254-18/+23
|\| | | | | | | |
| * | | | | | | | Merge "Fix build from implicit declaration."Dan Albert2015-02-254-18/+23
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix build from implicit declaration.Dan Albert2015-02-254-18/+23
| |/ / / / / / / /
| | * | | | | | | am 218dab7f: am 6f58e899: am 829d392a: Merge "Delete unused functions from minzip."Narayan Kamath2015-02-242-93/+1
| | |\| | | | | |
| | | * | | | | | am 6f58e899: am 829d392a: Merge "Delete unused functions from minzip."Narayan Kamath2015-02-242-93/+1
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | am 829d392a: Merge "Delete unused functions from minzip."Narayan Kamath2015-02-242-93/+1
|\| | | | | | | |
| * | | | | | | | Merge "Delete unused functions from minzip."Narayan Kamath2015-02-242-93/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Delete unused functions from minzip.Narayan Kamath2015-02-232-93/+1
| | | * | | | | | | am 37e68a1d: am f9ee77ab: am 9e95c515: Merge "Fix a printf format warning."Narayan Kamath2015-02-240-0/+0
| | | |\| | | | | |
| | | | * | | | | | am f9ee77ab: am 9e95c515: Merge "Fix a printf format warning."Narayan Kamath2015-02-240-0/+0
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | am 9e95c515: Merge "Fix a printf format warning."Narayan Kamath2015-02-240-0/+0
|\| | | | | | | | |
| * | | | | | | | | Merge "Fix a printf format warning."Narayan Kamath2015-02-241-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix a printf format warning.Narayan Kamath2015-02-231-1/+1
| |/ / / / / / / /
| | * | | | | | | am dda456b5: am 552fceb8: am 2d102225: Merge "Kill of most of the remainder of minadbd."Dan Albert2015-02-208-1576/+9
| | |\| | | | | |
| | | * | | | | | am 552fceb8: am 2d102225: Merge "Kill of most of the remainder of minadbd."Dan Albert2015-02-208-1576/+9
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | am 2d102225: Merge "Kill of most of the remainder of minadbd."Dan Albert2015-02-208-1576/+9
|\| | | | | | | |
| * | | | | | | | Merge "Kill of most of the remainder of minadbd."Dan Albert2015-02-208-1576/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Kill of most of the remainder of minadbd.Dan Albert2015-02-208-1576/+9
| |/ / / / / / / /
| | * | | | | | | am a1df1a77: am c2b60b98: Merge commit \'f8dd04e1a5f94e7accf65a5375114ac7fa73f828\' into HEADBill Yi2015-02-200-0/+0
| | |\| | | | | |
| | | * | | | | | am c2b60b98: Merge commit \'f8dd04e1a5f94e7accf65a5375114ac7fa73f828\' into HEADBill Yi2015-02-200-0/+0
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge commit 'f8dd04e1a5f94e7accf65a5375114ac7fa73f828' into HEADBill Yi2015-02-1911-118/+584
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| | * | | | | | | am 9613bd32: am 4eb6c71e: Merge "Move adb_main to its own file."Dan Albert2015-02-193-30/+42
| | |\| | | | | |
| | | * | | | | | am 4eb6c71e: Merge "Move adb_main to its own file."Dan Albert2015-02-193-30/+42
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge "Move adb_main to its own file."Dan Albert2015-02-193-30/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move adb_main to its own file.Dan Albert2015-02-193-30/+42
|/ / / / / / / / /
| | * | | | | | | am 91f68a47: am 5d22a5b5: Merge "Remove dead code."Dan Albert2015-02-191-38/+0
| | |\| | | | | |
| | | * | | | | | am 5d22a5b5: Merge "Remove dead code."Dan Albert2015-02-191-38/+0
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge "Remove dead code."Dan Albert2015-02-191-38/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove dead code.Dan Albert2015-02-191-38/+0
| | | * | | | | | | am 43162fe5: am 076f5479: Merge "Use headers from adb."Dan Albert2015-02-197-663/+7
| | | |\| | | | | |
| | | | * | | | | | am 076f5479: Merge "Use headers from adb."Dan Albert2015-02-197-663/+7
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "Use headers from adb."Dan Albert2015-02-197-663/+7
|\| | | | | | | | |
| * | | | | | | | | Use headers from adb.Dan Albert2015-02-197-663/+7
|/ / / / / / / / /
| | * | | | | | | am 61398da2: am bbf627a6: Merge "Remove unused code."Dan Albert2015-02-193-183/+0
| | |\| | | | | |
| | | * | | | | | am bbf627a6: Merge "Remove unused code."Dan Albert2015-02-193-183/+0
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge "Remove unused code."Dan Albert2015-02-193-183/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused code.Dan Albert2015-02-193-183/+0
| | | * | | | | | | am bf1476de: am 4db055d6: Merge "Lose USB transport code to libadb."Dan Albert2015-02-196-1470/+3
| | | |\| | | | | |
| | | | * | | | | | am 4db055d6: Merge "Lose USB transport code to libadb."Dan Albert2015-02-196-1470/+3
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "Lose USB transport code to libadb."Dan Albert2015-02-196-1470/+3
|\| | | | | | | | |
| * | | | | | | | | Lose USB transport code to libadb.Dan Albert2015-02-196-1470/+3
|/ / / / / / / / /
| | * | | | | | | am ecb0ad25: am 37e933a7: Merge "Add extern "C" to all the headers."Dan Albert2015-02-196-0/+52
| | |\| | | | | |
| | | * | | | | | am 37e933a7: Merge "Add extern "C" to all the headers."Dan Albert2015-02-186-0/+52
| | |/| | | | | | | |/|/ / / / / / | |/| | | | | | |/| | | | | | |
* | | | | | | | Merge "Add extern "C" to all the headers."Dan Albert2015-02-186-0/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | Add extern "C" to all the headers.Dan Albert2015-02-186-0/+52
|/ / / / / / / /
| | * | | | | | Initialize stashbase even stash_max_blocks = 0Jesse Zhao2015-02-181-1/+1
| | * | | | | | am f8dd04e1: am ff934d02: Merge "Fix Droid and animation color in recovery mode"Elliott Hughes2015-02-125-14/+25
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am ff934d02: Merge "Fix Droid and animation color in recovery mode"Elliott Hughes2015-02-125-14/+25
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge "Fix Droid and animation color in recovery mode"Elliott Hughes2015-02-125-14/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix Droid and animation color in recovery modeTony Kuo2015-02-125-14/+25
|/ / / / / / / /
| | * | | | | | am adf71bf7: am 5db3f978: Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined"Elliott Hughes2015-02-111-1/+3
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 5db3f978: Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined"Elliott Hughes2015-02-111-1/+3
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined"Elliott Hughes2015-02-111-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix build when TARGET_USERIMAGES_USE_EXT4 is not definedAdrien Grassein2014-11-071-1/+3
| | | * | | | | | am 98e2c509: am 78aa50d3: Merge "recovery: Handle EV_SW events"Elliott Hughes2015-02-111-2/+2
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | am 78aa50d3: Merge "recovery: Handle EV_SW events"Elliott Hughes2015-02-111-2/+2
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "recovery: Handle EV_SW events"Elliott Hughes2015-02-111-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | recovery: Handle EV_SW eventsAjay Dudani2015-02-111-2/+2
|/ / / / / / / / /
| | | * | | | | | am ee7127cc: am bf0be350: Merge "recovery: Generate libminui dynamic library"Elliott Hughes2015-02-111-0/+7
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | am bf0be350: Merge "recovery: Generate libminui dynamic library"Elliott Hughes2015-02-111-0/+7
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "recovery: Generate libminui dynamic library"Elliott Hughes2015-02-111-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | recovery: Generate libminui dynamic libraryAjay Dudani2015-02-111-0/+7
|/ / / / / / / / /
| | | * | | | | | am dcbf4fc5: resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aospElliott Hughes2015-02-113-6/+10
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aospElliott Hughes2015-02-113-6/+10
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "recovery: Properly detect userdebug or eng builds"Elliott Hughes2015-02-113-6/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | recovery: Properly detect userdebug or eng buildsElliott Hughes2015-02-103-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 Kralevich2015-02-093-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 Kralevich2015-02-083-23/+8
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read"Nick Kralevich2015-02-083-23/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove dead/unused code and realign some of the commentsNanik Tolaram2015-02-083-23/+8
|/ / / / / / / / /
| | | * | | | | | am 42b09d25: am 6a0d2fbc: Merge "There\'s no GPL code in \'updater\'."Elliott Hughes2015-02-092-339/+0
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | am 6a0d2fbc: Merge "There\'s no GPL code in \'updater\'."Elliott Hughes2015-02-072-339/+0
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "There's no GPL code in 'updater'."Elliott Hughes2015-02-072-339/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | There's no GPL code in 'updater'.Elliott Hughes2015-02-052-339/+0
|/ / / / / / / / /
| | | * | | | | | Merge "Support resuming block based OTAs"Sami Tolvanen2015-02-061-346/+1460
| | | |\ \ \ \ \ \
| | | | * | | | | | Support resuming block based OTAsSami Tolvanen2015-01-301-346/+1460
| | | * | | | | | | am 40862ab5: am aeecac54: Merge "Add missing includes."Elliott Hughes2015-01-3011-0/+12
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| / / / / / / | | | |/ / / / / /
| | * | | | | | | am aeecac54: Merge "Add missing includes."Elliott Hughes2015-01-3011-0/+12
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "Add missing includes."Elliott Hughes2015-01-3011-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing includes.Elliott Hughes2015-01-3011-0/+12
|/ / / / / / / / /
| | | * | | | | | am 22b8fe96: am dab56cac: Merge "Add missing includes."Elliott Hughes2015-01-284-2/+6
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | am dab56cac: Merge "Add missing includes."Elliott Hughes2015-01-284-2/+6
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "Add missing includes."Elliott Hughes2015-01-284-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing includes.Elliott Hughes2015-01-284-2/+6
|/ / / / / / / / /
| | | * | | | | | am 88c30fb6: am eaeb55f7: Merge "Start losing code to libadb."Dan Albert2015-01-273-698/+1
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | am eaeb55f7: Merge "Start losing code to libadb."Dan Albert2015-01-273-698/+1
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "Start losing code to libadb."Dan Albert2015-01-273-698/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Start losing code to libadb.Dan Albert2014-11-253-698/+1
| | | | * | | | | | am 2d67a483: am cdc38d04: Merge "Fix the v2 descriptor handling."Christopher Ferris2015-01-261-11/+6
| | | | |\ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | am cdc38d04: Merge "Fix the v2 descriptor handling."Christopher Ferris2015-01-261-11/+6
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "Fix the v2 descriptor handling."Christopher Ferris2015-01-261-11/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix the v2 descriptor handling.Christopher Ferris2015-01-261-11/+6
| | | | | * | | | | | am efa16af5: am cad5ce81: Merge "adbd: Support for new f_fs descriptor format"Christopher Ferris2015-01-260-0/+0
| | | | | |\ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | am cad5ce81: Merge "adbd: Support for new f_fs descriptor format"Christopher Ferris2015-01-261-54/+107
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge "adbd: Support for new f_fs descriptor format"Christopher Ferris2015-01-261-54/+107
|\| | | | | | | | | |
| * | | | | | | | | | adbd: Support for new f_fs descriptor formatBadhri Jagan Sridharan2015-01-261-54/+107
| | | | | * | | | | | am 4db9c893: am d4069928: Merge "Add missing <string.h> include."Elliott Hughes2015-01-251-0/+1
| | | | | |\ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | am d4069928: Merge "Add missing <string.h> include."Elliott Hughes2015-01-251-0/+1
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge "Add missing <string.h> include."Elliott Hughes2015-01-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add missing <string.h> include.Elliott Hughes2015-01-251-0/+1
| | | | | * | | | | | am e84e9310: am eade3a80: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-231-1/+0
| | | | | |\ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | am eade3a80: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-231-1/+0
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-231-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove superfluous OpenSSL include paths.Adam Langley2015-01-231-1/+0
|/ / / / / / / / / /
| | | | * | | | | | am 465e8702: am 5bf74b23: Bump up max_map_count value.Jesse Zhao2015-01-151-0/+1
| | | | |\ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | am 5bf74b23: Bump up max_map_count value.Jesse Zhao2015-01-151-0/+1
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Bump up max_map_count value.Jesse Zhao2015-01-091-0/+1
| | | | | * | | | | am 479e5108: am dd719dfe: Merge "Use getmntent when accessing /proc/mounts."Yabin Cui2015-01-061-75/+14
| | | | | |\ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | am dd719dfe: Merge "Use getmntent when accessing /proc/mounts."Yabin Cui2015-01-061-75/+14
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "Use getmntent when accessing /proc/mounts."Yabin Cui2015-01-061-75/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use getmntent when accessing /proc/mounts.Yabin Cui2015-01-021-75/+14
| | | | | | * | | | | am 6bec0e51: am a5d63956: Merge "Remove an uninitialized value."Dan Albert2015-01-051-2/+1
| | | | | | |\ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | |
| | | | * | | | | | | am a5d63956: Merge "Remove an uninitialized value."Dan Albert2015-01-051-2/+1
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge "Remove an uninitialized value."Dan Albert2015-01-051-2/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove an uninitialized value.Dan Albert2014-12-181-2/+1
| | | | | | * | | | | am 6bb8f476: am 538d7d83: Merge "Fix missing #includes in bootable/recovery."Elliott Hughes2014-12-302-2/+4
| | | | | | |\ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | |
| | | | * | | | | | | am 538d7d83: Merge "Fix missing #includes in bootable/recovery."Elliott Hughes2014-12-302-2/+4
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge "Fix missing #includes in bootable/recovery."Elliott Hughes2014-12-292-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix missing #includes in bootable/recovery.Elliott Hughes2014-12-292-2/+4
|/ / / / / / / / / /
| | | | | * | | | | am 8af7c5df: am a72512cd: Add O_CREAT option for openSungmin Choi2014-12-111-2/+10
| | | | | |\ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | am a72512cd: Add O_CREAT option for openSungmin Choi2014-12-111-2/+10
| | | |\| | | | | |
| | | | * | | | | | Add O_CREAT option for openSungmin Choi2014-12-111-2/+10
| | | | | * | | | | am cb1a7502: am f59b9942: Add basic navigation controls to log viewer.Patrick Tjin2014-12-101-2/+36
| | | | | |\ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | am f59b9942: Add basic navigation controls to log viewer.Patrick Tjin2014-12-101-2/+36
| | | |\| | | | | |
| | | | * | | | | | Add basic navigation controls to log viewer.Patrick Tjin2014-12-101-2/+36
| | | | | * | | | | am 8e8d5de4: am cd055ee7: Save kernel logs to /cache/recoveryPatrick Tjin2014-12-101-6/+60
| | | | | |\ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | am cd055ee7: Save kernel logs to /cache/recoveryPatrick Tjin2014-12-101-6/+60
| | | |\| | | | | |
| | | | * | | | | | Save kernel logs to /cache/recoveryPatrick Tjin2014-12-101-6/+60
| | | | | * | | | | am 4f9fcffc: am 37ad1f12: Merge "Force write to disk while doing uncrypt" into lmp-mr1-devMichael Runge2014-12-101-5/+10
| | | | | |\ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | am 37ad1f12: Merge "Force write to disk while doing uncrypt" into lmp-mr1-devMichael Runge2014-12-101-5/+10
| | | |\| | | | | |
| | | | * | | | | | Merge "Force write to disk while doing uncrypt" into lmp-mr1-devMichael Runge2014-12-101-5/+10
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Force write to disk while doing uncryptMichael Runge2014-11-221-5/+10
| | | | | | * | | | | am cdce7f7e: am c43b17f0: Merge "Fix recovery image build for 32p"Ying Wang2014-12-021-1/+1
| | | | | | |\ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | am c43b17f0: Merge "Fix recovery image build for 32p"Ying Wang2014-12-021-1/+1
| | | |\ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge "Fix recovery image build for 32p"Ying Wang2014-12-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix recovery image build for 32pBruce Beare2014-12-011-1/+1
|/ / / / / / / / / /
| | | | | * | | | | am 0fe938c0: am 5b9c4ce5: am b278c252: Add support for tune2fs file operationsMichael Runge2014-11-240-0/+0
| | | | | |\ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | am 5b9c4ce5: am b278c252: Add support for tune2fs file operationsMichael Runge2014-11-242-0/+43
| | |\| | | | | | |
| | | * | | | | | | am b278c252: Add support for tune2fs file operationsMichael Runge2014-11-242-0/+43
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | / / / / | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Add support for tune2fs file operationsMichael Runge2014-11-212-0/+43
| | | | | * | | | Add support for tune2fs file operationsMichael Runge2014-11-222-0/+43
| | | | | * | | | am 39be2f64: am d34b6378: Merge "Global C++11 compatibility."Dan Albert2014-11-211-3/+4
| | | | | |\ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | am d34b6378: Merge "Global C++11 compatibility."Dan Albert2014-11-211-3/+4
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "Global C++11 compatibility."Dan Albert2014-11-201-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Global C++11 compatibility.Dan Albert2014-11-201-3/+4
|/ / / / / / / / /
| | | | | * | | | am 71fa5392: am de27d4cb: am e5879c36: Byte swap to support BGRA in recovery modeHeather Lee Wilson2014-11-151-0/+12
| | | | | |\ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | am de27d4cb: am e5879c36: Byte swap to support BGRA in recovery modeHeather Lee Wilson2014-11-151-0/+12
| | |\| | | | | |
| | | * | | | | | am e5879c36: Byte swap to support BGRA in recovery modeHeather Lee Wilson2014-11-141-0/+12
| | | |\| | | | |
| | | | * | | | | Byte swap to support BGRA in recovery modeHeather Lee Wilson2014-11-141-0/+12
| | | | | |/ / / | | | | |/| | |
| | | | | * | | am 82ca0ba8: am 92242c70: Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-141-1/+1
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | am 92242c70: Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-131-1/+1
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-131-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | kill HAVE_FORKEXECYabin Cui2014-11-131-1/+1
|/ / / / / / /
| | | | * | | am 8bebe58e: am 2020564f: am be81e51c: Use more aggressive sync writing to applypatch.Michael Runge2014-10-311-8/+36
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am 2020564f: am be81e51c: Use more aggressive sync writing to applypatch.Michael Runge2014-10-311-8/+36
| |\| | | | |
| | * | | | | am be81e51c: Use more aggressive sync writing to applypatch.Michael Runge2014-10-291-8/+36
| | |\| | | |
| | | * | | | Use more aggressive sync writing to applypatch.Michael Runge2014-10-291-8/+36
| | | | * | | am c2e7d903: am e908a454: am 042c3cd0: Force sync files written by minzip.Michael Runge2014-10-311-2/+8
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am e908a454: am 042c3cd0: Force sync files written by minzip.Michael Runge2014-10-311-2/+8
| |\| | | | |
| | * | | | | am 042c3cd0: Force sync files written by minzip.Michael Runge2014-10-291-2/+8
| | |\| | | |
| | | * | | | Force sync files written by minzip.Michael Runge2014-10-291-2/+8
| | | | * | | adbd: Support for new f_fs descriptor formatBadhri Jagan Sridharan2014-10-281-54/+107
| | | | * | | am 8a9ee089: am fe8563f4: am 5ddf4293: Log mount/unmount errors to UIMichael Runge2014-10-251-5/+9
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am fe8563f4: am 5ddf4293: Log mount/unmount errors to UIMichael Runge2014-10-251-5/+9
| |\| | | | |
| | * | | | | am 5ddf4293: Log mount/unmount errors to UIMichael Runge2014-10-251-5/+9
| | |\| | | |
| | | * | | | Log mount/unmount errors to UIMichael Runge2014-10-241-5/+9
| | | | * | | am 944fc5e6: am 915d661c: am 68802416: unconditionally apply SELinux labels to symlinksNick Kralevich2014-10-241-10/+9
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am 915d661c: am 68802416: unconditionally apply SELinux labels to symlinksNick Kralevich2014-10-241-10/+9
| |\| | | | |
| | * | | | | am 68802416: unconditionally apply SELinux labels to symlinksNick Kralevich2014-10-241-10/+9
| | |\| | | |
| | | * | | | unconditionally apply SELinux labels to symlinksNick Kralevich2014-10-241-10/+9
| | | | * | | am 45322f93: am da500cec: am 168f7778: Allow passing of mount args to mountFnMichael Runge2014-10-241-5/+18
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am da500cec: am 168f7778: Allow passing of mount args to mountFnMichael Runge2014-10-241-5/+18
| |\| | | | |
| | * | | | | am 168f7778: Allow passing of mount args to mountFnMichael Runge2014-10-231-5/+18
| | |\| | | |
| | | * | | | Allow passing of mount args to mountFnMichael Runge2014-10-231-5/+18
| | | | * | | am d1e909e7: am 4da9cdea: am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-devBrian Carlstrom2014-10-241-34/+50
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am 4da9cdea: am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-devBrian Carlstrom2014-10-241-34/+50
| |\| | | | |
| | * | | | | am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-devBrian Carlstrom2014-10-231-34/+50
| | |\| | | |
| | | * | | | Merge "Log to UI any metadata setting errors" into lmp-devBrian Carlstrom2014-10-231-34/+50
| | | |\ \ \ \
| | | | * | | | Log to UI any metadata setting errorsMichael Runge2014-10-231-34/+50
| | | | | * | | am 3e62e9d9: am d0602fbb: am 9b2db80d: Merge "Make /cache/recovery/last_log available in recovery" into lmp-devNick Kralevich2014-10-233-5/+76
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | am d0602fbb: am 9b2db80d: Merge "Make /cache/recovery/last_log available in recovery" into lmp-devNick Kralevich2014-10-233-5/+76
| |\| | | | | |
| | * | | | | | am 9b2db80d: Merge "Make /cache/recovery/last_log available in recovery" into lmp-devNick Kralevich2014-10-233-5/+76
| | |\| | | | |
| | | * | | | | Merge "Make /cache/recovery/last_log available in recovery" into lmp-devNick Kralevich2014-10-233-5/+76
| | | |\ \ \ \ \
| | | | * | | | | Make /cache/recovery/last_log available in recoveryNick Kralevich2014-10-233-5/+76
| | | | |/ / / /
| | | | | * | | am c224ac28: am 3b5c6dca: am 2f0ef730: Treat already-renamed files as having no problems.Michael Runge2014-10-231-0/+3
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | am 3b5c6dca: am 2f0ef730: Treat already-renamed files as having no problems.Michael Runge2014-10-231-0/+3
| |\| | | | | |
| | * | | | | | am 2f0ef730: Treat already-renamed files as having no problems.Michael Runge2014-10-231-0/+3
| | |\| | | | |
| | | * | | | | Treat already-renamed files as having no problems.Michael Runge2014-10-231-0/+3
| | | |/ / / /
| | | | * | | am 0745fbfa: am c7249660: am 4f66469b: Merge "More test makefile cleanup."Dan Albert2014-10-230-0/+0
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am c7249660: am 4f66469b: Merge "More test makefile cleanup."Dan Albert2014-10-230-0/+0
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | am 4f66469b: Merge "More test makefile cleanup."Dan Albert2014-10-171-24/+23
|\ \ \ \ \ \ \
| | | | | * \ \ am 440185cd: am ea5828a2: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""Dan Albert2014-10-230-0/+0
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | am ea5828a2: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""Dan Albert2014-10-230-0/+0
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""Dan Albert2014-09-261-4/+21
|\ \ \ \ \ \ \ \
| | | | | | * \ \ am 39705685: am e95ed95f: am a6e13ae0: Include reason when wiping data.Jeff Sharkey2014-10-230-0/+0
| | | | | | |\ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | am e95ed95f: am a6e13ae0: Include reason when wiping data.Jeff Sharkey2014-10-230-0/+0
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | am a6e13ae0: Include reason when wiping data.Jeff Sharkey2014-09-251-0/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | | | | | * | | am e5ce559f: am 78a30278: am 530b61e0: Merge "Copy epoll(2) changes to minadb."Elliott Hughes2014-10-230-0/+0
| | | | | | |\ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | am 78a30278: am 530b61e0: Merge "Copy epoll(2) changes to minadb."Elliott Hughes2014-10-230-0/+0
| | | | |\ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | am 530b61e0: Merge "Copy epoll(2) changes to minadb."Elliott Hughes2014-09-231-21/+4
|\ \ \ \ \ \ \ \ \
| | | | | | | * \ \ am dd57886c: am 9eb8c8bd: init.rc: Inidicate that booting is complete wrt firwmare requestsJP Abgrall2014-10-211-1/+6
| | | | | | | |\ \ \ | | | | | | |_|/ / / | | | | | |/| | | |
| | | | | * | | | | am 9eb8c8bd: init.rc: Inidicate that booting is complete wrt firwmare requestsJP Abgrall2014-10-211-1/+6
| | | | | |\| | | |
| | | | | | * | | | init.rc: Inidicate that booting is complete wrt firwmare requestsJP Abgrall2014-10-211-1/+6
| | | | | | | * | | am 5b7f5b15: am 4f66469b: Merge "More test makefile cleanup."Dan Albert2014-10-171-24/+23
| | | | | | | |\ \ \ | | | | | | |_|/ / / | | | | | |/| | | |
| | | | | * | | | | am 4f66469b: Merge "More test makefile cleanup."Dan Albert2014-10-171-24/+23
| | | | | |\ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Merge "More test makefile cleanup."Dan Albert2014-10-171-24/+23
| | | |/| | | | | |
| | | | * | | | | | More test makefile cleanup.Dan Albert2014-10-171-24/+23
| | | |/ / / / / /
| | | | | | * | | am 93ecb938: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""Dan Albert2014-09-261-4/+21
| | | | | | |\ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""Dan Albert2014-09-261-4/+21
| | | | |\ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge "Revert "Copy epoll(2) changes to minadb.""Dan Albert2014-09-261-4/+21
| | |/| | | | | | | |/| | | | | | |
| | | * | | | | | Revert "Copy epoll(2) changes to minadb."Dan Albert2014-09-261-4/+21
| | |/ / / / / / | |/| | | | | |
| | | | | * | | am 91c27888: am d83e4f15: support for version 2 of block image diffsDoug Zongker2014-09-260-0/+0
| | | | | |\ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | am d83e4f15: support for version 2 of block image diffsDoug Zongker2014-09-261-45/+209
| | | |\| | | |
| | | | * | | | support for version 2 of block image diffsDoug Zongker2014-09-261-45/+209
| | | |/ / / / | | |/| | | |
| | | | * | | am 62656652: am a6e13ae0: Include reason when wiping data.Jeff Sharkey2014-09-251-0/+4
| | | | |\ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | am a6e13ae0: Include reason when wiping data.Jeff Sharkey2014-09-251-0/+4
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Include reason when wiping data.Jeff Sharkey2014-09-241-0/+4
| |/ / / / / |/| | | | |
| | | * | | am 970c3947: am 530b61e0: Merge "Copy epoll(2) changes to minadb."Elliott Hughes2014-09-231-21/+4
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | am 530b61e0: Merge "Copy epoll(2) changes to minadb."Elliott Hughes2014-09-231-21/+4
| |/| | | | |/|/ / / /
| * | | | Merge "Copy epoll(2) changes to minadb."Elliott Hughes2014-09-231-21/+4
| |\ \ \ \
| | * | | | Copy epoll(2) changes to minadb.Elliott Hughes2014-09-231-21/+4
| |/ / / /
| | * | | Use the correct fuse_init_out structure size.Christopher Ferris2014-09-181-2/+28
| | * | | support for version 2 of block image diffsDoug Zongker2014-09-081-45/+209
| | * | | am 574443d8: create block map for all update packages on /dataDoug Zongker2014-09-051-12/+9
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | create block map for all update packages on /dataDoug Zongker2014-09-051-12/+9
| | * | | am 40482ea2: Merge "fix comment in blockimg updater code" into lmp-devDoug Zongker2014-09-041-3/+3
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Merge "fix comment in blockimg updater code" into lmp-devDoug Zongker2014-09-041-3/+3
|\ \ \ \ \
| * | | | | fix comment in blockimg updater codeDoug Zongker2014-09-041-3/+3
| | | * | | am 8328922f: use lseek64 instead of lseekAndrew Boie2014-09-041-11/+11
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | use lseek64 instead of lseekAndrew Boie2014-09-041-11/+11
|/ / / / /
| | * | | am 5f875bf5: remove code for original block OTA mechanismDoug Zongker2014-08-270-0/+0
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | remove code for original block OTA mechanismDoug Zongker2014-08-262-209/+6
| | * | | Merge "remove code for original block OTA mechanism"Doug Zongker2014-08-262-209/+6
| | |\ \ \
| | | * | | remove code for original block OTA mechanismDoug Zongker2014-08-252-209/+6
| | * | | | am f449db2f: open misc device in write-only modeDoug Zongker2014-08-262-19/+27
| | |\ \ \ \ | |_|/ / / / |/| | / / / | | |/ / /
* | | | | open misc device in write-only modeDoug Zongker2014-08-262-19/+27
| | * | | am 1d5d6098: fix two bugs in block image updaterDoug Zongker2014-08-211-18/+32
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | fix two bugs in block image updaterDoug Zongker2014-08-211-18/+32
| | * | | am bc7ffeda: installer for new block OTA systemDoug Zongker2014-08-200-0/+0
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | installer for new block OTA systemDoug Zongker2014-08-2010-10/+669
| | * | | Merge "installer for new block OTA system"Doug Zongker2014-08-1910-10/+669
| | |\ \ \
| | | * | | installer for new block OTA systemDoug Zongker2014-08-1910-10/+669
| | * | | | am 2efc9d99: clear BCB in misc partition before rebootingDoug Zongker2014-08-191-3/+43
| | |\ \ \ \ | |_|/ / / / |/| | / / / | | |/ / /
* | | | | clear BCB in misc partition before rebootingDoug Zongker2014-08-191-3/+43
| | * | | am 1a35a586: revert uncrypt back to dynamic linking, fix libsDoug Zongker2014-08-151-6/+1
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | revert uncrypt back to dynamic linking, fix libsDoug Zongker2014-08-141-6/+1
| | * | | am 537d34f9: change uncrypt to static linkingDoug Zongker2014-08-151-0/+2
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | change uncrypt to static linkingDoug Zongker2014-08-141-0/+2
| | * | | am 9dc71cfa: Merge "Erase PST partition if its marked to be erased." into lmp-devAndres Morales2014-08-063-0/+44
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Merge "Erase PST partition if its marked to be erased." into lmp-devAndres Morales2014-08-053-0/+44
|\ \ \ \ \
| * | | | | Erase PST partition if its marked to be erased.Andres Morales2014-08-063-0/+44
| | | * | | am 2b5f0e0f: remove spurious parens from error messageDoug Zongker2014-08-061-4/+3
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | remove spurious parens from error messageDoug Zongker2014-08-061-4/+3
| | | * | | am 78d458c3: Fix length printing + formatsJP Abgrall2014-08-051-3/+3
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Fix length printing + formatsJP Abgrall2014-08-051-3/+3
| | | * | | am eaf33654: only do uncryption on packages in /dataDoug Zongker2014-08-011-1/+1
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | only do uncryption on packages in /dataDoug Zongker2014-08-011-1/+1
|/ / / / /
| | * | | am a91ecc59: Auto create parent directories for rename supportMichael Runge2014-07-220-0/+0
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Auto create parent directories for rename supportMichael Runge2014-07-222-3/+7
| | * | | Auto create parent directories for rename supportMichael Runge2014-07-222-3/+7
| |/ / / |/| | |
* | | | do sdcard sideloading through the fuse filesystemDoug Zongker2014-07-104-102/+175
* | | | refactor fuse sideloading codeDoug Zongker2014-07-109-43/+152
* | | | drop APPLY_CACHE and refactor APPLY_EXTDoug Zongker2014-07-082-64/+47
* | | | sideload without holding the whole package in RAMDoug Zongker2014-07-0211-71/+618
* | | | am 3e0fc39e: am 974fe112: Merge "Fix recovery mode."Riley Andrews2014-06-251-1/+19
|\ \ \ \
| * | | | am 974fe112: Merge "Fix recovery mode."Riley Andrews2014-06-251-1/+19
| |\| | |
| | * | | Merge "Fix recovery mode."Riley Andrews2014-06-241-1/+19
| | |\ \ \
| | | * | | Fix recovery mode.Riley Andrews2014-06-251-1/+19
| | |/ / /
* | | | | recovery: enable panic_on_oopsColin Cross2014-06-241-0/+2
* | | | | Use LOCAL_REQUIRED_MODULES for mkfs.f2fsJi-Hwan Lee2014-06-181-5/+3
* | | | | Support F2FS for the data partitionJP Abgrall2014-06-173-15/+90
* | | | | minui: avoid random screen frame at startupJoey Pan2014-06-121-0/+2
* | | | | advance progress bar during block OTA installationsDoug Zongker2014-06-091-2/+23
* | | | | am dff8afe1: (-s ours) restore holo UI in recovery -- DO NOT MERGEDoug Zongker2014-06-060-0/+0
|\ \ \ \ \
| * | | | | restore holo UI in recovery -- DO NOT MERGEDoug Zongker2014-06-0312-16/+16
* | | | | | Merge "restore holo UI in recovery"Doug Zongker2014-06-0612-16/+16
|\ \ \ \ \ \
| * | | | | | restore holo UI in recoveryDoug Zongker2014-06-0612-16/+16
* | | | | | | am 54a61179: am cfd4b286: Merge "recovery: initialize keys press tracking status"Doug Zongker2014-06-061-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | am cfd4b286: Merge "recovery: initialize keys press tracking status"Doug Zongker2014-06-061-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "recovery: initialize keys press tracking status"Doug Zongker2014-06-061-0/+1
| | |\ \ \ \
| | | * | | | recovery: initialize keys press tracking statusMihai Serban2014-06-061-0/+1
| | |/ / / /
* | | / / / disable async reboot during package installationDoug Zongker2014-05-234-4/+47
| |_|/ / / |/| | | |
* | | | | am 502e4595: am d1c64060: am 5fbb729f: Merge "exit instead of return if sideload file creation fails"Doug Zongker2014-05-161-1/+1
|\| | | |
| * | | | am d1c64060: am 5fbb729f: Merge "exit instead of return if sideload file creation fails"Doug Zongker2014-05-161-1/+1
| |\| | |
| | * | | am 5fbb729f: Merge "exit instead of return if sideload file creation fails"Doug Zongker2014-05-161-1/+1
| | |\ \ \
| | | * \ \ Merge "exit instead of return if sideload file creation fails"Doug Zongker2014-05-161-1/+1
| | | |\ \ \
| | | | * | | exit instead of return if sideload file creation failsEthan Yonker2013-01-091-1/+1
* | | | | | | am c4804e9b: am d4592694: am 3ca99f6c: Merge "fix vulnerability in bspatch"Doug Zongker2014-05-161-0/+5
|\| | | | | |
| * | | | | | am d4592694: am 3ca99f6c: Merge "fix vulnerability in bspatch"Doug Zongker2014-05-161-0/+5
| |\| | | | |
| | * | | | | am 3ca99f6c: Merge "fix vulnerability in bspatch"Doug Zongker2014-05-161-0/+5
| | |\| | | |
| | | * | | | Merge "fix vulnerability in bspatch"Doug Zongker2014-05-161-0/+5
| | | |\ \ \ \
| | | | * | | | fix vulnerability in bspatchDoug Zongker2014-05-131-0/+5
* | | | | | | | am 0766cdf4: am d2fb4ed5: am d27aa76a: Merge "Support BGRA framebuffer"Doug Zongker2014-05-141-0/+13
|\| | | | | | |
| * | | | | | | am d2fb4ed5: am d27aa76a: Merge "Support BGRA framebuffer"Doug Zongker2014-05-141-0/+13
| |\| | | | | |
| | * | | | | | am d27aa76a: Merge "Support BGRA framebuffer"Doug Zongker2014-05-141-0/+13
| | |\| | | | |
| | | * | | | | Merge "Support BGRA framebuffer"Doug Zongker2014-05-141-0/+13
| | | |\ \ \ \ \
| | | | * | | | | Support BGRA framebufferDaniel Leung2014-05-141-0/+13
| | | |/ / / / /
* | | | | | | | am 48abd574: am 34ff5fe3: am 74b90b30: Merge "screen_ui: Initialize text buffer"Doug Zongker2014-05-131-0/+2
|\| | | | | | |
| * | | | | | | am 34ff5fe3: am 74b90b30: Merge "screen_ui: Initialize text buffer"Doug Zongker2014-05-131-0/+2
| |\| | | | | |
| | * | | | | | am 74b90b30: Merge "screen_ui: Initialize text buffer"Doug Zongker2014-05-131-0/+2
| | |\| | | | |
| | | * | | | | Merge "screen_ui: Initialize text buffer"Doug Zongker2014-05-131-0/+2
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | screen_ui: Initialize text bufferBjorn Andersson2013-09-301-0/+2
* | | | | | | | Allow 0-byte files in full OTAs.Michael Runge2014-05-091-1/+3
* | | | | | | | am e9f9238a: am 1cd52423: am 1c2cf1db: Merge "recovery: minui: add adf backend"Greg Hackmann2014-05-035-5/+267
|\| | | | | | |
| * | | | | | | am 1cd52423: am 1c2cf1db: Merge "recovery: minui: add adf backend"Greg Hackmann2014-05-035-5/+267
| |\| | | | | |
| | * | | | | | am 1c2cf1db: Merge "recovery: minui: add adf backend"Greg Hackmann2014-05-035-5/+267
| | |\| | | | |
| | | * | | | | Merge "recovery: minui: add adf backend"Greg Hackmann2014-05-035-5/+267
| | | |\ \ \ \ \
| | | | * | | | | recovery: minui: add adf backendGreg Hackmann2014-04-265-5/+267
| | | |/ / / / /
* | | | | | | | Allow lines without = signs.Michael Runge2014-05-021-5/+3
* | | | | | | | am ddaaccb3: am 29759e9d: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEADBill Yi2014-04-301-1/+0
|\| | | | | | |
| * | | | | | | am 29759e9d: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEADBill Yi2014-04-301-1/+0
| |\| | | | | |
| | * | | | | | Merge commit '25c2b2f670a3b11f7ce78eccde10c1a79188c9a8' into HEADBill Yi2014-04-299-29/+180
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | am aa4545b5: Merge "restore minui support for paletted images with < 8 bits"Doug Zongker2014-03-201-1/+1
| | | |\ \ \ \ \
| | | * \ \ \ \ \ resolved conflicts for merge of 708aa238 to klp-dev-plus-aospDoug Zongker2014-03-181-4/+10
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ am 130a7985: Merge "fix error log statement"Doug Zongker2014-03-181-1/+1
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ resolved conflicts for merge of d90da130 to klp-dev-plus-aospDoug Zongker2014-03-186-244/+253
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ am 026ebe02: Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-1411-30/+33
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ am a7266ef0: Merge "separate fbdev-specific code out from minui"Doug Zongker2014-03-135-152/+268
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ am c91612d4: Merge "remove pixelflinger from recovery"Doug Zongker2014-03-136-274/+358
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ am 8f087d02: Merge "update tools for making recovery images"Doug Zongker2014-03-132-102/+53
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am 59508993: Merge "allow CheckKey to request mounting /system"Doug Zongker2014-03-133-3/+52
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'ea868b38' into manualmergeDoug Zongker2014-03-1318-103/+204
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2f173bde: Merge "ADB sideload command not work"Doug Zongker2014-03-113-11/+358
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ac189bf6: Merge "recovery: Fix adb with linux 3.10"Benoit Goby2014-03-081-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"Colin Cross2014-03-073-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | am 9e8d81ba: am 0e22af65: recovery: Fix adb with linux 3.10Benoit Goby2014-04-180-0/+0
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | am 0e22af65: recovery: Fix adb with linux 3.10Benoit Goby2014-04-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | recovery: Fix adb with linux 3.10Benoit Goby2014-04-181-0/+6
* | | | | | | | | | | | | | | | | | | | | am ecf1f6c9: am 558f2700: Merge "Change filesystem add entry API call."Sasha Levitskiy2014-04-121-1/+1
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | am 558f2700: Merge "Change filesystem add entry API call."Sasha Levitskiy2014-04-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "Change filesystem add entry API call."Sasha Levitskiy2014-04-121-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Change filesystem add entry API call.Sasha Levitskiy2014-04-111-1/+1
| | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | make density-specific recovery assetsDoug Zongker2014-04-0458-16/+16
* | | | | | | | | | | | | | | | | | | | add reboot-to-bootloader and power down options to recovery menuDoug Zongker2014-04-013-18/+44
* | | | | | | | | | | | | | | | | | | | remove DefaultDevice's UI subclassDoug Zongker2014-04-012-12/+3
* | | | | | | | | | | | | | | | | | | | Merge "Fix build break caused by vold change"Paul Lawrence2014-03-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix build break caused by vold changePaul Lawrence2014-03-031-0/+1
* | | | | | | | | | | | | | | | | | | | | am 03008bc1: am aa4545b5: Merge "restore minui support for paletted images with < 8 bits"Doug Zongker2014-03-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | am aa4545b5: Merge "restore minui support for paletted images with < 8 bits"Doug Zongker2014-03-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "restore minui support for paletted images with < 8 bits"Doug Zongker2014-03-201-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | restore minui support for paletted images with < 8 bitsDoug Zongker2014-03-201-1/+1
| | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | recovery: 64 bit build issuesMark Salyzyn2014-03-191-3/+3
* | | | | | | | | | | | | | | | | | | | am 03002477: am bacf9b45: add --shutdown_after option to recoveryDoug Zongker2014-03-180-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am bacf9b45: add --shutdown_after option to recoveryDoug Zongker2014-03-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | add --shutdown_after option to recoveryDoug Zongker2014-03-181-4/+10
| | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | am b4bbf887: resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aospDoug Zongker2014-03-181-4/+10
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aospDoug Zongker2014-03-181-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "add --shutdown_after option to recovery"Doug Zongker2014-03-181-4/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | add --shutdown_after option to recoveryDoug Zongker2014-03-181-4/+10
| | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | am 47c7e365: am 130a7985: Merge "fix error log statement"Doug Zongker2014-03-181-1/+1
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am 130a7985: Merge "fix error log statement"Doug Zongker2014-03-181-1/+1
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "fix error log statement"Doug Zongker2014-03-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | fix error log statementDoug Zongker2014-03-181-1/+1
| | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am 80c1a386: resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aospDoug Zongker2014-03-186-244/+253
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aospDoug Zongker2014-03-186-244/+253
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "refactor image resource loading code in minui"Doug Zongker2014-03-176-244/+253
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | refactor image resource loading code in minuiDoug Zongker2014-03-176-244/+253
| | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | minzip: 64 bit build issueMark Salyzyn2014-03-181-1/+1
* | | | | | | | | | | | | | | | am 4b6de1ba: am 026ebe02: Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-1411-30/+33
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 026ebe02: Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-1411-30/+33
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-1411-30/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Recovery 64-bit compile issuesMark Salyzyn2014-03-1411-30/+33
| | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | am 239fb930: am a7266ef0: Merge "separate fbdev-specific code out from minui"Doug Zongker2014-03-120-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | am a7266ef0: Merge "separate fbdev-specific code out from minui"Doug Zongker2014-03-125-152/+268
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "separate fbdev-specific code out from minui"Doug Zongker2014-03-125-152/+268
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | separate fbdev-specific code out from minuiDoug Zongker2014-03-115-152/+268
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | am cb1bdc9e: (-s ours) am c91612d4: Merge "remove pixelflinger from recovery"Doug Zongker2014-03-120-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | am c91612d4: Merge "remove pixelflinger from recovery"Doug Zongker2014-03-126-274/+358
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "remove pixelflinger from recovery"Doug Zongker2014-03-116-274/+358
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | remove pixelflinger from recoveryDoug Zongker2014-03-116-274/+358
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | am 7003ff3b: am 8f087d02: Merge "update tools for making recovery images"Doug Zongker2014-03-120-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 8f087d02: Merge "update tools for making recovery images"Doug Zongker2014-03-122-102/+53
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "update tools for making recovery images"Doug Zongker2014-03-112-102/+53
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | update tools for making recovery imagesDoug Zongker2014-03-112-102/+53
| | |/ / / / / / / / / /
* | | | | | | | | | | | am aa6b8026: (-s ours) am 59508993: Merge "allow CheckKey to request mounting /system"Doug Zongker2014-03-120-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | am 59508993: Merge "allow CheckKey to request mounting /system"Doug Zongker2014-03-123-3/+52
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "allow CheckKey to request mounting /system"Doug Zongker2014-03-113-3/+52
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | | * | | | | | | | | allow CheckKey to request mounting /systemDoug Zongker2014-03-113-3/+52
| | |/ / / / / / / / /
* | | | | | | | | | | am c15b7865: (-s ours) resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aospDoug Zongker2014-03-120-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aospDoug Zongker2014-03-1218-102/+204
| |\| | | | | | | | |
| | * | | | | | | | | Merge "change how recovery animation is implemented"Doug Zongker2014-03-1118-95/+203
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | | * | | | | | | | change how recovery animation is implementedDoug Zongker2014-03-1118-95/+203
| | |/ / / / / / / /
* | | | | | | | | | Merge "separate fbdev-specific code out from minui"Doug Zongker2014-03-115-152/+268
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | separate fbdev-specific code out from minuiDoug Zongker2014-03-115-152/+268
* | | | | | | | | | | update tools for making recovery imagesDoug Zongker2014-03-112-102/+53
|/ / / / / / / / / /
* | | | | | | | | | remove pixelflinger from recoveryDoug Zongker2014-03-116-281/+357
* | | | | | | | | | change how recovery animation is implementedDoug Zongker2014-03-0718-99/+202
* | | | | | | | | | Merge "support don't-care maps when writing the system image"Doug Zongker2014-03-041-62/+172
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | support don't-care maps when writing the system imageDoug Zongker2014-02-251-62/+172
* | | | | | | | | | am 49968f09: am 2f173bde: Merge "ADB sideload command not work"Doug Zongker2014-02-263-11/+358
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 2f173bde: Merge "ADB sideload command not work"Doug Zongker2014-02-263-11/+358
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "ADB sideload command not work"Doug Zongker2014-02-263-11/+358
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | ADB sideload command not workDa Zhou2014-01-173-11/+358
* | | | | | | | | | am ed75be6d: am ac189bf6: Merge "recovery: Fix adb with linux 3.10"Benoit Goby2014-02-211-0/+6
|\| | | | | | | | | | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | am ac189bf6: Merge "recovery: Fix adb with linux 3.10"Benoit Goby2014-02-201-0/+6
| |\| | | | | | |
| | * | | | | | | Merge "recovery: Fix adb with linux 3.10"Benoit Goby2014-02-201-0/+6
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | recovery: Fix adb with linux 3.10Benoit Goby2014-02-201-0/+6
| | |/ / / / / /
* | | | | | | | add flag for GPL licenseDoug Zongker2014-02-202-0/+339
* | | | | | | | Merge "clean up some warnings when building recovery"Doug Zongker2014-02-1810-13/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | clean up some warnings when building recoveryDoug Zongker2014-02-1410-13/+23
* | | | | | | | | Merge "Fix a crash when going into recovery mode."Maxim Siniavine2014-02-141-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix a crash when going into recovery mode.Maxim Siniavine2014-02-141-1/+6
* | | | | | | | | | remove remaining libminelf referencesDoug Zongker2014-02-142-3/+2
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | remove 'retouch' ASLR supportDoug Zongker2014-02-148-302/+12
* | | | | | | | | add syspatch support to updaterDoug Zongker2014-02-132-14/+115
* | | | | | | | | add mzGetStoredEntry functionDoug Zongker2014-02-132-2/+30
|/ / / / / / / /
* | | | | | | | am 2739ed96: am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"Colin Cross2014-02-063-5/+5
|\| | | | | | |
| * | | | | | | am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"Colin Cross2014-02-063-5/+5
| |\| | | | | | | | |_|/ / / / | |/| | | | |
| | * | | | | Merge "recovery: fix building with pointer-to-int errors turned on"Colin Cross2014-02-063-5/+5
| | |\ \ \ \ \
| | | * | | | | recovery: fix building with pointer-to-int errors turned onColin Cross2014-02-063-5/+5
| | |/ / / / /
* | | | | | | am fd84f65d: am f3532072: Merge "minadbd: remove dead code"Colin Cross2014-01-272-25/+0
|\| | | | | |
| * | | | | | am f3532072: Merge "minadbd: remove dead code"Colin Cross2014-01-272-25/+0
| |\| | | | |
| | * | | | | Merge "minadbd: remove dead code"Colin Cross2014-01-272-25/+0
| | |\ \ \ \ \
| | | * | | | | minadbd: remove dead codeColin Cross2014-01-242-25/+0
| | |/ / / / /
* | | | | | | am f4641299: am 295e74aa: Merge "adbd: switch to su domain when running as root"Nick Kralevich2014-01-241-1/+1
|\| | | | | |
| * | | | | | am 295e74aa: Merge "adbd: switch to su domain when running as root"Nick Kralevich2014-01-241-1/+1
| |\| | | | |
| | * | | | | Merge "adbd: switch to su domain when running as root"Nick Kralevich2014-01-241-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | adbd: switch to su domain when running as rootNick Kralevich2014-01-181-1/+1
| | |/ / / /
* | | | | | log extra info for debuggingDoug Zongker2014-01-212-1/+3
* | | | | | program to store unencrypted files in an encrypted filesystemDoug Zongker2014-01-163-0/+406
* | | | | | do verification and extraction on memory, not filesDoug Zongker2014-01-1611-209/+261
* | | | | | am a01b6467: am 772f6e2a: Merge "correctly mount tmpfs as /tmp in recovery"Doug Zongker2014-01-141-2/+2
|\| | | | |
| * | | | | am 772f6e2a: Merge "correctly mount tmpfs as /tmp in recovery"Doug Zongker2014-01-141-2/+2
| |\| | | |
| | * | | | Merge "correctly mount tmpfs as /tmp in recovery"Doug Zongker2014-01-141-2/+2
| | |\ \ \ \
| | | * | | | correctly mount tmpfs as /tmp in recoveryDoug Zongker2014-01-141-2/+2
| | |/ / / /
* | | | | | am 7e0d3066: am fc729512: Merge "Set SELinux security contexts correctly for init and services."Nick Kralevich2014-01-131-0/+11
|\| | | | |
| * | | | | am fc729512: Merge "Set SELinux security contexts correctly for init and services."Nick Kralevich2014-01-131-0/+11
| |\| | | |
| | * | | | Merge "Set SELinux security contexts correctly for init and services."Nick Kralevich2014-01-131-0/+11
| | |\ \ \ \
| | | * | | | Set SELinux security contexts correctly for init and services.Stephen Smalley2014-01-131-0/+11
| | |/ / / /
* | | | | | remove dead code from minzipDoug Zongker2014-01-132-134/+0
* | | | | | am 27efc8f9: am 617d1cad: Merge "minui: do not use flexible array initialization"Nick Kralevich2014-01-041-1/+1
|\| | | | |
| * | | | | am 617d1cad: Merge "minui: do not use flexible array initialization"Nick Kralevich2014-01-041-1/+1
| |\| | | |
| | * | | | Merge "minui: do not use flexible array initialization"Nick Kralevich2014-01-041-1/+1
| | |\ \ \ \
| | | * | | | minui: do not use flexible array initializationsynergy dev2013-11-261-1/+1
* | | | | | | am 15f5fe1b: am f9dd42de: Merge "Don\'t abort on read_file if the file is missing." into klp-devMichael Runge2013-12-271-5/+3
|\| | | | | |
| * | | | | | am f9dd42de: Merge "Don\'t abort on read_file if the file is missing." into klp-devMichael Runge2013-12-271-5/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge "Don't abort on read_file if the file is missing." into klp-devMichael Runge2013-12-201-5/+3
| | |\ \ \ \ \
| | | * | | | | Don't abort on read_file if the file is missing.Michael Runge2013-12-141-5/+3
* | | | | | | | am e1bb2733: am 168724c3: fix unnecessarily slow writing of EMMC partitionsDoug Zongker2013-12-201-15/+3
|\| | | | | | |
| * | | | | | | am 168724c3: fix unnecessarily slow writing of EMMC partitionsDoug Zongker2013-12-201-15/+3
| |\| | | | | |
| | * | | | | | fix unnecessarily slow writing of EMMC partitionsDoug Zongker2013-12-201-15/+3
| | |/ / / / /
* | | | | | | recovery: wipe encryption metadata along with data partitionDoug Zongker2013-12-132-2/+27
* | | | | | | am d327c63a: am c87bab10: add the functions for multi-stage packages to updaterDoug Zongker2013-12-038-9/+181
|\| | | | | |
| * | | | | | am c87bab10: add the functions for multi-stage packages to updaterDoug Zongker2013-11-278-9/+181
| |\| | | | | | | |/ / / / | |/| | | |
| | * | | | add the functions for multi-stage packages to updaterDoug Zongker2013-11-278-9/+181
* | | | | | Merge "Fix rare crash seen when dereferencing backgroundIcon[NONE]."Doug Zongker2013-11-181-0/+1
|\ \ \ \ \ \
| * | | | | | Fix rare crash seen when dereferencing backgroundIcon[NONE].Alistair Strachan2013-11-181-0/+1
* | | | | | | Restore default umask after forking for update-binary.Alistair Strachan2013-11-181-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-devMichael Runge2013-11-081-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-devMichael Runge2013-11-081-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-devMichael Runge2013-11-071-0/+35
| | |\ \ \
| | | * | | Enable incremental builder to find files that moved, andMichael Runge2013-11-071-0/+35
* | | | | | am a370c0f7: am 3966c571: merge in klp-release (no-op)Ed Heyl2013-10-170-0/+0
|\| | | | |
| * | | | | am 3966c571: merge in klp-release (no-op)Ed Heyl2013-10-170-0/+0
| |\| | | |
| | * | | | merge in klp-release (no-op)Ed Heyl2013-10-170-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-030-0/+0
| | | |\ \ \
* | | | | | | am fc7eab96: am f4a6ab27: Merge "Add support for ECDSA signatures"Kenny Root2013-10-1412-60/+822
|\| | | | | |
| * | | | | | am f4a6ab27: Merge "Add support for ECDSA signatures"Kenny Root2013-10-1412-60/+822
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Add support for ECDSA signatures"Kenny Root2013-10-1412-60/+822
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Add support for ECDSA signaturesKenny Root2013-10-1012-60/+822
| | |/ / / / /
* | | | | | | am 053c1c5e: am 7fdeb1f9: merge in KQS81MEd Heyl2013-10-090-0/+0
|\| | | | | |
| * | | | | | am 7fdeb1f9: merge in KQS81MEd Heyl2013-10-090-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | merge in KQS81MEd Heyl2013-10-090-0/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-120-0/+0
| | | |\ \ \
| | | | * | | Don't apply permission changes to symlink.Nick Kralevich2013-09-111-0/+5
| | | | * | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-100-0/+0
| | | | |\ \ \
| | | | | * | | recovery: fix use of init reboot methodDoug Zongker2013-09-041-1/+1
* | | | | | | | am efef45ed: am a2a1ce82: Allow child classes to override the overlay location for the update image.Michael Runge2013-10-031-1/+3
|\| | | | | | |
| * | | | | | | am a2a1ce82: Allow child classes to override the overlay location for the update image.Michael Runge2013-10-031-1/+3
| |\| | | | | |
| | * | | | | | Allow child classes to override the overlay location for theMichael Runge2013-10-031-1/+3
| | |/ / / / /
* | | | | | | fix use of RGBA images in minuiDoug Zongker2013-09-261-3/+11
* | | | | | | am dd92a4d6: am 58c60900: Merge "verifier: update to support certificates using SHA-256"Kenny Root2013-09-250-0/+0
|\| | | | | |
| * | | | | | am 58c60900: Merge "verifier: update to support certificates using SHA-256"Kenny Root2013-09-250-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "verifier: update to support certificates using SHA-256"Kenny Root2013-09-2513-109/+254
| | |\ \ \ \ \
| | | * | | | | verifier: update to support certificates using SHA-256Doug Zongker2013-09-2513-109/+254
| | |/ / / / /
* | | | | | | am 46ab1b61: updater: Delete dead codeNick Kralevich2013-09-180-0/+0
|\| | | | | |
| * | | | | | updater: Delete dead codeNick Kralevich2013-09-173-153/+0
* | | | | | | recovery: fix epoll events type to uint32_tTodd Poynor2013-09-174-5/+5
* | | | | | | start healthd in recovery modeTodd Poynor2013-09-141-1/+1
* | | | | | | minui: add ev_get_epollfd() to retrieve epoll file descriptorTodd Poynor2013-09-122-0/+6
* | | | | | | recovery: ui changes for ev_*() switch to epollTodd Poynor2013-09-122-3/+3
* | | | | | | minui: convert ev_*() event interface to epollTodd Poynor2013-09-122-27/+58
* | | | | | | am 1306a7ef: am cc2958fd: fix secure adb in recoveryDoug Zongker2013-09-121-0/+1
|\| | | | | |
| * | | | | | am cc2958fd: fix secure adb in recoveryDoug Zongker2013-09-111-0/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | fix secure adb in recoveryDoug Zongker2013-09-111-0/+1
* | | | | | | updater: Delete dead codeNick Kralevich2013-09-113-153/+0
* | | | | | | am af677d78: am e461251e: Don\'t apply permission changes to symlink.Nick Kralevich2013-09-111-0/+5
|\| | | | | |
| * | | | | | am e461251e: Don\'t apply permission changes to symlink.Nick Kralevich2013-09-111-0/+5
| |\| | | | |
| | * | | | | Don't apply permission changes to symlink.Nick Kralevich2013-09-111-0/+5
| | | |/ / / | | |/| | |
* | | | | | am cc421662: am 5dbdef0e: updater: introduce and set_metadata and set_metadata_recursiveNick Kralevich2013-09-101-0/+274
|\| | | | |
| * | | | | am 5dbdef0e: updater: introduce and set_metadata and set_metadata_recursiveNick Kralevich2013-09-101-0/+274
| |\| | | |
| | * | | | updater: introduce and set_metadata and set_metadata_recursiveNick Kralevich2013-09-101-0/+274
* | | | | | am 5ae88e89: am 3328e3bc: Revert "Update OTA installer to understand SELinux filesystem labels"Nick Kralevich2013-09-103-32/+8
|\| | | | |
| * | | | | am 3328e3bc: Revert "Update OTA installer to understand SELinux filesystem labels"Nick Kralevich2013-09-103-32/+8
| |\| | | |
| | * | | | Revert "Update OTA installer to understand SELinux filesystem labels"Nick Kralevich2013-09-093-32/+8
* | | | | | allow CheckKey to request mounting /systemDoug Zongker2013-09-053-3/+52
* | | | | | am f187a543: am 3b5a987c: recovery: fix use of init reboot methodDoug Zongker2013-09-031-1/+1
|\| | | | |
| * | | | | am 3b5a987c: recovery: fix use of init reboot methodDoug Zongker2013-09-031-1/+1
| |\| | | |
| | * | | | recovery: fix use of init reboot methodDoug Zongker2013-09-031-1/+1
| | | |/ / | | |/| |
* | | | | am 366f78a9: am 77ea71d6: recovery: fix rebootingDoug Zongker2013-08-302-1/+4
|\| | | |
| * | | | am 77ea71d6: recovery: fix rebootingDoug Zongker2013-08-302-1/+4
| |\| | |
| | * | | recovery: fix rebootingDoug Zongker2013-08-302-1/+4
* | | | | am 19877de5: am 5c4e1dac: Merge "Update libpng API usage"John Reck2013-08-270-0/+0
|\| | | |
| * | | | am 5c4e1dac: Merge "Update libpng API usage"John Reck2013-08-271-12/+12
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge "Update libpng API usage"John Reck2013-08-271-12/+12
| | |\ \
| | | * | Update libpng API usageJohn Reck2013-08-271-12/+12
| | |/ /
* | | | am 239ac6ab: recovery: install packages in a known mount environmentDoug Zongker2013-08-225-11/+35
|\| | |
| * | | recovery: install packages in a known mount environmentDoug Zongker2013-08-215-11/+35
* | | | Fix libpng API usageJohn Reck2013-08-131-12/+12
|/ / /
* | | notify about pending long pressDoug Zongker2013-07-315-27/+102
* | | Merge "start healthd in recovery"Todd Poynor2013-07-271-0/+4
|\ \ \
| * | | start healthd in recoveryTodd Poynor2013-06-191-0/+4
* | | | Update OTA installer to understand SELinux filesystem labelsNick Kralevich2013-07-193-8/+32
* | | | am a69b50c5: am 901b898d: recovery: remove O_DIRECT, use O_SYNC onlyDoug Zongker2013-07-111-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | am 901b898d: recovery: remove O_DIRECT, use O_SYNC onlyDoug Zongker2013-07-111-2/+2
| |\ \ \
| | * | | recovery: remove O_DIRECT, use O_SYNC onlyDoug Zongker2013-07-111-2/+2
* | | | | am 660637f3: am e8d953aa: recovery: more cargo-cult programmingDoug Zongker2013-07-111-2/+2
|\| | | |
| * | | | am e8d953aa: recovery: more cargo-cult programmingDoug Zongker2013-07-111-2/+2
| |\| | |
| | * | | recovery: more cargo-cult programmingDoug Zongker2013-07-111-2/+2
* | | | | am 51ffaf54: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-07-110-0/+0
|\| | | |
| * | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-07-110-0/+0
| |\ \ \ \
| | * | | | recovery: sleep after writing partition and closing itDoug Zongker2013-07-111-2/+7
* | | | | | am fbcfad33: am bf4a69ac: recovery: sleep after writing partition and closing itDoug Zongker2013-07-111-2/+7
|\| | | | |
| * | | | | am bf4a69ac: recovery: sleep after writing partition and closing itDoug Zongker2013-07-101-2/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | recovery: sleep after writing partition and closing itDoug Zongker2013-07-101-2/+7
* | | | | | am e352c88f: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-07-110-0/+0
|\| | | | |
| * | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-07-100-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | recovery: write partitions more conservativelyDoug Zongker2013-07-101-24/+46
| | * | | | recovery: try to write EMMC partitions more reliablyDoug Zongker2013-07-102-7/+73
* | | | | | am 2148133d: am c870a99c: recovery: write partitions more conservativelyDoug Zongker2013-07-111-24/+46
|\| | | | |
| * | | | | am c870a99c: recovery: write partitions more conservativelyDoug Zongker2013-07-091-24/+46
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | recovery: write partitions more conservativelyDoug Zongker2013-07-091-24/+46
* | | | | | Merge "recovery: preserve recovery logs across cache wipes"Doug Zongker2013-07-091-2/+76
|\ \ \ \ \ \
| * | | | | | recovery: preserve recovery logs across cache wipesDoug Zongker2013-07-091-2/+76
* | | | | | | recovery: move log output to stdoutDoug Zongker2013-07-098-72/+72
|/ / / / / /
* | | | | | am 0ccaccf7: am 044a0b4d: recovery: try to write EMMC partitions more reliablyDoug Zongker2013-07-082-7/+73
|\| | | | |
| * | | | | am 044a0b4d: recovery: try to write EMMC partitions more reliablyDoug Zongker2013-07-082-7/+73
| |\| | | |
| | * | | | recovery: try to write EMMC partitions more reliablyDoug Zongker2013-07-082-7/+73
* | | | | | am 4d4b233e: am 2f6877a0: recovery: init backgroundIcon properly to avoid recovery mode crashyetta_wu2013-07-080-0/+0
|\| | | | |
| * | | | | am 2f6877a0: recovery: init backgroundIcon properly to avoid recovery mode crashyetta_wu2013-06-251-0/+4
| |\| | | |
| | * | | | recovery: init backgroundIcon properly to avoid recovery mode crashyetta_wu2013-06-251-0/+4
| | |/ / /
* | | | | recovery: init backgroundIcon properly to avoid recovery mode crashyetta_wu2013-07-021-0/+4
* | | | | recovery: copy logs to cache more aggressivelyDoug Zongker2013-07-021-9/+17
| |_|/ / |/| | |
* | | | am 8cd12112: am d51bfc9b: Merge "Fix the potential segmentation fault"Doug Zongker2013-06-041-1/+7
|\| | |
| * | | am d51bfc9b: Merge "Fix the potential segmentation fault"Doug Zongker2013-06-041-1/+7
| |\ \ \ | | |/ / | |/| |
| | * | Merge "Fix the potential segmentation fault"Doug Zongker2013-06-041-1/+7
| | |\ \
| | | * | Fix the potential segmentation faultJin Feng2013-06-041-1/+7
| | |/ /
* | | | am da1ebaef: recovery: save logs from the last few invocations of recoveryDoug Zongker2013-05-210-0/+0
|\| | |
| * | | recovery: save logs from the last few invocations of recoveryDoug Zongker2013-05-211-1/+19
* | | | am 7c3ae45e: recovery: turn on text display for install errors in debug buildsDoug Zongker2013-05-210-0/+0
|\| | |
| * | | recovery: turn on text display for install errors in debug buildsDoug Zongker2013-05-213-8/+47
* | | | recovery: save logs from the last few invocations of recoveryDoug Zongker2013-05-161-1/+19
* | | | recovery: turn on text display for install errors in debug buildsDoug Zongker2013-05-163-8/+47
* | | | Merge "verifier: update to support certificates using SHA-256"Doug Zongker2013-04-1213-109/+254
|\ \ \ \
| * | | | verifier: update to support certificates using SHA-256Doug Zongker2013-04-1013-109/+254
* | | | | am 4e21482d: Add liblogYing Wang2013-04-103-2/+3
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Add liblogYing Wang2013-04-103-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 mergeJean-Baptiste Queru2013-03-110-0/+0
|\| | |
| * | | am 2f50df00: am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
|/| | |
| * | | am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | |\ \
| | | * \ am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | |\ \
| | | | * | am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | |/| |
| | | | * | Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | |\ \
* | | | | | | more font improvements and cleanupDoug Zongker2013-03-0711-33/+378
* | | | | | | recovery: change font for menus to be an imageDoug Zongker2013-03-055-255/+38
* | | | | | | am ec838b88: Merge "minadbd: remove unnecessary header files."Nick Kralevich2013-03-011-2/+0
|\| | | | | |
| * | | | | | Merge "minadbd: remove unnecessary header files."Nick Kralevich2013-03-011-2/+0
| |\ \ \ \ \ \
| | * | | | | | minadbd: remove unnecessary header files.Nick Kralevich2013-03-011-2/+0
| |/ / / / / /
* | | | | | | Add a CleanSpec for bootable/recoveryBen Murdoch2013-02-221-0/+1
* | | | | | | Move to using the new unified fstab in recovery.Ken Sumrall2013-02-204-149/+55
* | | | | | | am f7d42340: am c560a67b: add optional overscan compensation to recovery graphicsDoug Zongker2013-01-033-5/+32
|\| | | | | |
| * | | | | | am c560a67b: add optional overscan compensation to recovery graphicsDoug Zongker2013-01-033-5/+32
| |\| | | | |
| | * | | | | add optional overscan compensation to recovery graphicsDoug Zongker2012-12-193-5/+32
* | | | | | | am 6a1d21a0: am bb01d0c1: add NextCheckKeyIsLong() and EnqueueKey() methodsDoug Zongker2012-12-182-9/+35
|\| | | | | |
| * | | | | | am bb01d0c1: add NextCheckKeyIsLong() and EnqueueKey() methodsDoug Zongker2012-12-182-9/+35
| |\| | | | | | | |_|_|_|/ | |/| | | |
| | * | | | add NextCheckKeyIsLong() and EnqueueKey() methodsDoug Zongker2012-12-172-9/+35
| | |/ / /
* | | | | am 9028fb4d: Merge "Pass the correct pointer to munmap on failure."Elliott Hughes2012-12-171-4/+4
|\| | | |
| * | | | Merge "Pass the correct pointer to munmap on failure."Elliott Hughes2012-12-171-4/+4
| |\ \ \ \
| | * | | | Pass the correct pointer to munmap on failure.Elliott Hughes2012-12-171-4/+4
| |/ / / /
* | | | | am 27f31606: (-s ours) am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
|\| | | |
| * | | | am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\| | |
| | | \ \
| | | \ \
| | *-. \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/
* | | | | move key loading to verifier codeDoug Zongker2012-11-024-103/+112
* | | | | reduce some recovery loggingDoug Zongker2012-10-192-7/+26
* | | | | am cd74108c: resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aospKenny Root2012-10-1711-53/+4
|\| | | |
| * | | | resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aospKenny Root2012-10-1711-53/+4
| |\ \ \ \
| | * \ \ \ Merge "Remove HAVE_SELINUX guards"Kenny Root2012-10-1711-53/+4
| | |\ \ \ \
| | | * | | | Remove HAVE_SELINUX guardsKenny Root2012-10-1611-53/+4
| | |/ / / /
* | | | | | am d0d4d44d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-10-100-0/+0
|\| | | | |
| | \ \ \ \
| | \ \ \ \
| *-. \ \ \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-10-100-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | * | | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
* | | | | am 4b57f8f2: am 6016d08b: recovery: fix failure to unmount "/cache"Devin Kim2012-10-101-0/+1
|\| | | |
| * | | | am 6016d08b: recovery: fix failure to unmount "/cache"Devin Kim2012-10-101-0/+1
| |\| | |
| | * | | recovery: fix failure to unmount "/cache"Devin Kim2012-10-091-0/+1
* | | | | am 2c3d1d83: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-090-0/+0
|\| | | |
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-090-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am 80fb6818: am 8347cb2d: revert to tacky 3D recovery animationDoug Zongker2012-10-0867-4/+4
|\| | | |
| * | | | am 8347cb2d: revert to tacky 3D recovery animationDoug Zongker2012-10-0867-4/+4
| |\| | |
| | * | | revert to tacky 3D recovery animationDoug Zongker2012-10-0867-4/+4
* | | | | am 6cc3ded2: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-260-0/+0
|\| | | |
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-260-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-250-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am a8db3764: am 6c8553dd: display error state on OTA failureDoug Zongker2012-09-241-4/+13
|\| | | |
| * | | | am 6c8553dd: display error state on OTA failureDoug Zongker2012-09-241-4/+13
| |\| | |
| | * | | display error state on OTA failureDoug Zongker2012-09-241-4/+13
* | | | | am 15eaee40: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
|\| | | |
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | tweak recovery text imagesDoug Zongker2012-09-195-1/+2
| | * | | localization for recovery messagesDoug Zongker2012-09-198-7/+53
* | | | | am 42afb545: am b66cb69e: tweak recovery text imagesDoug Zongker2012-09-195-1/+2
|\| | | |
| * | | | am b66cb69e: tweak recovery text imagesDoug Zongker2012-09-195-1/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | tweak recovery text imagesDoug Zongker2012-09-185-1/+2
* | | | | am ed3bc11e: am 5fa8c239: localization for recovery messagesDoug Zongker2012-09-188-7/+53
|\| | | |
| * | | | am 5fa8c239: localization for recovery messagesDoug Zongker2012-09-188-7/+53
| |\| | |
| | * | | localization for recovery messagesDoug Zongker2012-09-188-7/+53
* | | | | am 74a806e5: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
|\| | | |
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-050-0/+0
| |/| |
| | * | fix format of installing_textDoug Zongker2012-08-311-0/+0
* | | | am 52eeea4f: minor recovery fixesDoug Zongker2012-09-053-10/+13
|\| | |
| * | | minor recovery fixesDoug Zongker2012-09-043-10/+13
* | | | am f4c6ec84: fix format of installing_textDoug Zongker2012-08-301-0/+0
|\| | |
| * | | fix format of installing_textDoug Zongker2012-08-301-0/+0
| |/ /
* | | am aff4dbb0: Merge "recovery locale handling fixes" into jb-mr1-devDoug Zongker2012-08-306-9/+1
|\| |
| * | Merge "recovery locale handling fixes" into jb-mr1-devDoug Zongker2012-08-306-9/+1
| |\ \
| | * | recovery locale handling fixesDoug Zongker2012-08-306-9/+1
* | | | am d52ef348: am bddbb5b3: Merge "Fixing trivial warnings for libminui"Jean-Baptiste Queru2012-08-241-2/+2
|\| | |
| * | | am bddbb5b3: Merge "Fixing trivial warnings for libminui"Jean-Baptiste Queru2012-08-241-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Fixing trivial warnings for libminui"Jean-Baptiste Queru2012-08-241-2/+2
| | |\ \
| | | * | Fixing trivial warnings for libminuiEdwin Vane2012-08-211-2/+2
* | | | | am 3474ab28: Merge "Add libm due to libpng dependency." into jb-mr1-devStephen Hines2012-08-241-0/+1
|\| | | |
| * | | | Merge "Add libm due to libpng dependency." into jb-mr1-devStephen Hines2012-08-241-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add libm due to libpng dependency.Stephen Hines2012-08-241-0/+1
* | | | | am e630d945: am 6a693d57: Merge "Fixed warnings in libmtdutils"Jean-Baptiste Queru2012-08-241-4/+4
|\| | | |
| * | | | am 6a693d57: Merge "Fixed warnings in libmtdutils"Jean-Baptiste Queru2012-08-241-4/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Fixed warnings in libmtdutils"Jean-Baptiste Queru2012-08-231-4/+4
| | |\ \ \
| | | * | | Fixed warnings in libmtdutilsEdwin Vane2012-08-211-4/+4
| | | | |/ | | | |/|
* | | | | am 8876725f: am 0254d573: Merge "Fix multiple defined symbol errors"Jean-Baptiste Queru2012-08-241-1/+1
|\| | | |
| * | | | am 0254d573: Merge "Fix multiple defined symbol errors"Jean-Baptiste Queru2012-08-241-1/+1
| |\| | |
| | * | | Merge "Fix multiple defined symbol errors"Jean-Baptiste Queru2012-08-231-1/+1
| | |\ \ \
| | | * | | Fix multiple defined symbol errorsEdwin Vane2012-08-211-1/+1
| | | |/ /
* | | | | am 7b827d04: am 481e03e3: Merge "Fixed unused param warnings for check-lost+found"Jean-Baptiste Queru2012-08-241-1/+1
|\| | | |
| * | | | am 481e03e3: Merge "Fixed unused param warnings for check-lost+found"Jean-Baptiste Queru2012-08-241-1/+1
| |\| | |
| | * | | Merge "Fixed unused param warnings for check-lost+found"Jean-Baptiste Queru2012-08-231-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fixed unused param warnings for check-lost+foundEdwin Vane2012-08-211-1/+1
| | |/ /
* | | | am 4f33e55d: change recovery images to android with spinnerDoug Zongker2012-08-2368-13/+16
|\| | |
| * | | change recovery images to android with spinnerDoug Zongker2012-08-2368-13/+16
* | | | am 02ec6b88: add simple text to recovery UIDoug Zongker2012-08-2313-30/+274
|\| | |
| * | | add simple text to recovery UIDoug Zongker2012-08-2313-30/+274
| | |/ | |/|
* | | am a3ccba6d: add bonus data feature to imgdiff/imgpatch/applypatchDoug Zongker2012-08-216-22/+100
|\| |
| * | add bonus data feature to imgdiff/imgpatch/applypatchDoug Zongker2012-08-216-22/+100
* | | am 55850258: am 3733d218: Merge changes I664f8dc7,I4154db06,I5e1df90fJoe Onorato2012-08-171-0/+2
|\| |
| * | am 3733d218: Merge changes I664f8dc7,I4154db06,I5e1df90fJoe Onorato2012-08-173-37/+63
| |\|
| | * Merge changes I664f8dc7,I4154db06,I5e1df90fJoe Onorato2012-08-173-37/+63
| | |\
| | | * Use the static version of libsparseJoe Onorato2012-07-242-2/+2
| | | * Multiple modules with the same name are going away.Joe Onorato2012-07-222-36/+63
| | | * host modules don't need LOCAL_MODULE_TAGSJoe Onorato2012-07-221-1/+0
| | |/
| * | recovery: import init.recovery.${ro.hardware}.rcColin Cross2012-08-081-0/+2
* | | Use the static version of libsparseJoe Onorato2012-08-142-2/+2
* | | Multiple modules with the same name are going away.Joe Onorato2012-08-142-36/+63
* | | host modules don't need LOCAL_MODULE_TAGSJoe Onorato2012-08-141-1/+0
|/ /
* | fix the symlink() command to create directories if neededDoug Zongker2012-08-071-3/+29
* | fix conflicts with merge of jb-dev-makoEd Heyl2012-07-261-2/+4
|\ \
| * | minui: fix screen update issueDevin Kim2012-07-201-2/+4
* | | support version 2 (2048-bit e=65537) keys in recoveryDoug Zongker2012-07-256-5/+114
* | | am dd6cd4fc: Merge "graphics: add support for "single buffering""Doug Zongker2012-07-211-2/+10
|\ \ \ | | |/ | |/|
| * | Merge "graphics: add support for "single buffering""Doug Zongker2012-07-211-2/+10
| |\ \
| | * | graphics: add support for "single buffering"Octavian Purdila2012-07-121-2/+10
* | | | am 989a2859: Merge "Link against libsparse"Colin Cross2012-07-182-3/+3
|\| | |
| * | | Merge "Link against libsparse"Colin Cross2012-07-182-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | Link against libsparseColin Cross2012-07-182-3/+3
| |/ /
* | | allow double-quotes or not in TARGET_RECOVERY_PIXEL_FORMATDoug Zongker2012-07-111-2/+6
* | | Add mode when open(O_CREAT) is used.Nick Kralevich2012-06-271-2/+2
|/ /
* | am 6d60667d: Merge "Use a dependency file to replace the list file."Ying Wang2012-06-121-10/+14
|\ \
| * \ Merge "Use a dependency file to replace the list file."Ying Wang2012-06-121-10/+14
| |\ \
| | * | Use a dependency file to replace the list file.Ying Wang2012-06-111-10/+14
| |/ /
| | |
| \ \
*-. | | Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \| | | |_|/ |/| |
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-04-300-0/+0
|/| |
| * | merge in jb-release history after reset to masterThe Android Automerger2012-04-160-0/+0
| |\ \
| | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-100-0/+0
| | |\ \
| | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | |\ \
| | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-020-0/+0
| | | | |\ \
| | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-260-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-210-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | | | | | | |\ \
* | | | | | | | | | fix timed progress bars in recoveryDoug Zongker2012-04-261-4/+8
|/ / / / / / / / /
* | | | | | | | | am e5d5ac76: minor recovery changesDoug Zongker2012-04-124-4/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | minor recovery changesDoug Zongker2012-04-124-4/+18
* | | | | | | | | Merge "Add NOTICE file"Doug Zongker2012-04-091-0/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add NOTICE fileWei Zhong2012-04-061-0/+41
* | | | | | | | | | Update merge for SELinux to compileKenny Root2012-04-081-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | am 78911bdf: am 2a4ab824: Merge "Change the format command to always take the mount point as an argument."Kenny Root2012-04-071-13/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | am 2a4ab824: Merge "Change the format command to always take the mount point as an argument."Kenny Root2012-04-071-13/+4
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge "Change the format command to always take the mount point as an argument."Kenny Root2012-04-061-13/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Change the format command to always take the mount point as an argument.Stephen Smalley2012-04-031-13/+4
| | |/ / / / / / /
* | | | | | | | | Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | run minadbd as shell user, remove unused codeDoug Zongker2012-03-209-1171/+40
* | | | | | | | resolved conflicts for merge of 0b1fee1b to masterKenny Root2012-03-3112-16/+167
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | am 155cd3c1: Merge changes Ied379f26,I09fb9d56Kenny Root2012-03-3112-16/+167
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge changes Ied379f26,I09fb9d56Kenny Root2012-03-3112-16/+167
| | |\ \ \ \ \
| | | * | | | | Extend recovery and updater to support setting file security contexts.Stephen Smalley2012-03-3012-18/+153
| | | * | | | | Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used.Stephen Smalley2012-01-242-0/+16
| | |/ / / / /
* | | | | | | Merge "fail edify script if set_perm() or symlink() fails"Doug Zongker2012-03-221-0/+13
|\ \ \ \ \ \ \
| * | | | | | | fail edify script if set_perm() or symlink() failsDoug Zongker2012-03-221-0/+13
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge remote-tracking branch 'goog/ics-aah-exp'Mike Lockwood2012-03-210-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Merge "allow recovery UI to ignore certain keypresses" into ics-aahDoug Zongker2012-01-182-1/+4
| |\ \ \ \ \
| | * | | | | allow recovery UI to ignore certain keypressesDoug Zongker2012-01-182-1/+4
| * | | | | | support "sideload over ADB" modeDoug Zongker2012-01-1823-16/+5713
| |/ / / / /
| * | | | | fix verifier testDoug Zongker2011-11-012-7/+2
| * | | | | move key processing to RecoveryUIDoug Zongker2011-11-017-264/+296
| * | | | | Merge "verifier_test needs to provide a UI object" into ics-aahDoug Zongker2011-10-311-10/+36
| |\ \ \ \ \
| | * | | | | verifier_test needs to provide a UI objectDoug Zongker2011-10-311-10/+36
| * | | | | | C++ class for device-specific codeDoug Zongker2011-10-3110-245/+322
| * | | | | | refactor ui functions into a classDoug Zongker2011-10-297-324/+436
| |/ / / / /
| * | | | | turn recovery into a C++ binaryDoug Zongker2011-10-2820-148/+254
* | | | | | remove unused code from minadbdDoug Zongker2012-03-206-1157/+9
| |/ / / / |/| | | |
* | | | | run minadbd as shell userDoug Zongker2012-03-205-14/+31
| |_|_|/ |/| | |
* | | | remove retouching code from updaterDoug Zongker2012-02-283-334/+0
* | | | fix buildDoug Zongker2012-02-283-4/+4
* | | | fix failure to free memoryDoug Zongker2012-02-282-19/+45
* | | | am 62947db5: am 37d0f260: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | am 37d0f260: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | |\ \ | | | |/ | | |/|
* | | | libz is a superset of libunz, so we don't need both.Elliott Hughes2012-01-311-2/+2
* | | | allow recovery UI to ignore certain keypressesDoug Zongker2012-01-192-1/+4
* | | | always initialize usb product, vendor, etc. for adb in recoveryDoug Zongker2012-01-101-7/+9
* | | | Merge "support "sideload over ADB" mode"Doug Zongker2012-01-1022-9/+5704
|\ \ \ \
| * | | | support "sideload over ADB" modeDoug Zongker2012-01-1022-9/+5704
* | | | | recovery: convert all usages of $prop to ${prop}Dima Zavin2012-01-101-3/+3
* | | | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-1/+1
|/ / / /
* | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-061-2/+2
* | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-2/+2
* | | | mount cache before sideloading from external storageDoug Zongker2011-12-141-0/+4
* | | | am 9fc3e3c8: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
|\| | |
| * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-080-0/+0
| |\ \ \ | | |/ / | |/| / | | |/
* | | move key processing to RecoveryUIDoug Zongker2011-11-048-271/+298
* | | C++ class for device-specific codeDoug Zongker2011-10-3111-261/+364
* | | temporarily remove verifier_test binaryDoug Zongker2011-10-311-6/+6
* | | refactor ui functions into a classDoug Zongker2011-10-317-324/+436
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-10-310-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-release history after reset to masterThe Android Automerger2011-10-230-0/+0
| |\ \ | | |/ | |/|
| | * merge in ics-release history after reset to masterThe Android Automerger2011-10-160-0/+0
| | |\
| | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | |\
| | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-210-0/+0
| | | | |\
| | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-050-0/+0
| | | | | |\
| | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-220-0/+0
| | | | | | |\
| | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-07-150-0/+0
| | | | | | | |\
| | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-07-140-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-07-130-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-07-080-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-06-300-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-06-270-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-06-240-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-06-240-0/+0
| | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-06-230-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-06-210-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * Fix starting adb in recovery modeMike Lockwood2011-06-201-3/+27
* | | | | | | | | | | | | | | | | turn recovery into a C++ binaryDoug Zongker2011-10-3120-148/+254
|/ / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / allow recovery packages to wipe cacheDoug Zongker2011-10-194-26/+71
|/ / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / minui: add ability to synchronize current key stateDima Zavin2011-10-132-2/+38
|/ / / / / / / / / / / / / /
* / / / / / / / / / / / / / fix problem where the screen is sometimes all black in recoveryDoug Zongker2011-09-271-0/+3
|/ / / / / / / / / / / / /
* / / / / / / / / / / / / update recovery with new 3D imagesDoug Zongker2011-09-2010-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | minui: events: only open input devices with EV_KEY and/or EV_RELDima Zavin2011-09-021-0/+17
* | | | | | | | | | | | minui: events: add ability to poll on non-input fdsDima Zavin2011-09-022-3/+23
* | | | | | | | | | | | minui: events: refactor event acquisitionDima Zavin2011-09-023-75/+121
* | | | | | | | | | | | minui: graphics: add interface for framebuffer blank/unblankDima Zavin2011-08-302-0/+13
* | | | | | | | | | | | minui: graphics: add ability to query font sizeDima Zavin2011-08-302-0/+7
|/ / / / / / / / / / /
* / / / / / / / / / / change recovery images to match blue holo themeDoug Zongker2011-08-2018-1/+1
|/ / / / / / / / / /
* / / / / / / / / / Support multiple recovery updater extensions.Michael Ward2011-07-151-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge "Check pointer for null before dereferencing"Doug Zongker2011-07-141-0/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Check pointer for null before dereferencingAdam Bliss2011-07-141-0/+8
* | | | | | | | | Merge "Update usb_connected() to support new gadget driver"Benoit Goby2011-07-131-4/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update usb_connected() to support new gadget driverBenoit Goby2011-07-121-4/+5
| | |/ / / / / / / | |/| | | | | | |
* / | | | | | | | Remove the simulator target from all makefiles.Jeff Brown2011-07-124-16/+0
|/ / / / / / / /
* | / / / / / / Add missing commands to recovery init.rcMichael Ward2011-07-071-0/+3
| |/ / / / / / |/| | | | | |
* | | | | | | init.rc: Simplify logic for starting adbd in recoveryMike Lockwood2011-06-291-25/+6
| |/ / / / / |/| | | | |
* | | | | | Allow applying an OTA package manually from cache.Michael Ward2011-06-243-9/+33
* | | | | | Get the correct line_length.Michael Ward2011-06-241-2/+37
| |/ / / / |/| | | |
* | | | | fix adb root in recoveryDoug Zongker2011-06-241-0/+4
| |/ / / |/| | |
* | | | Graphics can handle stride != xres, and BGRA support.Michael Ward2011-06-232-12/+18
| |/ / |/| |
* | | Fix starting adb in recovery modeMike Lockwood2011-06-191-3/+27
| |/ |/|
* | am f84b2524: am 6ebedf00: am 82da01d6: Merge from gingerbreadJean-Baptiste Queru2011-06-080-0/+0
|\ \
| * \ am 6ebedf00: am 82da01d6: Merge from gingerbreadJean-Baptiste Queru2011-06-070-0/+0
| |\ \
| | * \ am 82da01d6: Merge from gingerbreadJean-Baptiste Queru2011-06-010-0/+0
| | |\ \
| | | * \ Merge from gingerbreadJean-Baptiste Queru2011-06-011-1/+1
| | | |\ \
* | | | | | am a94d9548: am 1117c69f: am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbreadJean-Baptiste Queru2011-06-080-0/+0
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | am 1117c69f: am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbreadJean-Baptiste Queru2011-06-070-0/+0
| |\| | |
| | * | | am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbreadJean-Baptiste Queru2011-06-011-1/+1
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Merge "Mute unharmful build warning at the top of the build log:" into gingerbreadJean-Baptiste Queru2011-05-311-1/+1
| | | |\
| | | | * Mute unharmful build warning at the top of the build log:Ying Wang2011-05-251-1/+1
| | | |/
* | | | Reconcile with honeycomb-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \ \
| * | | | store partition length in recovery.fstabDoug Zongker2011-02-252-9/+41
* | | | | am c2a158db: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTEThe Android Automerger2011-05-090-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTEThe Android Automerger2011-05-090-0/+0
| |\ \ \ \
| | * | | | delay accessing misc partition until its device existsDoug Zongker2011-05-041-0/+21
* | | | | | am 90588820: delay accessing misc partition until its device existsDoug Zongker2011-05-040-0/+0
|\| | | | |
| * | | | | delay accessing misc partition until its device existsDoug Zongker2011-05-041-0/+21
| |/ / / /
* | | | | delay accessing misc partition until its device existsDoug Zongker2011-04-221-0/+21
* | | | | make write_raw_image able to take a blobDoug Zongker2011-04-131-27/+40
* | | | | save a last_install file with the result of the last package install attemptDoug Zongker2011-04-124-6/+30
* | | | | am 4762633c: log which key a package verified against in recoveryDoug Zongker2011-03-151-1/+1
|\| | | |
| * | | | log which key a package verified against in recoveryDoug Zongker2011-03-151-1/+1
* | | | | recovery: mount /sdcard read-onlyIliyan Malchev2011-03-121-2/+3
* | | | | am 6e4472ab: Have recovery reboot using the new android_reboot() function.Ken Sumrall2011-03-112-5/+4
|\| | | |
| * | | | Have recovery reboot using the new android_reboot() function.Ken Sumrall2011-03-112-5/+4
* | | | | am 6ce4a326: don\'t reboot for inactivity if USB is connectedDoug Zongker2011-03-090-0/+0
|\| | | |
| * | | | don't reboot for inactivity if USB is connectedDoug Zongker2011-03-091-13/+38
* | | | | don't reboot for inactivity if USB is connectedDoug Zongker2011-03-081-13/+38
* | | | | am 68189f29: allow paletted RGB images in recoveryDoug Zongker2011-03-081-2/+7
|\| | | |
| * | | | allow paletted RGB images in recoveryDoug Zongker2011-03-051-2/+7
* | | | | Merge branch 'master' of ssh://android-git:29418/platform/bootable/recoveryEric Fischer2011-03-040-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | convert recovery images to palettized PNGsDoug Zongker2011-03-039-0/+0
* | | | | convert recovery images to palettized PNGsDoug Zongker2011-03-049-0/+0
|/ / / /
* | | | change the default recovery assets to be in holograph styleDoug Zongker2011-03-0225-11/+111
* | | | make recovery UI images more general; allow for installation animationDoug Zongker2011-03-016-50/+169
* | | | am 8d43d940: am 2c273f00: store partition length in recovery.fstabDoug Zongker2011-02-250-0/+0
|\ \ \ \
| * \ \ \ am 2c273f00: store partition length in recovery.fstabDoug Zongker2011-02-252-9/+41
| |\ \ \ \
| | * | | | store partition length in recovery.fstabDoug Zongker2011-02-252-9/+41
| | |/ / /
* | | | | store partition length in recovery.fstabDoug Zongker2011-02-182-9/+41
* | | | | Fix x86 build.Ying Wang2011-02-093-7/+0
* | | | | am 5df22d03: am 5cae445e: make recovery reboot after 2 minutes of no activityDoug Zongker2011-01-253-4/+42
|\| | | |
| * | | | am 5cae445e: make recovery reboot after 2 minutes of no activityDoug Zongker2011-01-253-4/+42
| |\| | |
| | * | | make recovery reboot after 2 minutes of no activityDoug Zongker2011-01-253-4/+42
* | | | | am da993fcf: am 8d58c957: Merge "Free allocated struct after freeing field"Doug Zongker2011-01-221-1/+1
|\| | | |
| * | | | am 8d58c957: Merge "Free allocated struct after freeing field"Doug Zongker2011-01-221-1/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge "Free allocated struct after freeing field"Doug Zongker2011-01-201-1/+1
| | |\ \
| | | * | Free allocated struct after freeing fieldChristian Lindeberg2011-01-191-1/+1
| | |/ /
* | | | Merge "remove encrypted filesystem code from recovery"Doug Zongker2011-01-214-399/+2
|\ \ \ \ | |/ / / |/| | |
| * | | remove encrypted filesystem code from recoveryDoug Zongker2011-01-184-399/+2
* | | | Reserve the last 16 Kbytes of /data for the crypto footer.Ken Sumrall2011-01-202-10/+17
|/ / /
* | | option to allow recovery to use 24-bit graphics in UIDoug Zongker2011-01-142-10/+22
* | | Update make_ext4fs arguments in roots.cColin Cross2011-01-061-1/+1
* | | Update arguments to make_ext4fsColin Cross2010-12-291-1/+1
* | | am c5ebf1fb: am 5d6309e7: fix comparison of ECC stats before and after mtd readsDoug Zongker2010-11-041-0/+2
|\| |
| * | am 5d6309e7: fix comparison of ECC stats before and after mtd readsDoug Zongker2010-11-031-0/+2
| |\|
| | * fix comparison of ECC stats before and after mtd readsDoug Zongker2010-11-031-0/+2
* | | am 8521ef59: am 51266d13: clear recovery framebuffers on allocation; display icon right after ui_initDoug Zongker2010-11-012-1/+3
|\| |
| * | am 51266d13: clear recovery framebuffers on allocation; display icon right after ui_initDoug Zongker2010-11-012-1/+3
| |\|
| | * clear recovery framebuffers on allocation; display icon right after ui_initDoug Zongker2010-11-012-1/+3
* | | am 2d87023e: am 2c3539e4: save the log from recovery\'s last run in /cache/recovery/last_logDoug Zongker2010-09-301-17/+40
|\| |
| * | am 2c3539e4: save the log from recovery\'s last run in /cache/recovery/last_logDoug Zongker2010-09-291-17/+40
| |\|
| | * save the log from recovery's last run in /cache/recovery/last_logDoug Zongker2010-09-291-17/+40
* | | am 704fa750: am 9b125b04: handle old-style CACHE: packagesDoug Zongker2010-09-221-2/+18
|\| |
| * | am 9b125b04: handle old-style CACHE: packagesDoug Zongker2010-09-221-2/+18
| |\|
| | * handle old-style CACHE: packagesDoug Zongker2010-09-221-2/+18
* | | am af78591c: am 2c3c5c15: Merge "mount sdcard only on demand; fix sideload installs" into gingerbreadDoug Zongker2010-09-222-3/+26
|\| |
| * | am 2c3c5c15: Merge "mount sdcard only on demand; fix sideload installs" into gingerbreadDoug Zongker2010-09-222-3/+26
| |\|
| | * Merge "mount sdcard only on demand; fix sideload installs" into gingerbreadDoug Zongker2010-09-222-3/+26
| | |\
| | | * mount sdcard only on demand; fix sideload installsDoug Zongker2010-09-222-3/+26
* | | | am 8147ba85: (-s ours) am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge)Doug Zongker2010-09-210-0/+0
|\| | |
| * | | am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge)Doug Zongker2010-09-211-2/+2
| |\| |
| | * | use fs_type "emmc" instead of "block" for consistency (do not merge)Doug Zongker2010-09-211-2/+2
| | |/
* | | remove the notion of "root path"; support mixed flash typesDoug Zongker2010-09-219-535/+323
* | | am 3dba40da: (-s ours) am d4208f9f: remove the notion of "root path"; support mixed flash types (do not merge)Doug Zongker2010-09-210-0/+0
|\| |
| * | am d4208f9f: remove the notion of "root path"; support mixed flash types (do not merge)Doug Zongker2010-09-219-471/+340
| |\|
| | * remove the notion of "root path"; support mixed flash types (do not merge)Doug Zongker2010-09-219-471/+340
* | | resolved conflicts for merge of 40f0d3b4 to masterDoug Zongker2010-09-183-82/+3
|\| |
| * | am d7d42089: remove unneeded partition rootsDoug Zongker2010-09-173-82/+2
| |\|
| | * remove unneeded partition rootsDoug Zongker2010-09-173-82/+2
* | | am 1dcd2fd0: (-s ours) am 792b0071: do not merge - update to match ext4utils apiBrian Swetland2010-09-160-0/+0
|\| |
| * | am 792b0071: do not merge - update to match ext4utils apiBrian Swetland2010-09-161-1/+1
| |\|
| | * do not merge - update to match ext4utils apiBrian Swetland2010-09-161-1/+1
* | | add missing sparseness parameterDoug Zongker2010-09-161-1/+1
* | | resolved conflicts for merge of 85bcf776 to masterDoug Zongker2010-09-160-0/+0
|\| |
| * | am 8a8e6cc3: (cherry-pick) EMMC support in applypatchDoug Zongker2010-09-152-103/+176
| |\|
| | * (cherry-pick) EMMC support in applypatchDoug Zongker2010-09-152-103/+176
* | | resolved conflicts for merge of 9f89b0e4 to masterDoug Zongker2010-09-161-1/+1
|\| |
| * | am 56c5105b: support for ext4/EMMC filesystems in updater binaryDoug Zongker2010-09-156-37/+76
| |\|
| | * support for ext4/EMMC filesystems in updater binaryDoug Zongker2010-09-156-37/+76
* | | resolved conflicts for merge of 76445f3a to masterDoug Zongker2010-09-161-20/+9
|\| |
| * | am 8674a726: (cherry-pick) support installing any .zip file on the sdcardDoug Zongker2010-09-154-29/+144
| |\|
| | * (cherry-pick) support installing any .zip file on the sdcardDoug Zongker2010-09-154-29/+144
* | | am 858f0a76: am 8e5e4dad: close update package before installing; allow remountDoug Zongker2010-09-165-3/+17
|\| |
| * | am 8e5e4dad: close update package before installing; allow remountDoug Zongker2010-09-155-3/+17
| |\|
| | * close update package before installing; allow remountDoug Zongker2010-09-155-3/+17
* | | am bd4bc088: am d12560aa: add the ability to seek to a raw location while reading MTD partitionDoug Zongker2010-09-152-0/+8
|\| |
| * | am d12560aa: add the ability to seek to a raw location while reading MTD partitionDoug Zongker2010-09-152-0/+8
| |\|
| | * add the ability to seek to a raw location while reading MTD partitionDoug Zongker2010-09-152-0/+8
* | | am f94a3575: am 61ba7a83: stop treating all-zero blocks as badDoug Zongker2010-09-121-8/+1
|\| |
| * | am 61ba7a83: stop treating all-zero blocks as badDoug Zongker2010-09-121-8/+1
| |\|
| | * stop treating all-zero blocks as badDoug Zongker2010-09-121-8/+1
* | | am a2c9a1e8: am aaf3f56c: block is bad if ioctl() returns nonzeroDoug Zongker2010-09-101-2/+5
|\| |
| * | am aaf3f56c: block is bad if ioctl() returns nonzeroDoug Zongker2010-09-101-2/+5
| |\|
| | * block is bad if ioctl() returns nonzeroDoug Zongker2010-09-101-2/+5
* | | am 28cae98c: am 4bc98062: add --show_text option to recoveryDoug Zongker2010-09-033-0/+11
|\| |
| * | am 4bc98062: add --show_text option to recoveryDoug Zongker2010-09-033-0/+11
| |\|
| | * add --show_text option to recoveryDoug Zongker2010-09-033-0/+11
* | | am 4c7c2f73: (-s ours) am 532c8600: Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3Ying Wang2010-09-020-0/+0
|\| |
| * | am 532c8600: Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3Ying Wang2010-09-013-6/+5
| |\|
| | * Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3Ying Wang2010-09-013-6/+5
* | | am 17b44ee3: (-s ours) am 21f0f97e: Fix for crespo.Ying Wang2010-09-020-0/+0
|\| |
| * | am 21f0f97e: Fix for crespo.Ying Wang2010-09-013-5/+6
| |\|
| | * Fix for crespo.Ying Wang2010-08-313-5/+6
* | | am 97900287: am 965f9dc4: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forwardJean-Baptiste Queru2010-08-240-0/+0
|\| |
| * | am 965f9dc4: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forwardJean-Baptiste Queru2010-08-240-0/+0
| |\|
| | * merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forwardJean-Baptiste Queru2010-08-240-0/+0
| | |\
| | | * fix bug in applying patchesDoug Zongker2010-08-131-1/+1
| | | * remove shadowed variable declarationDoug Zongker2010-08-131-1/+2
* | | | am c080bc54: am fbd7ae7a: am 201cd466: remove shadowed variable declarationDoug Zongker2010-08-161-1/+2
|\| | |
| * | | am fbd7ae7a: am 201cd466: remove shadowed variable declarationDoug Zongker2010-08-131-1/+2
| |\| |
| | * | am 201cd466: remove shadowed variable declarationDoug Zongker2010-08-131-1/+2
| | |\ \
| | | * | remove shadowed variable declarationDoug Zongker2010-08-131-1/+2
* | | | | Changes to work with updated make_ext4fs tool that supports creating sparse images.Ken Sumrall2010-08-142-2/+2
* | | | | am c4e32005: am 17986e6b: am 8cd9e4f3: fix bug in applying patchesDoug Zongker2010-08-131-1/+1
|\| | | |
| * | | | am 17986e6b: am 8cd9e4f3: fix bug in applying patchesDoug Zongker2010-08-131-1/+1
| |\| | |
| | * | | am 8cd9e4f3: fix bug in applying patchesDoug Zongker2010-08-131-1/+1
| | |\| |
| | | * | fix bug in applying patchesDoug Zongker2010-08-131-1/+1
| | | |/
* | | | support using an EMMC misc partition to store recovery argumentsDoug Zongker2010-08-132-3/+56
* | | | Working ASLR implementationHristo Bojinov2010-08-0210-18/+649
* | | | don't go into file select menu when mounting external storage failsDoug Zongker2010-08-021-1/+4
* | | | generalize "install from sdcard" to "install from external storage"Doug Zongker2010-07-304-9/+11
* | | | Mute unwanted error messageYing Wang2010-07-211-1/+1
* | | | resolved conflicts for merge of c02c37a1 to masterDoug Zongker2010-07-092-8/+122
|\| | |
| * | | am 23ceeea8: make a copy of sideloaded packages in /tmp before verifyingDoug Zongker2010-07-092-4/+117
| |\| |
| | * | make a copy of sideloaded packages in /tmp before verifyingDoug Zongker2010-07-092-4/+117
* | | | EMMC support in applypatchDoug Zongker2010-07-082-103/+176
* | | | support for ext4/EMMC filesystems in updater binaryDoug Zongker2010-07-026-37/+76
* | | | Merge "support userdata and cache partitions using emmc/ext4 instead of mtd/yaffs"Doug Zongker2010-07-012-5/+40
|\ \ \ \
| * | | | support userdata and cache partitions using emmc/ext4 instead of mtd/yaffsDoug Zongker2010-06-302-5/+40
* | | | | am 60faafcf: merge from open-source masterThe Android Open Source Project2010-07-010-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | merge from open-source masterThe Android Open Source Project2010-07-010-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | am ecc76ba5: Set adbd to be disabled by default in recoveryKenny Root2010-06-281-0/+1
| | |\|
* | | | am c78a9698: am ecc76ba5: Set adbd to be disabled by default in recoveryKenny Root2010-06-281-0/+1
|\| | |
| * | | am ecc76ba5: Set adbd to be disabled by default in recoveryKenny Root2010-06-281-0/+1
| |\ \ \ | | | |/ | | |/|
| | * | Set adbd to be disabled by default in recoveryKenny Root2010-06-281-0/+1
* | | | am 21b97ed5: Add __attribute__((format(printf, a, b))) to printf like functions.Nick Kralevich2010-06-252-2/+2
|\| | |
| * | | Add __attribute__((format(printf, a, b))) to printf like functions.Nick Kralevich2010-06-252-2/+2
* | | | am dd6a0412: recovery: Add ueventd serviceColin Cross2010-05-141-0/+4
|\| | |
| * | | recovery: Add ueventd serviceColin Cross2010-05-141-0/+4
* | | | am be42930f: am 97ca48e7: generic_x86 supportBruce Beare2010-05-041-0/+2
|\| | |
| * | | am 97ca48e7: generic_x86 supportBruce Beare2010-05-041-0/+2
| |\ \ \ | | | |/ | | |/|
| | * | generic_x86 supportBruce Beare2010-05-041-0/+2
| | |/
* | | support installing any .zip file on the sdcardDoug Zongker2010-04-084-24/+144
* | | am 52219a68: (-s ours) DO NOT MERGE Encrypted File Systems integration. Recovery changes.Oscar Montemayor2010-04-020-0/+0
|\| |
| * | DO NOT MERGEOscar Montemayor2010-04-026-242/+354
* | | Merge "Encrypted File Systems part 3. Recovery changes."Oscar Montemayor2010-03-316-242/+354
|\ \ \
| * | | Encrypted File Systems part 3. Recovery changes.Oscar Montemayor2010-03-156-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 Montemayor2010-03-300-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * / am 2654f5aa: (-s ours) DO NOT MERGE Removing unused recovey options. Please refer to Bug#2502219 for more info.Oscar Montemayor2010-03-300-0/+0
|/| | | |/
| * DO NOT MERGEOscar Montemayor2010-03-274-268/+2
|/
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-091-0/+49
* make StringValue wrapper okay to call on NULLDoug Zongker2010-02-251-0/+1
* refactor applypatch and friendsDoug Zongker2010-02-2312-1322/+1296
* add missing includes to fix mac build (maybe)Doug Zongker2010-02-202-0/+4
* relocate applypatch; add type system and new functions to edifyDoug Zongker2010-02-1822-112/+4239
* Filename check and free allocated stringsKenny Root2010-02-182-0/+7
* am da846fcf: am 4c382b13: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\
| * am 4c382b13: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\
| | * reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| | |\
| | | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
| | | |\
| | | | * android-2.1_r1 snapshotThe Android Open Source Project2010-01-132-6/+13
* | | | | bump updater API version to 3; deprecate firmware update commandDoug Zongker2010-02-0314-599/+16
* | | | | Merge "change log recovery to generic device_recovery_start function"Doug Zongker2010-02-024-4/+10
|\ \ \ \ \
| * | | | | change log recovery to generic device_recovery_start functionDoug Zongker2010-02-024-4/+10
* | | | | | add a one-argument version of package_extract_fileDoug Zongker2010-02-013-24/+113
|/ / / / /
* | | | | fix parsing of dumpkeys outputDoug Zongker2010-01-291-4/+4
* | | | | save the recovery log from before HTC firmware updatesDoug Zongker2010-01-215-6/+117
* | | | | am 4e9332cb: am 22d79a5c: make offsets in firmware update header not point to bad blocksDoug Zongker2010-01-130-0/+0
|\| | | |
| * | | | am 22d79a5c: make offsets in firmware update header not point to bad blocksDoug Zongker2010-01-133-8/+51
| |\| | |
| | * | | make offsets in firmware update header not point to bad blocksDoug Zongker2010-01-133-8/+51
| | |/ /
* | | | make offsets in firmware update header not point to bad blocksDoug Zongker2010-01-133-8/+51
* | | | am 158657bc: merge from open-source masterJean-Baptiste Queru2009-12-220-0/+0
|\| | |
| * | | merge from open-source masterJean-Baptiste Queru2009-12-220-0/+0
| |\ \ \
| | * | | Security: Fix typo in recovery EOCD detection.Steve Kondik2009-12-091-1/+1
* | | | | am d36308c2: am 17a47098: use MEMGETBADBLOCK to look for bad blocks when reading MTD partitionsDoug Zongker2009-12-161-5/+12
|\| | | |
| * | | | am 17a47098: use MEMGETBADBLOCK to look for bad blocks when reading MTD partitionsDoug Zongker2009-12-151-5/+12
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | use MEMGETBADBLOCK to look for bad blocks when reading MTD partitionsDoug Zongker2009-12-151-5/+12
* | | | | Merge commit 'goog/eclair-plus-aosp'Android Git Automerger2009-12-150-0/+0
|\| | | |
| * | | | am c652e41d: fix cut-and-paste error in verifierDoug Zongker2009-12-091-1/+1
| |\| | |
* | | | | am 9b430e11: am 73ae31ce: add a simple unit test for the OTA package verifierDoug Zongker2009-12-1111-2/+203
|\ \ \ \ \
| * \ \ \ \ am 73ae31ce: add a simple unit test for the OTA package verifierDoug Zongker2009-12-1111-2/+203
| |\ \ \ \ \
| | * | | | | add a simple unit test for the OTA package verifierDoug Zongker2009-12-1011-2/+203
* | | | | | | Merge change I117fdea9Android (Google) Code Review2009-12-104-22/+303
|\ \ \ \ \ \ \
| * | | | | | | Recovery changes for Encrypted File Systems.Oscar Montemayor2009-12-104-22/+303
* | | | | | | | am 2278a04a: am 9acf28a3: am c652e41d: fix cut-and-paste error in verifierDoug Zongker2009-12-101-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | am 9acf28a3: am c652e41d: fix cut-and-paste error in verifierDoug Zongker2009-12-101-1/+1
| |\| | | | |
| | * | | | | am c652e41d: fix cut-and-paste error in verifierDoug Zongker2009-12-091-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | fix cut-and-paste error in verifierDoug Zongker2009-12-091-1/+1
* | | | | | | am 6e5be9b2: merge from open-source masterJean-Baptiste Queru2009-11-160-0/+0
|\| | | | | |
| * | | | | | merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | merge from eclairJean-Baptiste Queru2009-11-1518-458/+582
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | eclair snapshotJean-Baptiste Queru2009-11-1318-458/+582
* | | | | | | am 4011770f: merge from open-source masterJean-Baptiste Queru2009-10-150-0/+0
|\| | | | | |
| * | | | | | merge from open-source masterJean-Baptiste Queru2009-10-151-3/+6
| |\| | | | | | | |_|_|/ / | |/| | | |
| | * | | | am 54ec81fe: Merge change I1c8ca2e4 into eclairDoug Zongker2009-10-083-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | am 988500b6: add terminator to recovery\'s getopt_long options arrayDoug Zongker2009-10-071-0/+1
| | |\ \ \ \
* | | | | | | am d93a2545: simplify construction of the recovery progress barDoug Zongker2009-10-1316-26/+19
|\| | | | | |
| * | | | | | simplify construction of the recovery progress barDoug Zongker2009-10-0916-26/+19
| | |_|/ / / | |/| | | |
* | | | | | am 54ec81fe: Merge change I1c8ca2e4 into eclairDoug Zongker2009-10-123-0/+0
|\| | | | |
| * | | | | Merge change I1c8ca2e4 into eclairAndroid (Google) Code Review2009-10-083-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | replace generic recovery iconsDoug Zongker2009-10-033-0/+0
* | | | | | am 988500b6: add terminator to recovery\'s getopt_long options arrayDoug Zongker2009-10-121-0/+1
|\| | | | |
| * | | | | add terminator to recovery's getopt_long options arrayDoug Zongker2009-10-061-0/+1
| |/ / / /
* | | | | am 8f8bc4cb: am f93d8166: confirm before wiping user data in recoveryDoug Zongker2009-09-251-69/+107
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am f93d8166: confirm before wiping user data in recoveryDoug Zongker2009-09-231-69/+107
| |\| | |
| | * | | confirm before wiping user data in recoveryDoug Zongker2009-09-231-69/+107
* | | | | am 486aa290: am fd8fb0c4: reduce fraction of progress bar for verificationDoug Zongker2009-09-201-1/+1
|\| | | |
| * | | | am fd8fb0c4: reduce fraction of progress bar for verificationDoug Zongker2009-09-201-1/+1
| |\| | |
| | * | | reduce fraction of progress bar for verificationDoug Zongker2009-09-201-1/+1
* | | | | am d16fb221: am 60babf8b: delete files before symlinking; log error messagesDoug Zongker2009-09-191-3/+21
|\| | | |
| * | | | am 60babf8b: delete files before symlinking; log error messagesDoug Zongker2009-09-191-3/+21
| |\| | |
| | * | | delete files before symlinking; log error messagesDoug Zongker2009-09-191-3/+21
* | | | | am 2f4fc561: am 196c25c7: don\'t complain if recovery icon is shortDoug Zongker2009-09-171-1/+5
|\| | | |
| * | | | am 196c25c7: don\'t complain if recovery icon is shortDoug Zongker2009-09-151-1/+5
| |\| | |
| | * | | don't complain if recovery icon is shortDoug Zongker2009-09-151-1/+5
* | | | | am b5d542cd: am a3f89eab: add a run_program() function to edifyDoug Zongker2009-09-101-0/+49
|\| | | |
| * | | | am a3f89eab: add a run_program() function to edifyDoug Zongker2009-09-101-0/+49
| |\| | |
| | * | | add a run_program() function to edifyDoug Zongker2009-09-101-0/+49
* | | | | am 9a77b613: merge from open-source masterJean-Baptiste Queru2009-09-040-0/+0
|\| | | |
| * | | | merge from open-source masterJean-Baptiste Queru2009-09-040-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | merge from donutJean-Baptiste Queru2009-09-031-0/+1
| | |\ \ \ | | | | |/ | | | |/|
* | | | | am cbf90380: merge from open-source masterJean-Baptiste Queru2009-09-011-3/+6
|\| | | |
| * | | | merge from open-source masterJean-Baptiste Queru2009-09-011-3/+6
| |\| | | | | |_|/ | |/| |
| | * | Not all failures to fopen_root_path() are serious.Jay Freeman (saurik)2009-08-251-3/+6
* | | | am 34c98df7: (-s ours) do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from masterDoug Zongker2009-08-180-0/+0
|\| | |
| * | | do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from masterDoug Zongker2009-08-181-0/+10
* | | | Recovery: When updating from SD card, update can't resume automaticallyJared Suttles2009-08-181-0/+10
* | | | am 54e2e86c: (-s ours) do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branchDoug Zongker2009-08-170-0/+0
|\| | |
| * | | do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branchDoug Zongker2009-08-173-330/+155
* | | | verify whole-file signature instead of jarsigner signaturesDoug Zongker2009-08-153-330/+155
|/ / /
* | | merge from open-source masterJean-Baptiste Queru2009-08-040-0/+0
|\| |
| * | merge from donutJean-Baptiste Queru2009-07-2971-5257/+4
| |\ \
* | \ \ am 20697b96: only build flash_image for engDoug Zongker2009-08-041-0/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | only build flash_image for engDoug Zongker2009-07-241-0/+1
| | |/ | |/|
* | | reconcile korg/master into goog/masterJean-Baptiste Queru2009-07-260-0/+0
|\ \ \ | | |/ | |/|
| * | Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-2667-1221/+2704
| |\ \
* | | | fix compile warnings in recovery, change imagesDoug Zongker2009-07-236-4/+5
* | | | resolved conflicts for merge of 64893ccc to masterDoug Zongker2009-07-1671-5257/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | remove amendDoug Zongker2009-07-1571-5257/+4
| | |/ | |/|
* | | am bec02d57: skip over all-zero blocks when reading MTD partitionDoug Zongker2009-07-031-1/+12
|\| |
| * | skip over all-zero blocks when reading MTD partitionDoug Zongker2009-07-011-1/+12
* | | am d8f7c9b8: Merge change 5545 into donutAndroid (Google) Code Review2009-06-301-1/+6
|\| |
| * | Merge change 5545 into donutAndroid (Google) Code Review2009-06-261-1/+6
| |\ \
| | * | remove updater from the user system imageDoug Zongker2009-06-261-1/+6
* | | | am 0bbfe3d9: fix off-by-one error in set_perm()Doug Zongker2009-06-251-1/+1
|\| | |
| * | | fix off-by-one error in set_perm()Doug Zongker2009-06-251-1/+1
| |/ /
* | | am fbf3c10e: improve updater progress barDoug Zongker2009-06-252-4/+34
|\| |
| * | improve updater progress barDoug Zongker2009-06-242-4/+34
* | | add device extension mechanism to updaterDoug Zongker2009-06-222-1/+43
* | | add function for device-specific wipe data featuresDoug Zongker2009-06-194-2/+20
* | | am 47cace98: add file_getprop() to updaterDoug Zongker2009-06-183-11/+117
|\| |
| * | add file_getprop() to updaterDoug Zongker2009-06-183-11/+117
* | | resolved conflicts for merge of fb2e3af3 to masterDoug Zongker2009-06-185-27/+74
|\| |
| * | let the "firmware" command take the file straight from the packageDoug Zongker2009-06-185-26/+56
* | | am e3da02e7: add less_than_int, greater_than_int to edifyDoug Zongker2009-06-152-0/+63
|\| |
| * | add less_than_int, greater_than_int to edifyDoug Zongker2009-06-132-0/+63
* | | am d9c9d10d: fixes to edify and updater scriptDoug Zongker2009-06-159-509/+674
|\| |
| * | fixes to edify and updater scriptDoug Zongker2009-06-129-509/+674
* | | am 8edb00c9: edify extensions for OTA package installation, part 2Doug Zongker2009-06-157-16/+291
|\| |
| * | edify extensions for OTA package installation, part 2Doug Zongker2009-06-127-16/+291
* | | am 9dbc027b: fix sim build in donut, tooDoug Zongker2009-06-120-0/+0
|\| |
| * | fix sim build in donut, tooDoug Zongker2009-06-121-4/+4
* | | am 9931f7f3: edify extensions for OTA package installation, part 1Doug Zongker2009-06-1213-13/+694
|\| |
| * | edify extensions for OTA package installation, part 1Doug Zongker2009-06-1213-13/+694
* | | fix simulator build by excluding more of recoveryDoug Zongker2009-06-121-3/+4
* | | fix error from change 3606Doug Zongker2009-06-111-18/+18
* | | split out device-specific recovery UI code into vendor directoriesDoug Zongker2009-06-116-72/+171
* | | am 9b9c2114: Merge change 3514 into donutAndroid (Google) Code Review2009-06-107-0/+889
|\| |
| * | Merge change 3514 into donutAndroid (Google) Code Review2009-06-107-0/+889
| |\ \
| | * | core of edify, an eventual replacement for amendDoug Zongker2009-06-107-0/+889
* | | | Force the fb into 16 bpp mode in case the hw has some other default.Rebecca Schultz Zavin2009-06-061-0/+1
* | | | am b2ee9201: allow OTA package to provide binary instead of scriptDoug Zongker2009-06-051-1/+169
|\| | |
| * | | allow OTA package to provide binary instead of scriptDoug Zongker2009-06-051-1/+169
| |/ /
* | | am f28c916e: remove unused permissions scheme from amendDoug Zongker2009-06-0312-1076/+69
|\| |
| * | remove unused permissions scheme from amendDoug Zongker2009-06-0312-1076/+69
* | | am 07e1dca7: don\'t say "install complete" when it really isn\'tDoug Zongker2009-06-014-2/+14
|\| |
| * | don't say "install complete" when it really isn'tDoug Zongker2009-05-294-2/+14
* | | am 1c4ceae: undo temporary alignment hackDoug Zongker2009-05-082-48/+8
|\| |
| * | undo temporary alignment hackDoug Zongker2009-05-082-48/+8
* | | am 683c462: align data passed to write() on 32k boundariesDoug Zongker2009-05-062-17/+55
|\| |
| * | align data passed to write() on 32k boundariesDoug Zongker2009-05-062-17/+55
* | | am 596271f: handle short writes when unzipping filesDoug Zongker2009-04-301-11/+27
|\| |
| * | handle short writes when unzipping filesDoug Zongker2009-04-301-11/+27
* | | Merge donut into masterJean-Baptiste Queru2009-04-230-0/+0
|\| |
| * | merge cupcake into donutJean-Baptiste Queru2009-04-230-0/+0
| |\ \
* | | | Merge donut into masterJean-Baptiste Queru2009-04-230-0/+0
|\| | |
| * | | AI 144130: Don't build OTA package keys into the recovery binary; readDoug Zongker2009-04-022-21/+88
| * | | AI 144082: Remove the unused "unpacking" recovery icon.Doug Zongker2009-04-013-2/+0
| * | | AI 144070: Add an option to wipe cache (only) to the recovery menu.Doug Zongker2009-04-011-0/+9
| * | | AI 143128: Use PNG instead of BMP for recovery image icons. This savesDoug Zongker2009-03-2736-101/+68
| * | | Automated import from //branches/donutburger/...@142141,142141Doug Zongker2009-03-251-4/+9
| * | | Automated import from //branches/donutburger/...@140818,140818Dianne Hackborn2009-03-251-0/+190
* | | | Merge branch 'readonly-p4-master'Doug Zongker2009-04-022-21/+88
|\ \ \ \
| * | | | AI 144132: am: CL 144130 Don't build OTA package keys into the recovery binary; readDoug Zongker2009-04-022-21/+88
* | | | | Merge branch 'readonly-p4-master'Doug Zongker2009-04-023-2/+0
|\| | | |
| * | | | AI 144105: am: CL 144082 Remove the unused "unpacking" recovery icon.Doug Zongker2009-04-023-2/+0
* | | | | Merge branch 'readonly-p4-master'Doug Zongker2009-04-021-0/+9
|\| | | |
| * | | | AI 144101: am: CL 144070 Add an option to wipe cache (only) to the recovery menu.Doug Zongker2009-04-021-0/+9
* | | | | Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project2009-03-290-0/+0
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge commit 'korg/cupcake'The Android Open Source Project2009-03-272-4/+199
| |\ \ \ | | | |/ | | |/|
| | * | Automated import from //branches/cupcake/...@142138,142138Doug Zongker2009-03-251-4/+9
| | * | auto import from //branches/cupcake_rel/...@141571The Android Open Source Project2009-03-201-0/+190
| | |/
| * | Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru2009-03-194-48/+254
| |\|
| * | Remove obsolete OTA toolsJean-Baptiste Queru2009-03-022-343/+0
| * | Merge branch 'cupcake'The Android Open Source Project2009-01-101-24/+79
| |\ \
* | | | AI 143289: am: CL 143128 Use PNG instead of BMP for recovery image icons. This savesDoug Zongker2009-03-2836-101/+68
* | | | Automated import from //branches/master/...@142142,142142Doug Zongker2009-03-251-4/+9
* | | | Automated import from //branches/master/...@140824,140824Dianne Hackborn2009-03-251-0/+190
| |_|/ |/| |
* | | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-04135-0/+14368
* | | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-04137-14711/+0
* | | auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-032-0/+343
* | | auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-032-343/+0
* | | auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-114-48/+254
| |/ |/|
* | auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-101-24/+79
|/
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1811-35/+341
* Initial ContributionThe Android Open Source Project2008-10-21134-0/+14144