aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | am 29759e9d: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEADBill Yi2014-04-301-1/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | * commit '29759e9d518880adba366c502cf79d53c48a31bb':
| | * | | | 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
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa4545b5aedae165c8d2db0009dcdfa18e4f7923': restore minui support for paletted images with < 8 bits
| | | * \ \ \ resolved conflicts for merge of 708aa238 to klp-dev-plus-aospDoug Zongker2014-03-181-4/+10
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1d15be84cec58e23472ef2014d322f3f55c6bb8
| | | * \ \ \ \ am 130a7985: Merge "fix error log statement"Doug Zongker2014-03-171-1/+1
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '130a7985386f7f7741179fc38b1a15da7ec9f358': fix error log statement
| | | * \ \ \ \ \ resolved conflicts for merge of d90da130 to klp-dev-plus-aospDoug Zongker2014-03-176-244/+253
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I19f9f460145fdcf5cdc58ee4fa25ff3c9ba398f0
| | | * \ \ \ \ \ \ am 026ebe02: Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-1411-30/+33
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc': Recovery 64-bit compile issues
| | | * \ \ \ \ \ \ \ am a7266ef0: Merge "separate fbdev-specific code out from minui"Doug Zongker2014-03-135-152/+268
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7266ef0b1804e3ddeea58bda9a416e807a55f88': separate fbdev-specific code out from minui
| | | * \ \ \ \ \ \ \ \ am c91612d4: Merge "remove pixelflinger from recovery"Doug Zongker2014-03-136-274/+358
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c91612d4668688c5d7bf76c258c11010697a03d2': remove pixelflinger from recovery
| | | * \ \ \ \ \ \ \ \ \ am 8f087d02: Merge "update tools for making recovery images"Doug Zongker2014-03-132-102/+53
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8f087d024619467de8609656e8a14370f24b817c': update tools for making recovery images
| | | * \ \ \ \ \ \ \ \ \ \ am 59508993: Merge "allow CheckKey to request mounting /system"Doug Zongker2014-03-133-3/+52
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5950899369b712f66aa56c857c66ed1b6741f0e0': allow CheckKey to request mounting /system
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'ea868b38' into manualmergeDoug Zongker2014-03-1318-103/+204
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: screen_ui.cpp screen_ui.h Change-Id: Iefe7dde04cc76639f56730a19238436073f18ffb
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am 2f173bde: Merge "ADB sideload command not work"Doug Zongker2014-03-113-11/+358
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f173bde6584f4c560ecc3f13f6e890f52815050': ADB sideload command not work
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am ac189bf6: Merge "recovery: Fix adb with linux 3.10"Benoit Goby2014-03-071-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac189bf645123b4dc79cd2053f5eb07917774d66': recovery: Fix adb with linux 3.10
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"Colin Cross2014-03-073-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5d105e2397d81537facd93fd8a9d3e263d57dc9': recovery: fix building with pointer-to-int errors turned on
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9e8d81ba: am 0e22af65: recovery: Fix adb with linux 3.10Benoit Goby2014-04-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9e8d81ba96b299cc084723797d9f492d4441d57a': recovery: Fix adb with linux 3.10
| * | | | | | | | | | | | | | | | | | am 0e22af65: recovery: Fix adb with linux 3.10Benoit Goby2014-04-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e22af658c89fb53ab1215a3538bbaf10d733ad9': recovery: Fix adb with linux 3.10
| | * | | | | | | | | | | | | | | | | | recovery: Fix adb with linux 3.10Benoit Goby2014-04-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In kernel 3.10, f_adb has been removed and adbd can use functionfs instead. Mount functionfs on boot for adbd. On older kernels, mount will fail silently and adbd will revert to f_adb. Bug: 14160609 Change-Id: I5db57aaf35b35859ea88c7d0e0661d8c553e5811
* | | | | | | | | | | | | | | | | | | | am ecf1f6c9: am 558f2700: Merge "Change filesystem add entry API call."Sasha Levitskiy2014-04-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecf1f6c9299c0cae2f2bf1647f5d7d3a2690f819': Change filesystem add entry API call.
| * | | | | | | | | | | | | | | | | | | am 558f2700: Merge "Change filesystem add entry API call."Sasha Levitskiy2014-04-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '558f2700e18d50cf8e798254200ef37f7a09678d': Change filesystem add entry API call.
| | * | | | | | | | | | | | | | | | | | Merge "Change filesystem add entry API call."Sasha Levitskiy2014-04-111-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Change filesystem add entry API call.Sasha Levitskiy2014-04-111-1/+1
| | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needs fs_mgr matching change from: Icf23e659265d71d5226d527c2b40cfbc132320ee Change-Id: I9adb470b04e4301989d128c9c3097b21b4dea431 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | | | | | | | | | | | | | | | | | | make density-specific recovery assetsDoug Zongker2014-04-0458-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide different recovery UI resources for different display densities. Right now only the text images and the progress bars are rescaled; the main icon will get scaled when it's updated for QP. Lightly quantum-ify the rest of the recovery interface. (Light background, progress bars, etc.) Change-Id: Ia639c4ce8534b01bc843524efbc4b040c1cf38b3
* | | | | | | | | | | | | | | | | | | add reboot-to-bootloader and power down options to recovery menuDoug Zongker2014-04-013-18/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful when debugging or developing for recovery. Change-Id: Ic3ab42d5e848ad3488f1c575339b55e45c8a024b
* | | | | | | | | | | | | | | | | | | remove DefaultDevice's UI subclassDoug Zongker2014-04-012-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RecoveryUI (which is the superclass of ScreenRecoveryUI), provides a basic CheckKey method that is useful for devices that have KEY_POWER, KEY_VOLUMEUP, and KEY_VOLUMEDOWN. Stop overriding it with a less featureful method; with this no recovery UI customization is needed for most handheld devices (phones, tablets, etc.). Change-Id: I7d57cfaaef79afea8af4fc3dbc570afc61aeb5bc
* | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cryptfs.h now includes sha header from libcrypto folder Change-Id: Icd02c88971aedf96040c3bd9ca759e531546023b
* | | | | | | | | | | | | | | | | | | | am 03008bc1: am aa4545b5: Merge "restore minui support for paletted images ↵Doug Zongker2014-03-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with < 8 bits" * commit '03008bc1e89a780e382abe0567e709daecce92ff': restore minui support for paletted images with < 8 bits
| * | | | | | | | | | | | | | | | | | | am aa4545b5: Merge "restore minui support for paletted images with < 8 bits"Doug Zongker2014-03-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa4545b5aedae165c8d2db0009dcdfa18e4f7923': restore minui support for paletted images with < 8 bits
| | * | | | | | | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PNG image loaders should support images that use palettes requiring fewer than 8 bits. Change-Id: Ibcb0ff6f04aea8de54b03c0efa7a79e9b3635146
* | | | | | | | | | | | | | | | | | | recovery: 64 bit build issuesMark Salyzyn2014-03-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie88c49dea13cce5f4eb428e97f5a0956f2656a30
* | | | | | | | | | | | | | | | | | | am 03002477: am bacf9b45: add --shutdown_after option to recoveryDoug Zongker2014-03-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0300247758cf1965867128c79d94e0b2c38a69aa': add --shutdown_after option to recovery
| * | | | | | | | | | | | | | | | | | am bacf9b45: add --shutdown_after option to recoveryDoug Zongker2014-03-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bacf9b4558c69e918d9c05b6f111bbb223829829': add --shutdown_after option to recovery
| | * | | | | | | | | | | | | | | | | add --shutdown_after option to recoveryDoug Zongker2014-03-181-4/+10
| | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "--shutdown_after" option causes recovery to power down the device on completion rather than rebooting. Removes the last vestiges of the "--previous_runs" argument, which doesn't seem to be used for anything. Change-Id: I465eda2ef59d367e2b1c79a8dc69831263c69a4d Conflicts: recovery.cpp
* | | | | | | | | | | | | | | | | | am b4bbf887: resolved conflicts for merge of 708aa238 to ↵Doug Zongker2014-03-181-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit 'b4bbf8878c3a6b2a17a3a96f1a23300748dbd81a': add --shutdown_after option to recovery
| * | | | | | | | | | | | | | | | | resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aospDoug Zongker2014-03-181-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d00437d519f93652ccae6b361e89e853ccae9b3
| | * | | | | | | | | | | | | | | | Merge "add --shutdown_after option to recovery"Doug Zongker2014-03-181-4/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | add --shutdown_after option to recoveryDoug Zongker2014-03-181-4/+10
| | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "--shutdown_after" option causes recovery to power down the device on completion rather than rebooting. Removes the last vestiges of the "--previous_runs" argument, which doesn't seem to be used for anything. Change-Id: I465eda2ef59d367e2b1c79a8dc69831263c69a4d
* | | | | | | | | | | | | | | | | am 47c7e365: am 130a7985: Merge "fix error log statement"Doug Zongker2014-03-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '47c7e365071f75489604b2d0ba3109fe39bac1ef': fix error log statement
| * | | | | | | | | | | | | | | | am 130a7985: Merge "fix error log statement"Doug Zongker2014-03-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '130a7985386f7f7741179fc38b1a15da7ec9f358': fix error log statement
| | * | | | | | | | | | | | | | | Merge "fix error log statement"Doug Zongker2014-03-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | fix error log statementDoug Zongker2014-03-171-1/+1
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were printing the address of channels instead of the value there. Change-Id: I652340c7c1a0abaf01af555e54d2c0366d21ad78
* | | | | | | | | | | | | | | | am 80c1a386: resolved conflicts for merge of d90da130 to ↵Doug Zongker2014-03-176-244/+253
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '80c1a386d3f614919708b37986919ecaf74ee738': refactor image resource loading code in minui
| * | | | | | | | | | | | | | | resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aospDoug Zongker2014-03-176-244/+253
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib95b5bcd8d24014e1f2a956d2f31c99a471d3e30
| | * | | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the number of copies of libpng boilerplate. Rename res_create_* functions to be more clear. Make explicit the use of the framebuffer pixel format for images, and handle more combinations of input and output (eg, loading a grayscale image for display rather than use as a text alpha channel). Change-Id: I3d41c800a8f4c22b2f0167967ce6ee4d6b2b8846
* | | | | | | | | | | | | | | minzip: 64 bit build issueMark Salyzyn2014-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression - verification and extraction on memory, not files Bug: 12188746 Change-Id: Ib6facc4aff6be3a31a7d184ef1c493fdd4012c21
* | | | | | | | | | | | | | | am 4b6de1ba: am 026ebe02: Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-1411-30/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49': Recovery 64-bit compile issues
| * | | | | | | | | | | | | | am 026ebe02: Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-1411-30/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc': Recovery 64-bit compile issues