aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-070-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | https://android.googlesource.com/platform/bootable/recovery into cm-13.0 Android 6.0.1 release 3
| * | am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: ↵Narayan Kamath2015-09-160-0/+0
| |\ \ | | |/ | |/| | | | | | | | | | | | | am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE * commit '15da523e5fe7dbdc3a8d49c809042bc760081920': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | * am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: ↵Narayan Kamath2015-09-160-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE * commit '3c7f655bf0382776617d3c98293e28d9967c9a96': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | | * am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: ↵Narayan Kamath2015-09-160-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track usage of Vector / SortedVector from libutils DO NOT MERGE * commit '0e804d542a2c151d254cad0d8581d9709a394a9a': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | | | * am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of ↵Narayan Kamath2015-09-160-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vector / SortedVector from libutils DO NOT MERGE * commit 'd396b9dbd99924f7c8687227b22220a87c85d9c7': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | | | | * am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / ↵Narayan Kamath2015-09-120-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SortedVector from libutils DO NOT MERGE * commit '710b6bb9d7d36ce16453850efc3112016a77e9ff': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | | | | | * am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector ↵Narayan Kamath2015-09-100-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from libutils DO NOT MERGE * commit 'ec4b58ad8a21b511bf6b136792bb924eb6e9e299': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | | | | | | * am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-101-0/+1
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec63d564a86ad5b30f75aa307b4bd271f6a96a56': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | | | | | | | * Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 22953624 Change-Id: Ifcc17e39433ac91ca41da5d336fb3006dfbb65a8
* | | | | | | | | recovery: Remove "Supported API" messageMichael Bestas2015-12-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iac2153403ee66c8544c7d809f7b037aedeaf9d21
* | | | | | | | | recovery: Drop dependency on mkfs.f2fsMichael Bestas2015-12-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * It's provided by fstools in CM Change-Id: I62d3fc1c8f9056d3de6150c381680c2f1130fbbf
* | | | | | | | | minui: don't drop EV_ABS (touch) eventsDrew Walton2015-12-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d16c5cffb28d6621c8079ed6cb38381cc9d43b5
* | | | | | | | | recovery: Fix size of text arrayTom Marshall2015-12-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text_ is rendered using the log font, so alloc appropriately. Change-Id: If6306512978aff2f32bcee072a24cd6bdd042016
* | | | | | | | | recovery: Assimilate minivoldTom Marshall2015-12-022-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduces recovery footprint by ~306kb. Change-Id: Ibc2d791b6dbf7e125cd95f753d0b4e46fca1e827
* | | | | | | | | recovery: fstools: symlink sgdisk so we can actually use itTom Marshall2015-12-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5c5fb2f95fb5f2577493311c9cb252ab47c98d2
* | | | | | | | | recovery: Switch to CyanogenMod brandingTom Marshall2015-12-025-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will visually differentiate COS recovery from CM recovery so that users know at a glance which they are running. Images created by: Asher Simonds <asher@cyngn.com> Change-Id: I110158ed6644fa62b9a38f1f672ebc7dbfa726c1
* | | | | | | | | fstools: Invite sfdisk to the partyTom Marshall2015-12-013-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduces recovery footprint by ~256kb. Change-Id: I544c14923859cee394485fac37b8c3822ec31b30
* | | | | | | | | recovery: Fix mounting f2fs partitionsTom Marshall2015-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d94b611ab9a873b6b57a6d22bf78de131e3c8e5
* | | | | | | | | sr: Set context for minivoldSteve Kondik2015-11-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Or recovery doesn't start at all. Change-Id: Ib7b933ed15640483d9f4fb9362398a88c922a776
* | | | | | | | | sr: Fix build when oemlock plugin is enabledSteve Kondik2015-11-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic600231c9883a6e951ad951455b5af426fd4207a
* | | | | | | | | update-binary: support reboot_now on older recoveriesBrint E. Kriebel2015-11-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempt to reboot using older methods in case the recovery that we are updating does not support init reboots Ticket: CYNGNOS-1242 Change-Id: I9d6ec23c65291221e99d67b2361a2bd150319eee
* | | | | | | | | minui: support to pan display (FBIOPAN_DISPLAY)Daniel Hillenbrand2015-11-252-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for newer hisilicon boards Change-Id: I9a5d640b1168de518885b89f63499c6f31958b75
* | | | | | | | | recovery: Separate blkid.tab for vold in recoveryMatt Mower2015-11-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vold does not have selinux permissions to read/write files in rootfs. By default, libext2_blkid writes a cache file to /etc/blkid.tab. Set environment variable BLKID_FILE just for use by the vold service, changing the cache file location to /tmp/vold_blkid.tab which can then take advantage of context vold_tmpfs. Change-Id: I70d233d3d6f4e82bc7d781a04ef7707b733b4a1b
* | | | | | | | | updater: Add LZMA support to blockimgSteve Kondik2015-11-255-3/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This adds support for LZMA compressed blockimages. The space savings from doing this is significant and will reduce our CDN costs by quite a bit. * I'll spend the saved $$$ on beer. Change-Id: I6679220aaa29592fe6bbccd4136f0c239e45e2ae
* | | | | | | | | updater: Allow devices to suppress BLKDISCARDandi342015-11-252-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * On some devices TRIM is disabled for security reasons. Don't fail flashing the ROM because discard isn't possible in this case. Change-Id: I044619c3e0b01a496d967ef136501d0190240ad4
* | | | | | | | | recovery: Allow devices to reboot to download modeAndreas Blaesius2015-11-253-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib6ccf98ed68efacbb3b8c8238945da60b23a20d7
* | | | | | | | | Improve placement of progress bar.Danny Baumann2015-11-251-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit text output to 1/4 of screen height during installation, and center icon and progress bar inside the remaining space. Change-Id: I4b56db78d13931fdd79580b801260bdfca0e9726
* | | | | | | | | Don't disable including TARGET_RECOVERY_UI_LIB if existsdhacker292015-11-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for fugu (Nexus Player) as it has one button on the bottom. Change-Id: Ic9f1f546abd90ff9bb6f983bc57628bcb45d641c
* | | | | | | | | sr: Fix all the graphics issuesSteve Kondik2015-11-253-54/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Get rid of all the jank and flicker. * Fix preserved backbuffer * Simplify the code, all drawing happens on a single thread now. Change-Id: I36e1deee0663defd8aea1eba985e3ecbd408eac0
* | | | | | | | | recovery: Headless modeTom Marshall2015-11-2510-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b54bde65264aee99cb51a19436e82054b31fe74
* | | | | | | | | recovery: autodetect filesystem typeDan Pasanen2015-11-254-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Multiple fstab lines (supported in android) cause recovery to fail to mount partitions if the fs type is not the same as the first fstab entry. So when we attempt to find an fstab entry that matches a path for an f2fs, ext4 or vfat type, check it against blkid's determination of what filesystem type it is. If there is a discrepancy, query fs_mgr for the next possible entry that matches that path until either we find one that is good, or run out of fstab entries. * Also attempt to autodetect the filesystem type for mounting from update.zips. Change-Id: Ib6f4535dd88ef714ae1ca6fb0ffae1c7dac0f7ce
* | | | | | | | | sr: updater: Fix multi-stage docsTom Marshall2015-11-251-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix reboot_now comments to reflect actual usage. Change-Id: I692d626185af24620382f7b318c2b77f643ccfb8
* | | | | | | | | sr: Fix menu wrappingTom Marshall2015-11-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset menu_show_start_ if the selected item won't be visible. This fixes the display after selecting an item from the second page in the file list. Change-Id: Iff2bef39ec294c47bcaadce4128adb6d14d9e4db
* | | | | | | | | Allow custom bootloader msg offset in block miscMatt Mower2015-11-254-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use board define BOARD_RECOVERY_BLDRMSG_OFFSET with a decimal integer to define a custom offset where the bootloader message should be read/written. Edify commands get_stage and set_stage need to be aware of the custom bootloader msg offset because they write the stage directly to the BCB. Change-Id: Id13a23dd41bb7d907b96d657b8e21eb839dfeaa9
* | | | | | | | | Do not wipe block misc on bootloader msg updateMatt Mower2015-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When set_bootloader_message_block() is called, it fopens /misc in write binary mode, wiping all contents other than what is being written. The bootloader msg structure is only 1024+32+32 bytes, so some manufacturers store more than just a bootloader msg on /misc. fopen in read+append mode so that only the bootloader msg is written and the rest of the partition is left untouched. Change-Id: I2d2fbdf067282744864a19d404ca7dc12f688a98
* | | | | | | | | install: Ditch the generic errorRicardo Cerqueira2015-11-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to replace it with something more meaningful Change-Id: Ifc59ccdc1cf2a71245428ab9ff6495dc6c51d8b3
* | | | | | | | | recovery: Always include ext4 stuffMichael Bestas2015-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I86bfa73d4004a3b44b3047ee72205a8fa079ec20
* | | | | | | | | sr: Allow device-specific recovery modulesMatt Mower2015-11-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a means to include device-specific recovery modules that need to be built (i.e. not pre-built). A list of recovery modules can be specified by a device with: TARGET_RECOVERY_DEVICE_MODULES := rec_mod_one rec_mod_two Change-Id: Ibd19a71318863461d472471a4f7cfddfb1b9ae0d
* | | | | | | | | Fix HDPI imagesChirayu Desai2015-11-251-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Commit 8b0f4a442 "Old-school Holo UX" changed these to something out of sync with the rest, and also broke recovery on the devices that fell into this density bucket. * Restore the AOSP images. Change-Id: If55a9925903d9bb1cfc77d6752666c7e2e6d20fe
* | | | | | | | | recovery: New icon type VIEWING_LOGTom Marshall2015-11-252-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes "View recovery logs" This is probably not the best solution, perhaps find a different way? Change-Id: Ibd901ce7f69ec05c4d26cdb027e51b7e5b826034
* | | | | | | | | sr: Dejank the menus, fix colorsTom Marshall2015-11-251-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove extraneous menu update causing jank * Use official colors Change-Id: I5ca3faf54a51853fde8270edeee0fba778906659
* | | | | | | | | sr: Fix the progress barSteve Kondik2015-11-252-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The progress thread is running all the time, which causes the device to heat up while in recovery. Start this thread only when the progress mode is set to something other than EMPTY, and add a terminating condition so that it exits when finished. * Incorporate Tom's patch to keep it updated when visible, since both are needed to get working progress indications without killing batteries. * Clear buffer in draw_progress_locked() and always call this in update_progress_locked(). This is necessary to ensure that all backing frames in the graphics implementation get updated because we aren't guaranteed to have any particular number of backing frames. * Remove dialogs on wipe operations since we are using the progress animation now. * Set progress indicator after showing "Formatting" text to avoid momentary flicker. Change-Id: Ib70d2cb25f01d9920ffb698b5b5b47af827ef483
* | | | | | | | | sr: Touch UITom Marshall2015-11-2528-125/+750
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ee87f3474aec0496c47bb561ddecc74e151cbbf
* | | | | | | | | sr: Return to main menu after selectionTom Marshall2015-11-251-28/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib6fd1904b6516a651ffaad20f66b2eaf42c31619
* | | | | | | | | recovery: Move icon_info.png to res-specific dirsMatt Mower2015-11-255-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... otherwise it is omitted from build. Change-Id: I45930e1501f13af641ee96ac64164aae4101d85b
* | | | | | | | | recovery: Initial dialog implementationTom Marshall2015-11-2516-8/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement two types of dialogs: info and error. Info dialogs are intended to show that an operation is in progress and cannot be interrupted. Error dialogs are intended to show that an error occurred. The user must respond by dismissing the dialog with any input (a swipe or keypress). Dialogs may be initiated internally within the UI code or externally via a named local socket. Dialogs created via socket are presumed to be info and may not be dismissed. When the client socket is closed, the dialog automatically dismisses. Initial implementation shows dialogs for adb backup and restore. Future work will show dialogs for all errors and lengthy operations. Change-Id: Icefea12ec0fd70fb487d54aa2eb1cae9dd451355
* | | | | | | | | recovery: Handle oemunlock commandTom Marshall2015-11-254-7/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Conditionally compile support based on TARGET_HAVE_OEMLOCK. * Use liboemunlock for device specific support. Change-Id: I1cf1fef8e30075b0586bb86625b7df49723974cb
* | | | | | | | | recovery: datamedia supportTom Marshall2015-11-255-14/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4cef82973a15111bee92cd7c81f0e1db8d211991
* | | | | | | | | recovery: Provide caching for sideload filesTom Marshall2015-11-251-1/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a cache of block data received via adb. The cache size is set to ensure that there is at least 100mb available for the installer. When the cache is large enough to hold the entire file, each block is read via adb at most once. When the cache is not large enough to hold the entire file, the cache will need to be pruned. Because files tend to be read sequentially during install, the pruning algorithm attempts to discard blocks that are behind the current file position. Change-Id: Id8fc7fa5b38f1d80461eb576b1a1b5d53453cfc1
* | | | | | | | | recovery: bu: Implement backup/restoreTom Marshall2015-11-257-9/+1144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9e684868ce15aaaed3a40338dadc20b003b50ade