summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Handle BLKDISCARD failures"Sami Tolvanen2015-05-281-2/+1
|\
| * Handle BLKDISCARD failuresSami Tolvanen2015-05-281-2/+1
|/
* 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
|/
* 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
* | 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
* | | 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
|/
* Merge "Stop using libstdc++."Dan Albert2015-05-203-5/+3
|\
| * Stop using libstdc++.Dan Albert2015-05-193-5/+3
|/
* 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
* | 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
|/
* 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
|/
* Merge "Fix build following adb change."Dan Albert2015-05-081-5/+1
|\
| * Fix build following adb change.Dan Albert2015-05-081-5/+1
|/
* 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
* | Merge "uncrypt: Switch to C++"Tao Bao2015-05-062-42/+40
|\ \ | |/ |/|
| * uncrypt: Switch to C++Tao Bao2015-05-062-42/+40
|/
* 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
* | 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
| |/
* | Merge "Keep multiple kernel logs"Tao Bao2015-05-051-82/+73
|\ \ | |/ |/|
| * Keep multiple kernel logsTao Bao2015-05-051-82/+73
|/
* 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
|/
* Merge "Fix mips64 minadbd_test build."Elliott Hughes2015-05-021-1/+1
|\
| * Fix mips64 minadbd_test build.Elliott Hughes2015-05-021-1/+1
|/
* 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
* | Merge "Fix minadb_test build breakage."Elliott Hughes2015-05-021-1/+1
|\ \ | |/ |/|
| * Fix minadb_test build breakage.Elliott Hughes2015-05-021-1/+1
|/
* Merge "Check all lseek calls succeed."Elliott Hughes2015-04-3014-128/+112
|\
| * Check all lseek calls succeed.Elliott Hughes2015-04-3014-128/+112
|/
* 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
|/
* 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
|/
* 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
* | 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
|/
* 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
|/
* 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
* | 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
|/ /
* | 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
|/
* 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
|/
* Merge "Remove unnecessary globals."Elliott Hughes2015-04-134-64/+55
|\
| * Remove unnecessary globals.Elliott Hughes2015-04-134-64/+55
* | 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
|/
* Merge "Rewritten file pager."Elliott Hughes2015-04-112-65/+88
|\
| * Rewritten file pager.Elliott Hughes2015-04-112-65/+88
* | 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
* | | 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
* | | 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
| |/
* | 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
|/
* Merge "Switch minadb over to C++."Elliott Hughes2015-04-109-31/+24
|\
| * Switch minadb over to C++.Elliott Hughes2015-04-109-31/+24
|/
* Merge "Switch minui over to C++."Elliott Hughes2015-04-108-102/+82
|\
| * Switch minui over to C++.Elliott Hughes2015-04-108-102/+82
|/
* 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
|/
* 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
|/
* 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
|/
* 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
|/
* Merge "Move default implementations into Device."Elliott Hughes2015-04-104-84/+99
|\
| * Move default implementations into Device.Elliott Hughes2015-04-094-84/+99
* | Merge "Remove some commented-out code."Elliott Hughes2015-04-091-10/+0
|\ \ | |/ |/|
| * Remove some commented-out code.Elliott Hughes2015-04-091-10/+0
|/
* Merge "Move file paging into ScreenRecoveryUI."Elliott Hughes2015-04-095-95/+104
|\
| * Move file paging into ScreenRecoveryUI.Elliott Hughes2015-04-095-95/+104
|/
* Merge "Enable printf format argument checking."Elliott Hughes2015-04-094-5/+5
|\
| * Enable printf format argument checking.Elliott Hughes2015-04-094-5/+5
|/
* 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
* | 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
|/
* 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
|/
* 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
* | 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
|/ /
* | 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
|/ /
* | 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
|/ /
* | 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
|/ /
* | 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
|/ /
* | Merge "Remove support for Cupcake kernels."Elliott Hughes2015-03-251-17/+0
|\ \
| * | Remove support for Cupcake kernels.Elliott Hughes2015-03-241-17/+0
|/ /
* | Merge "Fix recovery image text rendering."Elliott Hughes2015-03-243-32/+25
|\ \
| * | Fix recovery image text rendering.Elliott Hughes2015-03-243-32/+25
|/ /
* | 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
|/
* Merge "Make the recovery menus wrap."Elliott Hughes2015-03-241-2/+5
|\
| * Make the recovery menus wrap.Elliott Hughes2015-03-231-2/+5
* | 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
|/
* 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
|/
* Merge "Remove unused libutils references."Dan Albert2015-03-142-2/+1
|\
| * Remove unused libutils references.Dan Albert2015-03-142-2/+1
|/
* 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