aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 4381767a: Merge "imgdiff: Avoid infinite loop if inflate fails"Tao Bao2015-04-161-0/+9
|\ | | | | | | | | * commit '4381767aa6410902e07376f62f66bbef83ebf2c4': imgdiff: Avoid infinite loop if inflate fails
| * 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
| | | | | | | | | | | | | | | | | | | | | Break out of the loop if inflate returns an error and print some details. Change-Id: Ie157cf943291b1a26f4523b17691dfcefbc881dc
* | | am 7176a617: Merge "Don\'t use typedefs that hide *s."Elliott Hughes2015-04-158-59/+54
|\ \ \ | |/ / | | | | | | | | | * commit '7176a61718e7b45a8fde3a25eada0c9425d1dece': Don't use typedefs that hide *s.
| * | 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
| |/ / | | | | | | | | | | | | | | | gr_surface was causing confusion for no good reason. Change-Id: If7120187f9a00dd16297877fc49352185a4d4ea6
* | | am 6e435abf: Merge "Move the menu header out of the menu."Elliott Hughes2015-04-158-66/+72
|\ \ \ | |/ / | | | | | | | | | * commit '6e435abfeb7256b5ea82ca37166acf36e3f98085': Move the menu header out of the menu.
| * | 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-138-66/+72
| |/ | | | | | | | | | | | | | | | | | | | | This makes it easier for us to deal with arbitrary information at the top, and means that headers added by specific commands don't overwrite the default ones. Add the fingerprint back, but broken up so it fits even on sprout's display. Change-Id: Id71da79ab1aa455a611d72756a3100a97ceb4c1c
* | am 17b032e1: Merge "Add missing \n after "Mounting /system." message."Elliott Hughes2015-04-131-1/+1
|\ \ | |/ | | | | | | * commit '17b032e159779886f0151641a9aad5003debdce2': Add missing \n after "Mounting /system." message.
| * 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
| |/ | | | | | | Change-Id: I280a478526f033f5c0041d7e8a818fce6177d732
* | am eab12de7: Merge "Remove unnecessary globals."Elliott Hughes2015-04-134-64/+55
|\ \ | |/ | | | | | | * commit 'eab12de70efb649ab33f7971e948251895d613fe': Remove unnecessary globals.
| * Merge "Remove unnecessary globals."Elliott Hughes2015-04-134-64/+55
| |\
| | * Remove unnecessary globals.Elliott Hughes2015-04-134-64/+55
| | | | | | | | | | | | Change-Id: I76a042432aede08ceaf250319cf5eeb25d601150
* | | am b68c4fc4: Merge "Treat KEY_ENTER the same as KEY_POWER in the pager."Elliott Hughes2015-04-131-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'b68c4fc42617acb97dde89f501caf8558a348b51': Treat KEY_ENTER the same as KEY_POWER in the pager.
| * | 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
| |/ | | | | | | | | | | | | | | Our long-press UI sends KEY_ENTER for long presses, which the long-press UI treats as equivalent to KEY_POWER in the regular UI. So anywhere we accept KEY_POWER we should accept KEY_ENTER too. Change-Id: I99d376c961887043cf02037c26d000c8ba4d66f9
* | am 0e3781ef: Merge "Rewritten file pager."Elliott Hughes2015-04-112-65/+88
|\ \ | |/ | | | | | | * commit '0e3781ef9af2df648f54eb2a7765bef7b6b5b22e': Rewritten file pager.
| * Merge "Rewritten file pager."Elliott Hughes2015-04-112-65/+88
| |\
| | * Rewritten file pager.Elliott Hughes2015-04-102-65/+88
| | | | | | | | | | | | | | | | | | Most importantly, this one no longer skips lines because of wrapping. Change-Id: Ic1c1944682ab8cbf3d542418ee86d29819173fc9
* | | am 558ba1ba: Merge "Revert "Append kernel logs to last_log file""Tao Bao2015-04-111-46/+42
|\ \ \ | |/ / | | | | | | | | | * commit '558ba1bafa232935148b6483dc40277cdf4be292': Revert "Append kernel logs to last_log file"
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2ec803f4350f7b72f5dd65c5f27656c6807e2966. Change-Id: I419025a772ef99db4c0a78bfa7ef66767f3fa062
* | | | am 464c3e71: Merge "Append kernel logs to last_log file"Tao Bao2015-04-111-42/+46
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '464c3e718f4c52444d17ab66ab6c9f71936cd4b8': Append kernel logs to last_log file
| * | | Merge "Append kernel logs to last_log file"Tao Bao2015-04-111-42/+46
| |\ \ \ | | |/ /
| | * | Append kernel logs to last_log fileTao Bao2015-04-101-42/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we are keeping one copy of the kernel log (LAST_KMSG_FILE). This CL changes to append it to the recovery log. Bug: 18092237 Change-Id: I06ad5629016846927153064f1663753a90296f79
* | | | am 6d1bd3d3: Merge "Update the comments for package installer commands"Tao Bao2015-04-101-1/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6d1bd3d3d4f7e715b2692696eb75e1927a4cd954': Update the comments for package installer commands
| * | | Merge "Update the comments for package installer commands"Tao Bao2015-04-101-1/+13
| |\ \ \ | | |_|/ | |/| |
| | * | Update the comments for package installer commandsTao Bao2015-04-101-1/+13
| | |/ | | | | | | | | | | | | | | | | | | | | | These commands are for the communication between the installer and the update binary (edify interpreter). Update the comments in sync with the codes. Change-Id: I7390f022b1447049a974b0b45697ef1d2e71d4e0
* | | am f19007a5: Merge "Auto-detect whether to use the long-press UI."Elliott Hughes2015-04-106-41/+56
|\ \ \ | |/ / | | | | | | | | | * commit 'f19007a5252d62020c3ac8796908d9ee4653830d': Auto-detect whether to use the long-press UI.
| * | Merge "Auto-detect whether to use the long-press UI."Elliott Hughes2015-04-106-41/+56
| |\ \ | | |/ | |/|
| | * Auto-detect whether to use the long-press UI.Elliott Hughes2015-04-106-41/+56
| |/ | | | | | | Change-Id: Ie77a5584e301467c6a5e164d2c62d6f036b2c0c0
* | am 51697d27: Merge "Switch minadb over to C++."Elliott Hughes2015-04-109-31/+24
|\ \ | |/ | | | | | | * commit '51697d2781501c30d8db6d2a8e6c2becebcffad8': Switch minadb over to C++.
| * Merge "Switch minadb over to C++."Elliott Hughes2015-04-109-31/+24
| |\
| | * Switch minadb over to C++.Elliott Hughes2015-04-109-31/+24
| |/ | | | | | | Change-Id: I5afaf70caa590525627c676c88b445d3162de33e
* | am 23017c5d: Merge "Switch minui over to C++."Elliott Hughes2015-04-108-102/+82
|\ \ | |/ | | | | | | * commit '23017c5d5c145a1040ee49466d30489d6e11bb61': Switch minui over to C++.
| * Merge "Switch minui over to C++."Elliott Hughes2015-04-108-102/+82
| |\
| | * Switch minui over to C++.Elliott Hughes2015-04-108-102/+82
| |/ | | | | | | Change-Id: I59e08a304ae514a3fdb6fab58721f11670bc1b01
* | am 5d1630a9: Merge "Fix ScreenRecoveryUI to handle devices without ↵Elliott Hughes2015-04-107-48/+96
|\ \ | |/ | | | | | | | | | | power/up/down." * commit '5d1630a926a02ca13a66eb1e385eabba16b04cfc': Fix ScreenRecoveryUI to handle devices without power/up/down.
| * 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
| |/ | | | | | | | | | | | | | | Currently fugu has a custom subclass to handle this. The default code supports devices with trackballs but not all shipping Nexus devices? That's just silly. Change-Id: Id2779c91284899a26b4bb1af41e7033aa889df10
* | am 6b0dd1d7: Merge "Move "Mount /system" to the main menu."Elliott Hughes2015-04-106-55/+42
|\ \ | |/ | | | | | | * commit '6b0dd1d7e1e1f3645230f880db95cad1279a826b': Move "Mount /system" to the main menu.
| * 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
| |/ | | | | | | | | | | | | Everyone's adding secret key combinations for this anyway, and it's very useful when debugging. Change-Id: Iad549452b872a7af963dd649f283ebcd3ea24234
* | am 18eaa0cf: Merge "Add ev_iterate_available_keys to minui."Elliott Hughes2015-04-103-94/+126
|\ \ | |/ | | | | | | * commit '18eaa0cfe7aa775546369de829a1ff3049cf82a5': Add ev_iterate_available_keys to minui.
| * 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
| |/ | | | | | | | | | | | | This lets us recognize whether we have up/down/power, say, and tailor the UI accordingly. Change-Id: If94e454f14243b59d2f473ac9a436bd60591da01
* | am f471861e: Merge "Move the recovery image version out of the menu header."Elliott Hughes2015-04-101-21/+7
|\ \ | |/ | | | | | | * commit 'f471861e832e4be3a07359dfb72c1812de64b7ac': Move the recovery image version out of the menu header.
| * Merge "Move the recovery image version out of the menu header."Elliott Hughes2015-04-101-21/+7
| |\
generated by cgit v1.1 at 2025-01-23 04:54:18 +0000