summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "change libtar to fork instead of pthread" into twrp2.4Dees Troy2013-02-193-39/+126
|\
| * change libtar to fork instead of pthreadbigbiff bigbiff2013-02-183-39/+126
| | | | | | | | | | | | Conflicts: twrpTar.cpp
* | Merge "Fix keyboard layout on 800x1280" into twrp2.4Dees Troy2013-02-191-6/+6
|\ \
| * | Fix keyboard layout on 800x1280Dees_Troy2013-02-151-6/+6
| | |
* | | Merge "Update listbox code" into twrp2.4Dees Troy2013-02-1914-297/+656
|\| |
| * | Update listbox codeDees_Troy2013-02-1514-297/+656
| | |
* | | Merge "Add highlight to file selector" into twrp2.4Dees Troy2013-02-1914-80/+236
|\| |
| * | Add highlight to file selectorDees_Troy2013-02-1514-80/+236
| | |
* | | Merge "Add button highlight" into twrp2.4Dees Troy2013-02-1914-13/+1040
|\| | | |/ |/|
| * Add button highlightDees_Troy2013-02-1514-13/+1040
| |
* | This adds a 60 second screen timeout for TWRP. Might consider making this configurable in the future.bigbiff bigbiff2013-02-1310-708/+1040
|/ | | | | | | | | | | | | | | Will also set overlay to lockscreen so we don't have inadvetent screen selections. Touching the screen will bring the display back up. add back check script for poweroff move diff time function to twrp-functions.cpp make sure we chmod after copy_file add read_file and write_file functions to twrp-functions.cpp make single thread try to force update screen add forceRender drop caches after tar processing Change-Id: I3c5c509dd39dbb05451bbfe5d8b56d53c90d8d1b
* Change popen in twrpTar to __popenDees_Troy2013-02-121-6/+7
| | | | Change-Id: I921b0647b1f63dd348b059eb630ebe9bf5ec570d
* Add write buffer for tar writesDees_Troy2013-02-0732-679/+3954
| | | | | | | update fuse to 2.9.2 catch return from unlink so that we don't print error messages when things work Change-Id: I1115039a0fa5d9d73f78ef1abd79755d7ffd9d96
* Merge "Fix misspelling and white space on fix perms" into twrp2.4Dees_Troy2013-02-021-2/+2
|\
| * Fix misspelling and white space on fix permsDees_Troy2013-02-021-2/+2
| | | | | | | | Thanks to Space- for pointing it out
* | Merge "fix wrong debuging output of used BUILD FLAGS in data.cpp" into twrp2.4Dees Troy2013-02-021-2/+2
|\ \
| * | fix wrong debuging output of used BUILD FLAGS in data.cppTalustus2013-02-021-2/+2
| |/
* / Use only std::string in TWFunc::Get_Folder_SizeVojtech Bocek2013-02-022-15/+6
|/ | | | | * Fixes crash which could occur with too deep path because of too much memory allocated on stack
* Merge "2.4.1.0" into twrp2.4Dees_Troy2013-02-011-1/+1
|\
| * 2.4.1.0Dees_Troy2013-02-011-1/+1
| |
* | Merge "Fix fail over to vfat from exfat" into twrp2.4Dees_Troy2013-02-014-40/+69
|\|
| * Fix fail over to vfat from exfatDees_Troy2013-02-014-40/+69
| | | | | | | | | | | | | | Fix issues with MD5 checking using chdir and leaving the working dir in a subfolder that prevented unmounting sometimes. Change-Id: I01a563d722f474297ed3f7a30064c3a61748ade3
* | Merge "Disable the forced MD5 check" into twrp2.4Dees_Troy2013-01-311-8/+2
|\ \ | |/ |/|
| * Disable the forced MD5 checkDees_Troy2013-01-301-8/+2
| |
* | Fix mkdosfs 2GB barrierDees_Troy2013-01-311-1/+1
|/
* Change version to 2.4.0.0Dees_Troy2013-01-281-1/+1
|
* exFAT improvements, fixesDees_Troy2013-01-284-16/+32
| | | | | | | | | Move Exec_Cmd to libcrecovery __popen Provide opt out build flag for exFAT Default fstype to exfat on external storage if exfat support is present and fstype is vfat or auto Fix invalid unmount errors Improve handling of unencrypted sdcards on Samsung devices
* Fix subpartitionof flagDees_Troy2013-01-281-1/+1
|
* Update exFAT to 1.0bigbiff bigbiff2013-01-2834-1506/+84
| | | | Change-Id: I059cf52c41e76c584f76534b84af8b398d9e4617
* Merge "Pull fix for exFAT from original source" into twrp2.4Dees_Troy2013-01-282-7/+13
|\
| * Pull fix for exFAT from original sourceDees_Troy2013-01-282-7/+13
| | | | | | | | | | | | http://code.google.com/p/exfat/source/detail?r=336 Change-Id: Ie8453770a4dcb31283012550f28483ad88bdc267
* | Reset progress bar in ORSDees_Troy2013-01-281-1/+2
| | | | | | | | Change-Id: Ia7df2fa80712dc9ff7fda97261fefa33ce823ae0
* | file manager updates for exFATDees_Troy2013-01-283-2/+31
|/ | | | Change-Id: I06fa6120a975cbc3d4eef9bc2ca034ec716740ee
* Remove thread logging from actions.cppDees_Troy2013-01-281-3/+0
| | | | Change-Id: I2d2af963f4d6990191d91a336f682516af61d734
* Merge "Fix file manager displays empty list when folder is deleted" into twrp2.4Dees_Troy2013-01-281-14/+14
|\
| * Fix file manager displays empty list when folder is deletedDees_Troy2013-01-251-14/+14
| |
* | adding sideload page with wipe cache and dalvikbigbiff bigbiff2013-01-2514-136/+744
|/ | | | | fix variable Change-Id: I72eed7b4d709a184e53cc94165a1817a7dcf041e
* Use GUI for ORS instead of console onlyDees_Troy2013-01-2517-335/+233
|
* Convert AOSP commands to ORS for encrypted devicesDees_Troy2013-01-245-21/+76
| | | | Change-Id: I6a76a51cd9efd7db67d7abeeb26f9bdd0eebf5a9
* Output most build flags to logDees_Troy2013-01-241-5/+24
| | | | Change-Id: I28f62236c5d5fa882cb5c05973ebf84da006b9ff
* Disable USB Mass Storage if the USB lun file does not exist.Dees_Troy2013-01-243-5/+19
| | | | Change-Id: I185edb4538fa84c17fc2b9a803557bb7a622f880
* change tar create to pthreadbigbiff bigbiff2013-01-245-90/+166
| | | | Change-Id: I5a33d207ec6683de20da37e6f4f174c67785fc52
* move libexfat and fuse to be compiled with mkexfatfsbigbiff bigbiff2013-01-221-3/+3
|
* Merge "Remove sockets and FIFOS when removing files" into twrp2.4bigbiff bigbiff2013-01-212-2/+2
|\
| * Remove sockets and FIFOS when removing filesbigbiff bigbiff2013-01-202-2/+2
| |
* | change fuse to be compiled with TW_INCLUDE_FUSE_EXFATbigbiff bigbiff2013-01-196-35/+1571
|/ | | | | update exfat_fuse to newest updates Always compile mkexfatfs
* Fix handling of blkid outputDees_Troy2013-01-181-15/+14
| | | | | Fixed handling of blkid output when the output spans multiple lines and the TYPE field ended up on next line.
* Move backup folder creation to after free space calcDees_Troy2013-01-181-8/+8
| | | | Also fix free space calculation
* Improve ORS sideload to display GUI with cancel buttonDees_Troy2013-01-184-33/+106
|
* Save version to cacheDees_Troy2013-01-172-4/+13
|
* Add sideload command for ORSDees_Troy2013-01-171-0/+31
|
* Fix problem with AOSP wipe_cache commandDees_Troy2013-01-171-0/+1
|
* ORS engine fixesDees_Troy2013-01-173-40/+40
| | | | | | | | Fix backup to not error when a non-existant partition is given. Fix restore to run when no partition parameters are given. Ensure that ORS runs after decryption and that zips install. Fix a problem with the fake internal sdcard not mounting to /sdcard on data media devices.
* Fix problems with thread creation on some devicesDees_Troy2013-01-161-1/+35
| | | | | | | | This fixes a problem with not reaching the backup completed page after a backup is complete on certain devices (GNex, Note2). Changing the stack size to 512KB seems to be the actual fix but leaving the other changes in place as they may be helpful or are better practices.
* Add build flag for custom graphicsDees_Troy2013-01-151-1/+7
|
* Add flag for retaining layout versionDees_Troy2013-01-153-38/+53
| | | | | | | Needed on Sony mint (Xperia T) as the /data/media folder is a separate partition and normal data media wiping is not appropriate for this device but the layout version file needs to be retained for Android 4.2 multi-user.
* Check to ensure that external is encryptedDees_Troy2013-01-142-1/+10
|
* remove relink files for samsung encryption libraries.bigbiff bigbiff2013-01-121-5/+0
|
* More Samsung sdcard crypto fixesDees_Troy2013-01-104-21/+34
|
* Increase char array sizes to allow for null char for strcpyDees_Troy2013-01-101-1/+1
|
* Add libsparse if it existsDees_Troy2013-01-102-0/+7
|
* Fix ifdefs for Samsung encryptionDees_Troy2013-01-101-0/+4
|
* Fix wiping problems and save ecrypt keyDees_Troy2013-01-092-28/+56
| | | | | | Fix problems with the wiping of data/media devices Save and restore the ecryptfs key for external sdcard on Samsung encrypted devices.
* Improve remounting sdcard with ecryptfsDees_Troy2013-01-094-16/+42
|
* Add libtar to TWRP instead of using busybox tarbigbiff bigbiff2013-01-09178-788/+39527
| | | | | | | Add proper mkdosfs tool Add fuse to TWRP Add experimental exfat-fuse to TWRP Convert all system() functions to use new Exec_Cmd function
* Add Samsung TouchWiz decryptiona39552692013-01-0810-661/+613
| | | | Change-Id: I418680e59372160dabfe3e2d5f0208229aa151ae
* Merge "Fix up libmincrypt rules for Android 4.2" into jb-wipDees_Troy2013-01-071-0/+5
|\
| * Fix up libmincrypt rules for Android 4.2Dees_Troy2013-01-071-0/+5
| |
* | Merge "Work around MEMERASE ioctl for rk3066 compatibility" into jb-wipDees Troy2013-01-076-0/+140
|\ \ | |/ |/|
| * Work around MEMERASE ioctl for rk3066 compatibilitySergey 'Jin' Bostandzhyan2013-01-056-0/+140
| | | | | | | | | | | | | | | | | | | | | | Due to a kernel bug and no available sources we have to work around the MEMERASE ioctl - if used, it hangs and never returns. I straced the original recovery executable and could see that it is simply calling write() with a bunch of zeroes instead of using MEMERASE. Added a hack that does the same and now the resulting TWRP recovery image works. Change-Id: I1b1c1c9e870e350776346bdca5d442c7ef565aa0
* | Add mode when open(O_CREAT) is used.Nick Kralevich2013-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | When creating a new file using open(..., O_CREAT), it is an error to fail to specify a creation mode. If a mode is not specified, a random stack provided value is used as the "mode". This will become a compile error in a future Android change. Change-Id: I73c1e1a39ca36bf01704b07302af4971d234b5a8
* | Merge "Improve handling of undecrypted encrypted /data" into jb-wipDees Troy2013-01-072-4/+18
|\ \
| * | Improve handling of undecrypted encrypted /dataGary Peck2012-12-212-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Until the encrypted partition is decrypted, treat it as a disk image instead of a filesystem so that it is properly backed up using dd. - Make Partition::Wipe() use the filesystem from fstab for disk images so that wiping an undecrypted /data makes it a plain unencrypted partition again. Change-Id: I78db977d6348cfa66b0cfbc492fb5776f84db48d
* | | Merge "Reset partition flags when the partition is wiped" into jb-wipDees Troy2013-01-071-21/+34
|\| | | |/ |/|
| * Reset partition flags when the partition is wipedGary Peck2012-12-211-21/+34
| | | | | | | | Change-Id: I6c4cee5b038fd0c39c8723412dd8f421f7794a00
* | Increase array size to fix crashes on some devicesDees_Troy2012-12-201-1/+1
|/
* Update version to 2.3.3.0Dees_Troy2012-12-181-1/+1
|
* check backup image size before restoringGary Peck2012-12-181-1/+14
| | | | Change-Id: I206d34936388c1b072eaaec50e0492710cb80f2e
* Fix keyboard layout on 800x1280 layoutDees_Troy2012-12-181-1/+1
|
* Fix defines on pages.hpp to not collide with pages.hDees_Troy2012-12-181-4/+3
|
* Fix handling of MTD partitions during mountDees_Troy2012-12-181-1/+19
|
* Merge "Ignore bma150 in event handler" into jb-wipDees_Troy2012-12-121-1/+1
|\
| * Ignore bma150 in event handlerDees_Troy2012-12-111-1/+1
| |
* | Add ignore blkid flag for TransformersDees_Troy2012-12-123-2/+9
| | | | | | | | Change-Id: I8f2b5b68a8c3ede74858d53002efab997174ee65
* | Restore text display during restoreDees_Troy2012-12-121-0/+2
| |
* | Merge "restore based on backup type, not destination type" into jb-wipDees Troy2012-12-122-42/+52
|\ \
| * | restore based on backup type, not destination typeGary Peck2012-11-222-42/+52
| | | | | | | | | | | | Change-Id: Ie44958a148d00cadd2ba3c51255f7fd9d8a651e7
* | | Merge "add Decrypt Data button" into jb-wipDees Troy2012-12-1212-0/+144
|\ \ \
| * | | add Decrypt Data buttonGary Peck2012-11-2212-0/+144
| |/ / | | | | | | | | | | | | | | | | | | Allow to decrypt /data even if decryption was skipped during the initial loading of recovery Change-Id: If2251757a276dd069578e93e5a038b25a825bff6
* | | Merge "print partition details independent of whether its mountable" into jb-wipDees Troy2012-12-121-61/+61
|\ \ \
| * | | print partition details independent of whether its mountableGary Peck2012-11-221-61/+61
| |/ / | | | | | | | | | Change-Id: Ibbc3bf3d3264fb9852f8312ece0567950aace496
* | | Merge "minuitwrp: fix screen update issue" into jb-wipDees Troy2012-12-111-2/+4
|\ \ \
| * | | minuitwrp: fix screen update issueHiemanshu Sharma2012-11-211-2/+4
| | | |
* | | | Merge "graphics: add support for "single buffering"" into jb-wipDees Troy2012-12-111-2/+10
|\| | | | |_|/ |/| |
| * | graphics: add support for "single buffering"Hiemanshu Sharma2012-11-211-2/+10
| |/
* | Merge "fix SP variable names" into jb-wipbigbiff bigbiff2012-12-101-2/+2
|\ \ | |/ |/|
| * fix SP variable namesbigbiff bigbiff2012-11-241-2/+2
| |
* | Fix compiling for x86 targetsHiemanshu Sharma2012-11-214-8/+0
|/
* Add 23x41 roboto fontDees_Troy2012-11-191-0/+461
|
* Fix renaming of backups with spaces, 2.3.2.3Dees_Troy2012-11-1912-12/+12
|
* Workaround for crypto quirk on Nexus 10Dees_Troy2012-11-191-1/+1
|
* Finish 2560x1600 themeDees_Troy2012-11-1941-120/+120
|
* Fix fix permissionsDees_Troy2012-11-163-38/+100
|
* Fixes for multi-user in 4.2Dees_Troy2012-11-1556-45/+3681
| | | | | | Also fixed inability to delete backups with a space in the name. Change-Id: I2f6639d33caa3c4542960f76adbd59b25ab64f5d
* add exfat to partitions.cppbigbiff bigbiff2012-11-142-1/+2
|
* Unmount main partitions after fixing permissionsDees_Troy2012-10-201-0/+1
|
* Add keyboard key highlightDees_Troy2012-10-2014-15/+117
|
* Add ability for buttons to have highlights on touchDees_Troy2012-10-194-4/+66
|
* Initial BML support (ext4 only)Dees_Troy2012-10-161-4/+11
|
* Update injecttwrp for Epic 4G TouchDees_Troy2012-10-165-33/+86
|
* Fix weird keyboard problemDees_Troy2012-10-152-4/+4
|
* Bump version to 2.3.1.0Dees_Troy2012-10-151-1/+1
|
* Update and improve USB storage codeDees_Troy2012-10-152-82/+40
|
* Handle single lun file for USB storageDees_Troy2012-10-142-35/+61
|
* Handle storage devices that are slow to mountDees_Troy2012-10-142-0/+16
|
* Remove unneeded duplicate codeDees_Troy2012-10-131-41/+0
|
* Bump version to 2.3.0.3Dees_Troy2012-10-131-1/+1
|
* Fix problem with sizes of images after reset defaultDees_Troy2012-10-131-0/+37
|
* Track whether a partition is mounted during refresh sizesDees_Troy2012-10-131-5/+18
| | | | and leave it mounted or unmount based on prior mounting status
* Unmount main partitions after USB storage disableDees_Troy2012-10-121-0/+1
|
* Change backup size check for ddDees_Troy2012-10-121-2/+2
|
* Fix restore of multiple archivesDees_Troy2012-10-121-1/+1
|
* Bump version numberDees_Troy2012-10-121-1/+1
|
* Unmount system after boot, backup, and restoreDees_Troy2012-10-123-0/+21
|
* Fix updater binary compileDees_Troy2012-10-111-2/+1
|
* Remove text about fix perms taking a few minsDees_Troy2012-10-1011-22/+0
|
* Finalize 2.3.0.0Dees_Troy2012-10-103-17/+7
| | | | | | Fix permission setting for other Add new fix permissions to GUI actions Update version number
* redo fix permissions in c++ for faster changesbigbiff bigbiff2012-10-105-1/+602
|
* Add reboot system button after sideload, backup, and restoreDees_Troy2012-10-0811-341/+385
| | | | A few other minor xml tweaks
* Fix exclamation point on 720x1280 themeDees_Troy2012-10-081-2/+4
|
* Fix derp with ORS during startupDees_Troy2012-10-081-1/+0
|
* Fix derp with alternate storageDees_Troy2012-10-081-1/+1
|
* Rename stock recovery fileDees_Troy2012-10-031-0/+4
|
* Remove extra call for ORSDees_Troy2012-10-021-0/+280
|
* Merge "Create busybox symlinks during compile" into jb-wipDees_Troy2012-10-024-26/+15
|\
| * Create busybox symlinks during compileDees_Troy2012-10-024-26/+15
| |
* | Merge "Ensure that actions are not simulated in ORS" into jb-wipDees_Troy2012-10-021-0/+1
|\|
| * Ensure that actions are not simulated in ORSDees_Troy2012-10-021-0/+1
| |
* | Fix error message on encrypted devicesDees_Troy2012-10-011-1/+8
|/
* Update ORS and recovery commandsDees_Troy2012-10-013-121/+161
|
* Fix output of version numberDees_Troy2012-10-016-29/+30
|
* Fix some derpsDees_Troy2012-09-282-0/+1
|
* Fix compiler warningsDees_Troy2012-09-283-3/+9
|
* Revert busybox for CM7 compatibility, add exclamation point to format dataDees_Troy2012-09-2827-35/+200
|
* Save version number to storageDees_Troy2012-09-274-8/+32
|
* Create symlinks at compile time for busyboxDees_Troy2012-09-276-81/+18
|
* Update sdcard partitioning to C++Dees_Troy2012-09-2712-820/+150
|
* Port backup name checking to Partition ManagerDees_Troy2012-09-276-54/+60
|
* Port reboot functions to C++Dees_Troy2012-09-2712-236/+166
|
* Display symlinks and block devices in file managerDees_Troy2012-09-271-1/+1
|
* Handle mountable boot partitionsDees_Troy2012-09-272-3/+19
|
* Add option to wipe android secureDees_Troy2012-09-2614-0/+221
|
* Fix permissions updatesDees_Troy2012-09-264-374/+377
| | | | | Also redirect stderr output on terminal commands for display in GUI console
* Fix SDCard partitioningDees_Troy2012-09-2612-14/+22
|
* Backup size for special partitions that are imagesDees_Troy2012-09-261-0/+24
|
* Fix problems with MTD devicesDees_Troy2012-09-264-21/+19
| | | | Also improve handling of MTD names
* Update version and readmeDees_Troy2012-09-262-2/+2
|
* Fix a problem with scrolling in the consoleDees_Troy2012-09-261-1/+1
|
* Allow spaces in backup namesDees_Troy2012-09-2612-24/+24
|
* Add backup size checkingDees_Troy2012-09-267-13/+241
| | | | | Converted bootloader.cpp to TWRP and removed AOSP fstab parsing from startup
* Convert makelist to C++Dees_Troy2012-09-265-161/+153
|
* Unify portrait layouts againDees_Troy2012-09-2612-419/+462
|
* Fix skip MD5 setting during backupDees_Troy2012-09-241-4/+6
|
* Change curtain to file and remove curtain raiseDees_Troy2012-09-2423-31899/+6
|
* Update tablet layouts with ADB sideloadDees_Troy2012-09-247-3/+189
|
* Fix 320x480 themeDees_Troy2012-09-221-37/+37
|
* Update pigz to 2.2.5 source codeDees_Troy2012-09-228-291/+879
|
* Add progress bar support to backup and restoreDees_Troy2012-09-212-27/+91
|
* Fix special partition handlingDees_Troy2012-09-215-46/+79
|
* Add android_secure supportDees_Troy2012-09-213-38/+123
|
* Remove unneeded AOSP imagesDees_Troy2012-09-2118-0/+0
|
* Add init.htc.rc and modify ADB sideload messagesDees_Troy2012-09-212-0/+75
|
* Update portrait themes with ADB sideloadDees_Troy2012-09-203-27/+141
|
* Various fixesDees_Troy2012-09-205-4/+60
| | | | | | Modify AOSP mount and wipe functions to use Partition Manager. Update wipe code to reset the log file index when wiping cache. Add ADB sideload to 540x960 theme.
* Fix fstab and unmount problemsDees_Troy2012-09-202-5/+8
| | | | | | Fix a problem parsing some recovery.fstab files. Fixed a problem with MD5 checking that prevented unmounting after md5 checking.
* Add and improve OpenRecoveryScript supportDees_Troy2012-09-207-5/+546
| | | | | Improve zip finding in ORS engine Add support for restoring with just a backup name
* Fix ext storage and zip pathsDees_Troy2012-09-193-1/+34
| | | | | | Fix a bug with handling external storage during boot. Check zip root path when switching storage and ensure that the path is in the new storage path to prevent user confusion.
* Improve adb sideload - use storage vs tmpDees_Troy2012-09-195-32/+23
|
* Improve adb sideload -- add cancelDees_Troy2012-09-194-11/+116
| | | | | Also copy zip from /tmp to storage and remove from /tmp to prevent running out of RAM.
* Cleanup extra-functionsDees_Troy2012-09-1815-675/+396
|
* Improve backup and restoreDees_Troy2012-09-183-190/+211
| | | | Add in archive splitting support
* Update backup and restore code, adb sideloadDees_Troy2012-09-1710-128/+773
| | | | | | | Fixed a problem with using make_ext4fs by making its lib a dynamic lib. Added ADB sideload zip install feature - no way to cancel it yet. Improve backup and restore code.
* Move to shared libmincryptDees_Troy2012-09-148-791/+19
| | | | | | | Remove mincrypt source from TWRP and add rule to make libmincrypt as a shared library. No more crashes during zip signature verification and less code to maintain in TWRP.
* Add wipe functions, compiles in CM7, text shows in UI, zips installDees_Troy2012-09-1416-426/+766
| | | | | | | | Zip install works, had to move mincrypt code into TWRP to prevent a crash when checking the zip signature. Added wipe functions Made it compile in CM7 Made text show up in console and logging
* Make text appear in GUI console, Zip install works.Dees_Troy2012-09-1218-499/+1276
| | | | | | | Move TW zip install code to C++ so that it can use the ui->functions. Bring in mincrypt code to fix a crash during signature checking.
* Clean up extra-functionsDees_Troy2012-09-112-35/+0
|
* Move device ID code to data managerDees_Troy2012-09-115-131/+137
|
* Zip install works againDees_Troy2012-09-116-194/+441
|
* More Partition Manager functionalityDees_Troy2012-09-103-22/+297
|
* Improve storage size code, mount, unmountDees_Troy2012-09-108-140/+410
| | | | Add flag parsing from recovery.fstab
* Add processing of fstab, mounting, and decryptDees_Troy2012-09-0711-1011/+798
|
* Hax to make it bootDees_Troy2012-09-0613-24/+1123
|
* TWRP-ify AOSP codeDees_Troy2012-09-05757-109/+165707
| | | | | | | Pull in most TWRP sources Stub out partition management code Make it compile -- probably will not boot Kind of a mess but have to start somewhere
* Initial stub of partitions.hppDees_Troy2012-09-041-0/+141
|
* Add readmeDees_Troy2012-08-311-0/+11
|
* Merge "Fixing trivial warnings for libminui"Jean-Baptiste Queru2012-08-241-2/+2
|\
| * Fixing trivial warnings for libminuiEdwin Vane2012-08-211-2/+2
| | | | | | | | | | | | | | | | After fixing three trivial warnings, libminui builds cleanly with clang. Change-Id: Id7c6228295427a5ed3c774c5f90e88a28336c1f7 Author: Edwin Vane <edwin.vane@intel.com> Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
* | Merge "Fixed warnings in libmtdutils"Jean-Baptiste Queru2012-08-231-4/+4
|\ \
| * | Fixed warnings in libmtdutilsEdwin Vane2012-08-211-4/+4
| |/ | | | | | | | | | | | | | | | | A few signed/unsigned comparison warnings were all that stood in the way of a clean clang build. Change-Id: Id8c47fcfa500a6ac164bddb855831cdc17d99847 Author: Edwin Vane <edwin.vane@intel.com> Reviewed-by: Tareq A Siraj <tareq.a.siraj@intel.com>
* | Merge "Fix multiple defined symbol errors"Jean-Baptiste Queru2012-08-231-1/+1
|\ \
| * | Fix multiple defined symbol errorsEdwin Vane2012-08-211-1/+1
| |/ | | | | | | | | | | | | | | | | | | Use of __inline__ by projects in bootable/* was causing problems with clang. Following the BKM and replaced use of __inline__ with __attribute((__gnu_inline)). Change-Id: If4ccfded685bb2c9d9c23c9b92ee052208399ef0 Author: Edwin Vane <edwin.vane@intel.com> Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
* | 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
|/ | | | | | | | A few simple warnings fixed to produce a clean clang build. Change-Id: I9484f860903a80e4c91e204e7e6738145535f642 Author: Edwin Vane <edwin.vane@intel.com> Reviewed-by: Ariel J Bernal <ariel.j.bernal@intel.com>
* Merge changes I664f8dc7,I4154db06,I5e1df90fJoe Onorato2012-08-173-37/+63
|\ | | | | | | | | | | | | * changes: Use the static version of libsparse Multiple modules with the same name are going away. host modules don't need LOCAL_MODULE_TAGS
| * Use the static version of libsparseJoe Onorato2012-07-242-2/+2
| | | | | | | | Change-Id: I664f8dc7939f8f902e4775eaaf6476fcd4ab8ed2
| * Multiple modules with the same name are going away.Joe Onorato2012-07-222-36/+63
| | | | | | | | Change-Id: I4154db066865d6031caa3c2c3b94064b2f28076e
| * host modules don't need LOCAL_MODULE_TAGSJoe Onorato2012-07-221-1/+0
|/ | | | Change-Id: I5e1df90f18fbaf98e3207c553a8fb859c1064137
* 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
| | | | | | | | | | | | | | | | | | When we don't have enough video memory for double buffering we fallback to "single buffering". Change-Id: I8bfab6d8cd6b54f0cc6c67edc41a4c37d8fbd4ba Signed-off-by: Octavian Purdila <octavian.purdila@intel.com> Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | Merge "Link against libsparse"Colin Cross2012-07-182-3/+3
|\ \ | |/ |/|
| * Link against libsparseColin Cross2012-07-182-3/+3
|/ | | | | | libext4_utils requires libsparse, link against it as well. Change-Id: I4d6aec0e5edcf1ed42118b7b77adcded2858d3dd
* am 6d60667d: Merge "Use a dependency file to replace the list file."Ying Wang2012-06-121-10/+14
|\ | | | | | | | | * commit '6d60667de6b8e6bd8a54fb4031901e2935743308': Use a dependency file to replace the list file.
| * 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
| |/ | | | | | | | | | | instead of creating the list file whenever loading the Android.mk Change-Id: I78e4820754399dff3993a863eede8b75da9f6d29
| |
| \
*-. | Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \| | | | | | | | | | Change-Id: I66ce5e9ca22d4aecb694bf8814fbf3404fb0013b
| * | 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
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They're completely broken and have been for months because this code makes no sense. Change-Id: Ibabcd3dbe5a004a45b341e4a5215aa3df77e1861
* | | | | | | | | am e5d5ac76: minor recovery changesDoug Zongker2012-04-124-4/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e5d5ac76cc8e5d11867aeff6a1d068215c1c3a7c': minor recovery changes
| * | | | | | | | minor recovery changesDoug Zongker2012-04-124-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add the --just_exit option to make recovery exit normally without doing anything - make it possible to build updater extensions in C++ - add the clear_display command so that the updater binary can request recovery switch to the NONE background UI These are all used to support the notion of using OTA as a factory reflash mechanism. Change-Id: Ib00d1cbf540feff38f52a61a2cf198915b48488c
* | | | | | | | | Merge "Add NOTICE file"Doug Zongker2012-04-091-0/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add NOTICE fileWei Zhong2012-04-061-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. AOSP_APACH2 2. BSD for bsdiff.c and bspatch.c Bug: 6299628 Change-Id: If9a5f7f8f07ad51bb62202253da189d804674e54 Signed-off-by: Wei Zhong <wzhong@google.com> (cherry picked from commit 592e7a9cf1c856bee2adb8f285ac359e2d7f68e1)
* | | | | | | | | | Update merge for SELinux to compileKenny Root2012-04-081-1/+1
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contribution of SELinux things to AOSP had a call to the old ui_print that merged cleanly. This changes that call into the newer call so it will actually compile when enabled. Change-Id: I8368e937219b01d0bef06007fa46302415256d07
* | | | | | | | | am 78911bdf: am 2a4ab824: Merge "Change the format command to always take the mount point as an argument."Kenny Root2012-04-071-13/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '78911bdf4f9dfff6583f3f8150a3257212ceea13': Change the format command to always take the mount point as an argument.
| * | | | | | | | am 2a4ab824: Merge "Change the format command to always take the mount point as an argument."Kenny Root2012-04-071-13/+4
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '2a4ab824b39e429969199c189ae1b6c1115e51d5': Change the format command to always take the mount point as an argument.
| | * | | | | | | 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
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requires I5a63fd61a7e74d386d0803946d06bcf2fa8a857e Change-Id: Ica5fb73d6f2ffb981b74d1896538988dbc4d9b24
* | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make minadbd drop its root privileges after initializing. We need to make the /tmp directory writable by the shell group so that it can drop the sideloaded file there.
* | | | | | | | resolved conflicts for merge of 0b1fee1b to masterKenny Root2012-03-3112-16/+167
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | |_|_|/ / / / |/| | | | | | Change-Id: I2e8298ff5988a96754f56f80a5186c9605ad9928
| * | | | | | am 155cd3c1: Merge changes Ied379f26,I09fb9d56Kenny Root2012-03-3112-16/+167
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '155cd3c155004433215147437cdf71844c9efd87': Extend recovery and updater to support setting file security contexts. Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used.
| | * | | | | Merge changes Ied379f26,I09fb9d56Kenny Root2012-03-3112-16/+167
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Extend recovery and updater to support setting file security contexts. Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used.
| | | * | | | | Extend recovery and updater to support setting file security contexts.Stephen Smalley2012-03-3012-18/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend minzip, recovery, and updater to set the security context on files based on the file_contexts configuration included in the package. Change-Id: Ied379f266a16c64f2b4dca15dc39b98fcce16f29
| | | * | | | | Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used.Stephen Smalley2012-01-242-0/+16
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libext4_utils now calls libselinux in order to determine the file security context to set on files when creating ext4 images. Change-Id: I09fb9d563d22ee106bf100eacd4cd9c6300b1152
* | | | | | | 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
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's surprising if these fail, so abort the whole edify script to catch any problems early. Bug: 2284848 Change-Id: Ia2a0b60e7f086fc590b242616028905a229c9e05
* | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id182bb95ffcc475c5acabb29b413e422302ae7f2
| * | | | | | support "sideload over ADB" modeDoug Zongker2012-01-1823-16/+5713
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than depending on the existence of some place to store a file that is accessible to users on an an unbootable device (eg, a physical sdcard, external USB drive, etc.), add support for sideloading packages sent to the device with adb. This change adds a "minimal adbd" which supports nothing but receiving a package over adb (with the "adb sideload" command) and storing it to a fixed filename in the /tmp ramdisk, from where it can be verified and sideloaded in the usual way. This should be leave available even on locked user-build devices. The user can select "apply package from ADB" from the recovery menu, which starts minimal-adb mode (shutting down any real adbd that may be running). Once minimal-adb has received a package it exits (restarting real adbd if appropriate) and then verification and installation of the received package proceeds. always initialize usb product, vendor, etc. for adb in recovery Set these values even on non-debuggable builds, so that the mini-adb now in recovery can work.
| * | | | | fix verifier testDoug Zongker2011-11-012-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needs to link with libminui and ui.cpp now. Change-Id: I5005e12cf8adb13d320921e3f9174e8c7304d7bf
| * | | | | move key processing to RecoveryUIDoug Zongker2011-11-017-264/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the key for handling keys from ScreenRecoveryUI to RecoveryUI, so it can be used by devices without screens. Remove the UIParameters struct and replace it with some new member variables in ScreenRecoveryUI. Change-Id: I4c0e659edcbedc0b9e86ed261ae4dbb3c6097414
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iddbb6f0aefdcbd131457690fddeddb0a873ea856
| * | | | | | C++ class for device-specific codeDoug Zongker2011-10-3110-245/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the device-specific functions with a class. Move some of the key handling (for log visibility toggling and rebooting) into the UI class. Fix up the key handling so there is less crosstalk between the immediate keys and the queued keys (an increasing annoyance on button-limited devices). Change-Id: I8bdea6505da7974631bf3d9ac3ee308f8c0f76e1
| * | | | | | refactor ui functions into a classDoug Zongker2011-10-297-324/+436
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all the functions in ui.c to be members of a ScreenRecoveryUI class, which is a subclass of an abstract RecoveryUI class. Recovery then creates a global singleton instance of this class and then invoke the methods to drive the UI. We use this to allow substitution of a different RecoveryUI implementation for devices with radically different form factors (eg, that don't have a screen). Change-Id: I7fd8b2949d0db5a3f47c52978bca183966c86f33
| * | | | | turn recovery into a C++ binaryDoug Zongker2011-10-2820-148/+254
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I68a67a4c8edec9a74463b3d4766005ce27b51316
* | | | | | remove unused code from minadbdDoug Zongker2012-03-206-1157/+9
| |/ / / / |/| | | | | | | | | | | | | | Change-Id: I2f192c67ef425a53a1dba65d3e0544c1d5a567bd
* | | | | run minadbd as shell userDoug Zongker2012-03-205-14/+31
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Make minadbd drop its root privileges after initializing. We need to make the /tmp directory writable by the shell group so that it can drop the sideloaded file there. Change-Id: I67b292cf769383f0f67fb934e5a80d408a4c131d
* | | | remove retouching code from updaterDoug Zongker2012-02-283-334/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the retouch_binaries and undo_retouch_binaries from updater; newly generated OTA packages should not call them any more. Note that applypatch retains the ability to unretouch a file as it reads it. This will be needed as long as we want to support OTAs from devices that were installed with retouching. Change-Id: Ib3f6baeae90c84ba85983f626d821ab7e436ceb2
* | | | fix buildDoug Zongker2012-02-283-4/+4
| | | | | | | | | | | | | | | | Change-Id: I44a75f5451af053778be299b23274ecce9b2db76
* | | | fix failure to free memoryDoug Zongker2012-02-282-19/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The applypatch function is somewhat sloppy about freeing memory (since it was originally a standalone binary). Fix some of that. Change-Id: Ifd44d71ea189c0b5115493119fd57bc37533fd59
* | | | am 62947db5: am 37d0f260: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | * commit '62947db579fa7acc9ee01d71f3aeb30add3df260':
| * | | am 37d0f260: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ \ | | |_|/ | |/| | | | | | * commit '37d0f260a55cfbe2b275131b12b2b5b824955e51':
| | * | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | |\ \ | | | |/ | | |/| | | | | Change-Id: Id3629feac35e35922942a6d04e741e72b95fded4
* | | | libz is a superset of libunz, so we don't need both.Elliott Hughes2012-01-311-2/+2
| | | | | | | | | | | | | | | | Change-Id: I082995c338feaf5d11288300768624cd51b027a4
* | | | allow recovery UI to ignore certain keypressesDoug Zongker2012-01-192-1/+4
| | | | | | | | | | | | | | | | Change-Id: Id182bb95ffcc475c5acabb29b413e422302ae7f2
* | | | always initialize usb product, vendor, etc. for adb in recoveryDoug Zongker2012-01-101-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set these values even on non-debuggable builds, so that the mini-adb now in recovery can work. Change-Id: If4c915403e6f43bfe922aa347e350a8982443106
* | | | Merge "support "sideload over ADB" mode"Doug Zongker2012-01-1022-9/+5704
|\ \ \ \
| * | | | support "sideload over ADB" modeDoug Zongker2012-01-1022-9/+5704
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than depending on the existence of some place to store a file that is accessible to users on an an unbootable device (eg, a physical sdcard, external USB drive, etc.), add support for sideloading packages sent to the device with adb. This change adds a "minimal adbd" which supports nothing but receiving a package over adb (with the "adb sideload" command) and storing it to a fixed filename in the /tmp ramdisk, from where it can be verified and sideloaded in the usual way. This should be leave available even on locked user-build devices. The user can select "apply package from ADB" from the recovery menu, which starts minimal-adb mode (shutting down any real adbd that may be running). Once minimal-adb has received a package it exits (restarting real adbd if appropriate) and then verification and installation of the received package proceeds. Change-Id: I6fe13161ca064a98d06fa32104e1f432826582f5
* | | | | recovery: convert all usages of $prop to ${prop}Dima Zavin2012-01-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9451b8350d33806097598fb9e575b28fd8b292ad Signed-off-by: Dima Zavin <dima@android.com>
* | | | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I9ef9f808a852c36903c8afc40136c89c9ec07630
* | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: If6c6ea354caf02fb3bf155931b23e4a6d2f751e9
* | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I3b4ea2184555bc0b570ec858601d4c43ecffb6f8
* | | | mount cache before sideloading from external storageDoug Zongker2011-12-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some packages expect to find cache mounted, since it always is for "real" OTAs. Bug: 5739915 Change-Id: I7a7cdd88a60c61e4bc7dc3e1f99956f6487c42e1
* | | | am 9fc3e3c8: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
|\| | | | | | | | | | | | | | | * commit '9fc3e3c8a6a5f2f82d5712805e90a9c89f914efa':
| * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-080-0/+0
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: I74a51ed7639683e0ab67c922b954eb1391dd2a49
* | | move key processing to RecoveryUIDoug Zongker2011-11-048-271/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move the key for handling keys from ScreenRecoveryUI to RecoveryUI, so it can be used by devices without screens. Remove the UIParameters struct and replace it with some new member variables in ScreenRecoveryUI. Change-Id: I70094ecbc4acbf76ce44d5b5ec2036c36bdc3414
* | | C++ class for device-specific codeDoug Zongker2011-10-3111-261/+364
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the device-specific functions with a class. Move some of the key handling (for log visibility toggling and rebooting) into the UI class. Fix up the key handling so there is less crosstalk between the immediate keys and the queued keys (an increasing annoyance on button-limited devices). Change-Id: I698f6fd21c67a1e55429312a0484b6c393cad46f
* | | temporarily remove verifier_test binaryDoug Zongker2011-10-311-6/+6
| | | | | | | | | | | | Change-Id: I61f249861b27180225fb786901275d2da611531b
* | | refactor ui functions into a classDoug Zongker2011-10-317-324/+436
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all the functions in ui.c to be members of a ScreenRecoveryUI class, which is a subclass of an abstract RecoveryUI class. Recovery then creates a global singleton instance of this class and then invoke the methods to drive the UI. We use this to allow substitution of a different RecoveryUI implementation for devices with radically different form factors (eg, that don't have a screen). Change-Id: I76bdd34eca506149f4cc07685df6a4890473f3d9
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-10-310-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: I29287109bc555579a9c66b586a3636ba41be5c57
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8444f44d3194ff16ce54121633d5b255231393f5 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | | | | | | turn recovery into a C++ binaryDoug Zongker2011-10-3120-148/+254
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I423a23581048d451d53eef46e5f5eac485b77555
* / / / / / / / / / / / / / / / allow recovery packages to wipe cacheDoug Zongker2011-10-194-26/+71
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater now has a function "wipe_cache();" which causes recovery to wipe the cache partition after the successful installation of the package. Move log copying around a bit so logs and the last_install flag file are copied to cache after it's wiped. Bug: 5314244 Change-Id: Id35a9eb6dcd626c8f3a3a0076074f462ed3d44bd
* / / / / / / / / / / / / / / minui: add ability to synchronize current key stateDima Zavin2011-10-132-2/+38
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a key is down prior to the time of initialization, we would not get the down event for the key, and thus think that the key is not pressed. Add an interface that allows one to provide a callback to execute on all keys that are currently down. Change-Id: I2a4096c0cb4c7c7a9a80d207835f168a0b418413 Signed-off-by: Dima Zavin <dima@android.com>
* / / / / / / / / / / / / / fix problem where the screen is sometimes all black in recoveryDoug Zongker2011-09-271-0/+3
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifa0b59e43eaf0bea9435aa4d96c5b0fc4f10fbfe
* / / / / / / / / / / / / update recovery with new 3D imagesDoug Zongker2011-09-2010-1/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6d52fd1db27fdf1b61f41f598a2209b70385b106
* | | | | | | | | | | | minui: events: only open input devices with EV_KEY and/or EV_RELDima Zavin2011-09-021-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8283d7aaa0f66d488f462cd108350cc49657a745 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | | | | | | | | minui: events: add ability to poll on non-input fdsDima Zavin2011-09-022-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad52a6f2adcae0068d252d6163586f9d7b93121d Signed-off-by: Dima Zavin <dima@android.com>
* | | | | | | | | | | | minui: events: refactor event acquisitionDima Zavin2011-09-023-75/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Events are now delivered through a callback mechanism during a call to ev_dispatch(). This will allow us to extend the events code to handle other devices/fds, not just input. One such example is the ability to process uevents. During initialization, we provide an input callback to ev_init that gets called when a new event is encountered during dispatch. ev_get has been removed and replaced with ev_get_input() helper function that can be called from inside the callback to attempt to get an input event. The existing client of ev_get in recovery has been split up such that the input thread just calls ev_wait(); ev_dispatch(); and the input_callback handles individual events by using the ev_get_input() helper. Change-Id: I24d8e71bd1533876b4ab1ae751ba200fea43c049 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | | | | | | | | minui: graphics: add interface for framebuffer blank/unblankDima Zavin2011-08-302-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5c3ee61cbf6fadae50f10b9f2e73caceaa5048a7 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | | | | | | | | minui: graphics: add ability to query font sizeDima Zavin2011-08-302-0/+7
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5e8f477b7b205794f2975f12e6b6010c177f6052 Signed-off-by: Dima Zavin <dima@android.com>
* / / / / / / / / / / change recovery images to match blue holo themeDoug Zongker2011-08-2018-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I912d3ab32973c5c5e7b6b1749698f8a71d884fa3
* / / / / / / / / / Support multiple recovery updater extensions.Michael Ward2011-07-151-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I787c086223b674050c0a12fc575add9badb471af
* | | | | | | | | Merge "Check pointer for null before dereferencing"Doug Zongker2011-07-141-0/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Check pointer for null before dereferencingAdam Bliss2011-07-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie7563bf8fb2d627454010de7388d0992e2accf91
* | | | | | | | | 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
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iabe8be5bbfa7d2bf1d13280c8734ff75b62a152f
* / | | | | | | | Remove the simulator target from all makefiles.Jeff Brown2011-07-124-16/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5010576 Change-Id: Ib465fdb42c8621899bea15c04a427d7ab1641a8c
* | / / / / / / Add missing commands to recovery init.rcMichael Ward2011-07-071-0/+3
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrote some missing items in recovery, most notably the serial number so that it shows up correctly on adb. Change-Id: If430c0b78191c8d77f781aa605b5081571451775
* | | | | | | init.rc: Simplify logic for starting adbd in recoveryMike Lockwood2011-06-291-25/+6
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always start adbd if ro.debuggable=1 rather than basing it on user preference in persistent system properties. Use new D001 product ID, which I just allocated for "android recovery mode" Change-Id: I6f1eac5257eaad2e538c0a8dd549ad89219efa3e Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | Allow applying an OTA package manually from cache.Michael Ward2011-06-243-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8f78377555c658a992ca95cadf11b67ddc93fed8
* | | | | | Get the correct line_length.Michael Ward2011-06-241-2/+37
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Set the BPP and other fields and write it back, so the line_length comes back correctly. Change-Id: I85e4e8223c79b9394ae1fb609b3026de62027ab8
* | | | | fix adb root in recoveryDoug Zongker2011-06-241-0/+4
| |/ / / |/| | | | | | | | | | | | | | | | | | | recovery's init.rc was missing lines that made adb root work. Change-Id: I300e6997e3b5cb9c7b542b2012eed61deb2550f1
* | | | Graphics can handle stride != xres, and BGRA support.Michael Ward2011-06-232-12/+18
| |/ / |/| | | | | | | | Change-Id: Ifee94ac08028e62a40241a089ac7c36346fea3a3
* | | Fix starting adb in recovery modeMike Lockwood2011-06-191-3/+27
| |/ |/| | | | | | | Change-Id: I8444f44d3194ff16ce54121633d5b255231393f5 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am f84b2524: am 6ebedf00: am 82da01d6: Merge from gingerbreadJean-Baptiste Queru2011-06-080-0/+0
|\ \ | | | | | | | | | * commit 'f84b25243d7ebeaca8424171f5ca3b192cc76d80':
| * \ am 6ebedf00: am 82da01d6: Merge from gingerbreadJean-Baptiste Queru2011-06-070-0/+0
| |\ \ | | | | | | | | | | | | * commit '6ebedf0053ccefd414e5887db316f84bd8f6c44c':
| | * \ am 82da01d6: Merge from gingerbreadJean-Baptiste Queru2011-06-010-0/+0
| | |\ \ | | | | | | | | | | | | | | | * commit '82da01d6a32c4fbfe57155c119d4669d7faba438':
| | | * \ Merge from gingerbreadJean-Baptiste Queru2011-06-011-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | Change-Id: I30902cdb19698f88a1ea57cf8c7667ef867d13a8
* | | | | | 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
|\| | | | | | |_|_|_|/ |/| | | | | | | | | | | | | | * commit 'a94d954862fab26f6159ed7bb836ba6758a569fd': Mute unharmful build warning at the top of the build log:
| * | | | am 1117c69f: am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbreadJean-Baptiste Queru2011-06-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '1117c69fe40dccfa6090d184094c4a6d407ab8d6': Mute unharmful build warning at the top of the build log:
| | * | | am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbreadJean-Baptiste Queru2011-06-011-1/+1
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | | | | * commit '7172eb7b623f4b30f5a709d639fcd3fb51cd6220': Mute unharmful build warning at the top of the build log:
| | | * 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
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | diff: out/target/product/generic/obj/PACKAGING/updater_extensions_intermediates/register.inc.list: No such file or directory Change-Id: I269b1703b6091b343db45b1c5cdd0962c738788b
* | | | Reconcile with honeycomb-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: I1205ca405fdaf586ebc349fbe83969e9694fab60
| * | | | store partition length in recovery.fstabDoug Zongker2011-02-252-9/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't hardcode magical partition behavior in roots.c. Change-Id: I587fc2c066575b51c11efd2e45a50f5b864df484
* | | | | am c2a158db: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTEThe Android Automerger2011-05-090-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'c2a158db9588e6ad290dd0f9171a190609900387': delay accessing misc partition until its device exists
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the misc partition is on an emmc device, recovery can get started and try to access it before the kernel has actually created the device. Try statting the device before reading or writing it; delay up to 10 seconds waiting for the device to exist. Change-Id: I988442d5701394d7152bfab3c571e7548c364f61
* | | | | | am 90588820: delay accessing misc partition until its device existsDoug Zongker2011-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '90588820b7110acf142d17457f0d10cd7cb57a8a': delay accessing misc partition until its device exists
| * | | | | delay accessing misc partition until its device existsDoug Zongker2011-05-041-0/+21
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the misc partition is on an emmc device, recovery can get started and try to access it before the kernel has actually created the device. Try statting the device before reading or writing it; delay up to 10 seconds waiting for the device to exist. Change-Id: I93256db4b047c76020490e8a3dc76b8ade643291
* | | | | delay accessing misc partition until its device existsDoug Zongker2011-04-221-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the misc partition is on an emmc device, recovery can get started and try to access it before the kernel has actually created the device. Try statting the device before reading or writing it; delay up to 10 seconds waiting for the device to exist. Change-Id: Ib9bf6c35fa2c28fc43aa7550aaaffb76c9f6e120
* | | | | make write_raw_image able to take a blobDoug Zongker2011-04-131-27/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write_raw_image() can now take either a blob or a filename as the source. The blob format eliminates the need for a temp file. Change-Id: I0c6effec53d47862040efcec75e64b7c951cdcf7
* | | | | save a last_install file with the result of the last package install attemptDoug Zongker2011-04-124-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When installing a package, create /cache/recovery/last_install, which contains the filename of the package and a 1 or 0 for success or failure. Also, don't mount ext4 and vfat filesystems as read-only (on devices where /cache is ext4, we need it to be read-write). Change-Id: I0cf2a1921bbd65e06343aa74e2006577fac77c2c
* | | | | am 4762633c: log which key a package verified against in recoveryDoug Zongker2011-03-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '4762633cf846d17516878303502b056b52353a5d': log which key a package verified against in recovery
| * | | | log which key a package verified against in recoveryDoug Zongker2011-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I0d91b715d1eb9e45e2fce54bb93ba0abef92727e
* | | | | recovery: mount /sdcard read-onlyIliyan Malchev2011-03-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieffafe00cf82620057cacd0629cb60b0e6aad817 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | | | am 6e4472ab: Have recovery reboot using the new android_reboot() function.Ken Sumrall2011-03-112-5/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '6e4472abbd3c7be9cd31d98a03df1e3b6fa92f40': Have recovery reboot using the new android_reboot() function.
| * | | | Have recovery reboot using the new android_reboot() function.Ken Sumrall2011-03-112-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new android_reboot() function is a nicer way to reboot the system. I can optionally sync() and remount read-only writable filesystems. This fixes bug 3350709. Change-Id: Ic4c8676debd642e57bce3107b99dd810d90b6f82
* | | | | am 6ce4a326: don\'t reboot for inactivity if USB is connectedDoug Zongker2011-03-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '6ce4a326efae4abb108e19899f4d7776abc362da': don't reboot for inactivity if USB is connected
| * | | | don't reboot for inactivity if USB is connectedDoug Zongker2011-03-091-13/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Cherry-pick back from master.) Bug: 4071007 Change-Id: I28355c593770df678968185171bdd19dabe7f062
* | | | | don't reboot for inactivity if USB is connectedDoug Zongker2011-03-081-13/+38
| | | | | | | | | | | | | | | | | | | | Change-Id: Icba35da91167d30c446581afb47d0804e49964bf
* | | | | am 68189f29: allow paletted RGB images in recoveryDoug Zongker2011-03-081-2/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '68189f2994690538b6e3bddc3788cb092cbda088': allow paletted RGB images in recovery
| * | | | allow paletted RGB images in recoveryDoug Zongker2011-03-051-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recovery assumes any paletted images are in RGBA format. Make it handle both RGB and RGBA paletted images. Bug: 3514884 Change-Id: I517cd571aa3f434dacacc33a774236260aec20ef
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cuts the byte size of the recovery images in half, roughly. Change-Id: I453a499e9937163c545dab3c552201882766e218
* | | | | convert recovery images to palettized PNGsDoug Zongker2011-03-049-0/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | Cuts the byte size of the recovery images in half, roughly. Change-Id: I3c45b5e58423b57faca83fc67b4e24e8d643c5b1
* | | | change the default recovery assets to be in holograph styleDoug Zongker2011-03-0225-11/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove the weird backwards compatibility thing for animations with fewer than 10 frames. Frames are always named "name01.png", "name02.png", ..., no matter how many there are. Change-Id: I7af64fdec1bfcdb0464998b735ec8d6c626ffe9d
* | | | make recovery UI images more general; allow for installation animationDoug Zongker2011-03-016-50/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change some of the UI parameters (# of indeterminate progress bar frames, fps, etc.) from #defined constants to variables that can be set by the device-specific recovery_ui code (via a new function). Support overlaying different images on top of the base installation icon to animate it. Make the FPS control more accurate. Change-Id: I9268b389b7ea6b3ed9e0c7eae37baf4272e60edd
* | | | am 8d43d940: am 2c273f00: store partition length in recovery.fstabDoug Zongker2011-02-250-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '8d43d94065e88e00e1460841b43c7de584ee5585': store partition length in recovery.fstab
| * \ \ \ am 2c273f00: store partition length in recovery.fstabDoug Zongker2011-02-252-9/+41
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '2c273f004e0504ae0389ad160ed2a92624873189': store partition length in recovery.fstab
| | * | | | store partition length in recovery.fstabDoug Zongker2011-02-252-9/+41
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Don't hardcode magical partition behavior in roots.c. Change-Id: I587fc2c066575b51c11efd2e45a50f5b864df484
* | | | | store partition length in recovery.fstabDoug Zongker2011-02-182-9/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't hardcode magical partition behavior in roots.c. Change-Id: I587fc2c066575b51c11efd2e45a50f5b864df484
* | | | | Fix x86 build.Ying Wang2011-02-093-7/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Iada6268b0a72ee832113ea397334cc7950a37051
* | | | | am 5df22d03: am 5cae445e: make recovery reboot after 2 minutes of no activityDoug Zongker2011-01-253-4/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '5df22d03d2e7c6de213d83a58e0af39c42f839ca': make recovery reboot after 2 minutes of no activity
| * | | | am 5cae445e: make recovery reboot after 2 minutes of no activityDoug Zongker2011-01-253-4/+42
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '5cae445e43c5928daba0a76745b0dd2657274eda': make recovery reboot after 2 minutes of no activity
| | * | | make recovery reboot after 2 minutes of no activityDoug Zongker2011-01-253-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If recovery sits for 2 minutes in prompt_and_wait(), and you've never turned the screen on via the magic keypress, go ahead and reboot. (We used to assume that the user could pull the battery to get out of this state, but on devices with nonremovable batteries...) If you've ever enabled display of the log/menu since recovery started, we assume you know what you're doing and will stay in recovery until you choose to reboot. Bug: 3387873 Bug: 3387274 Change-Id: I041621e5db132df9a925e6808845a7c45e1b427a
* | | | | am da993fcf: am 8d58c957: Merge "Free allocated struct after freeing field"Doug Zongker2011-01-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'da993fcf2665102435b05d6b20a4c4e8f8bd3b8f': Free allocated struct after freeing field
| * | | | am 8d58c957: Merge "Free allocated struct after freeing field"Doug Zongker2011-01-221-1/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | * commit '8d58c957036835db148acc4e506633a016dc6c7e': Free allocated struct after freeing field
| | * | Merge "Free allocated struct after freeing field"Doug Zongker2011-01-201-1/+1
| | |\ \
| | | * | Free allocated struct after freeing fieldChristian Lindeberg2011-01-191-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Free allocated MtdReadContext after freeing buffer field in struct, not before. Change-Id: I237920dc36115389cd2d6948e7a962dbec22fe56
* | | | Merge "remove encrypted filesystem code from recovery"Doug Zongker2011-01-214-399/+2
|\ \ \ \ | |/ / / |/| | |
| * | | remove encrypted filesystem code from recoveryDoug Zongker2011-01-184-399/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was never used; encrypted filesystems are being done a different way now. Change-Id: I519c57b9be44d001f0b81516af7bfc252069892b
* | | | Reserve the last 16 Kbytes of /data for the crypto footer.Ken Sumrall2011-01-202-10/+17
|/ / / | | | | | | | | | | | | | | | | | | When formatting /data, if it's an ext4 filesystem, reserve the last 16 Kbytes for the crypto footer. Change-Id: I7b401d851ee87732e5da5860df0287a1c331c5b7
* | | option to allow recovery to use 24-bit graphics in UIDoug Zongker2011-01-142-10/+22
| | | | | | | | | | | | | | | | | | | | | Add "RECOVERY_24_BIT := true" to the device's BoardConfig.mk to use 24-bit framebuffers in the recovery ui. Change-Id: Iaede138bf7870becf237f12f1c0e49c9ff82d007
* | | Update make_ext4fs arguments in roots.cColin Cross2011-01-061-1/+1
| | | | | | | | | | | | Change-Id: I835e55fb80add6a74cd4d99f77b2528829d9a349
* | | Update arguments to make_ext4fsColin Cross2010-12-291-1/+1
| | | | | | | | | | | | Change-Id: Id96e98da76b3091987b01651f980797b1d6b49d8
* | | am c5ebf1fb: am 5d6309e7: fix comparison of ECC stats before and after mtd readsDoug Zongker2010-11-041-0/+2
|\| | | | | | | | | | | | | | * commit 'c5ebf1fba2f870a4e9453721112900975c18e083': fix comparison of ECC stats before and after mtd reads
| * | am 5d6309e7: fix comparison of ECC stats before and after mtd readsDoug Zongker2010-11-031-0/+2
| |\| | | | | | | | | | | | | * commit '5d6309e77f6055a9aec062dd991d071054726ebb': fix comparison of ECC stats before and after mtd reads
| | * fix comparison of ECC stats before and after mtd readsDoug Zongker2010-11-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ECC errors are found by comparing the result of ioctl(ECCGETSTATS) before and after the read. But if an error was found causing us to go to the next block, we'd compare the stats before the *first* read to the stats after the second (third, fourth, etc.) reads, so we'd read to the end of the partition without ever succeeding. Fix logic so we compare the values before and after each read independently. Bug: 3162777 Change-Id: I5a13abd7243d2afd1d21bd98cbb233e5124b2e80
* | | am 8521ef59: am 51266d13: clear recovery framebuffers on allocation; display icon right after ui_initDoug Zongker2010-11-012-1/+3
|\| | | | | | | | | | | | | | * commit '8521ef5965675da85c7bbbe9c8b86fe68716e855': clear recovery framebuffers on allocation; display icon right after ui_init
| * | am 51266d13: clear recovery framebuffers on allocation; display icon right after ui_initDoug Zongker2010-11-012-1/+3
| |\| | | | | | | | | | | | | * commit '51266d1397309978eac9b2e96035582454f0321b': clear recovery framebuffers on allocation; display icon right after ui_init
| | * clear recovery framebuffers on allocation; display icon right after ui_initDoug Zongker2010-11-012-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make ui_init() clear the framebuffer memory it maps in so the user isn't treated to a visible flash of random bits on recovery startup. Call ui_set_background() (to show the installing icon) right after ui_init() to display something while device_recovery_start() is working (which can take a second or two on some devices). Bug: 3145331 Change-Id: I11e7859fab5847370ea4f4932c3fb1558af26c5d
* | | am 2d87023e: am 2c3539e4: save the log from recovery\'s last run in /cache/recovery/last_logDoug Zongker2010-09-301-17/+40
|\| | | | | | | | | | | | | | | | | | | | Merge commit '2d87023e77b20aa2196c8ceae833b33040b0dc57' * commit '2d87023e77b20aa2196c8ceae833b33040b0dc57': save the log from recovery's last run in /cache/recovery/last_log
| * | am 2c3539e4: save the log from recovery\'s last run in /cache/recovery/last_logDoug Zongker2010-09-291-17/+40
| |\| | | | | | | | | | | | | | | | | | | Merge commit '2c3539e4d8251ad91e0b881253d39583680093e8' into gingerbread-plus-aosp * commit '2c3539e4d8251ad91e0b881253d39583680093e8': save the log from recovery's last run in /cache/recovery/last_log
| | * save the log from recovery's last run in /cache/recovery/last_logDoug Zongker2010-09-291-17/+40
| | | | | | | | | | | | | | | | | | | | | Also, don't lose the start of the log whenever a wipe cache is performed. Change-Id: I29999762854eb36d1ff2bc20b4183c9077b19777
* | | am 704fa750: am 9b125b04: handle old-style CACHE: packagesDoug Zongker2010-09-221-2/+18
|\| | | | | | | | | | | | | | | | | | | | Merge commit '704fa75024467fb4e362537f7c341eb056e283b5' * commit '704fa75024467fb4e362537f7c341eb056e283b5': handle old-style CACHE: packages
| * | am 9b125b04: handle old-style CACHE: packagesDoug Zongker2010-09-221-2/+18
| |\| | | | | | | | | | | | | | | | | | | Merge commit '9b125b04c6ba8f07d8aa6494d58917a596443dc5' into gingerbread-plus-aosp * commit '9b125b04c6ba8f07d8aa6494d58917a596443dc5': handle old-style CACHE: packages
| | * handle old-style CACHE: packagesDoug Zongker2010-09-221-2/+18
| | | | | | | | | | | | Change-Id: I7bf52b56770c207ba1c8329243991b07ebb65779
* | | am af78591c: am 2c3c5c15: Merge "mount sdcard only on demand; fix sideload installs" into gingerbreadDoug Zongker2010-09-222-3/+26
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'af78591c9a2aa8379c2d8528c31ea1eb813f6cae' * commit 'af78591c9a2aa8379c2d8528c31ea1eb813f6cae': mount sdcard only on demand; fix sideload installs
| * | am 2c3c5c15: Merge "mount sdcard only on demand; fix sideload installs" into gingerbreadDoug Zongker2010-09-222-3/+26
| |\| | | | | | | | | | | | | | | | | | | Merge commit '2c3c5c15d15faf1c9fa074851c57d0afa2a40d28' into gingerbread-plus-aosp * commit '2c3c5c15d15faf1c9fa074851c57d0afa2a40d28': mount sdcard only on demand; fix sideload installs
| | * 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
| | | | | | | | | | | | | | | | | | | | Bug: 3009493 Change-Id: I1a7f99fc41a6a7012742e82f8c06a0c75584890a
* | | | am 8147ba85: (-s ours) am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge)Doug Zongker2010-09-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8147ba850b2e74dc950183e67c77a0da2b1a19b7' * commit '8147ba850b2e74dc950183e67c77a0da2b1a19b7': use fs_type "emmc" instead of "block" for consistency (do not merge)
| * | | am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge)Doug Zongker2010-09-211-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '93ca4fc6943a3ebf758c5db98531531b8fe92c98' into gingerbread-plus-aosp * commit '93ca4fc6943a3ebf758c5db98531531b8fe92c98': use fs_type "emmc" instead of "block" for consistency (do not merge)
| | * | use fs_type "emmc" instead of "block" for consistency (do not merge)Doug Zongker2010-09-211-2/+2
| | |/ | | | | | | | | | Change-Id: Iab60665d9c6daef7893896a64b7f319120a5f8ee
* | | remove the notion of "root path"; support mixed flash typesDoug Zongker2010-09-219-535/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the wacky notion of "roots" and "root paths" (those things that look like "FOO:some/path" instead of just "/foo/some/path"). Let each device specify its own table of available partitions and how to mount them (needed for devices that use both MTD/yaffs2 and EMMC/ext4 partitions). (Cherrypicked from gingerbread w/slight edits.) Change-Id: I2479ce76b13e73f1d12035c89386c3a82b3edf51
* | | 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
|\| | | | | | | | | | | | | | | | | | | | Merge commit '3dba40da1e533c6f419857e4274d9d9dd55868b6' * commit '3dba40da1e533c6f419857e4274d9d9dd55868b6': remove the notion of "root path"; support mixed flash types (do not merge)
| * | am d4208f9f: remove the notion of "root path"; support mixed flash types (do not merge)Doug Zongker2010-09-219-471/+340
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'd4208f9f9d4e9f268ba1888c1fe879ee73eb7e47' into gingerbread-plus-aosp * commit 'd4208f9f9d4e9f268ba1888c1fe879ee73eb7e47': remove the notion of "root path"; support mixed flash types (do not merge)
| | * remove the notion of "root path"; support mixed flash types (do not merge)Doug Zongker2010-09-219-471/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the wacky notion of "roots" and "root paths" (those things that look like "FOO:some/path" instead of just "/foo/some/path"). Let each device specify its own table of available partitions and how to mount them (needed for devices that use both MTD/yaffs2 and EMMC/ext4 partitions). Change-Id: I18b0a572a71c5e087e0b7ae11b1774388339bfd1
* | | resolved conflicts for merge of 40f0d3b4 to masterDoug Zongker2010-09-183-82/+3
|\| | | | | | | | | | | Change-Id: If14ab094a8bb11106b0ea7fdf8736e5e4c223089
| * | am d7d42089: remove unneeded partition rootsDoug Zongker2010-09-173-82/+2
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'd7d4208976125d114d0b8e44438e2417d5275098' into gingerbread-plus-aosp * commit 'd7d4208976125d114d0b8e44438e2417d5275098': remove unneeded partition roots
| | * remove unneeded partition rootsDoug Zongker2010-09-173-82/+2
| | | | | | | | | | | | | | | | | | | | | | | | Recovery itself no longer needs to access all these partitions; manipulation of them is done by the updater binary. This is a small first step towards removing roots entirely. Change-Id: I3fbcada32079a37db4cc097861dfa91e0a08da30
* | | am 1dcd2fd0: (-s ours) am 792b0071: do not merge - update to match ext4utils apiBrian Swetland2010-09-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | Merge commit '1dcd2fd0c7cc44cae279a5088241bdf15f084cb8' * commit '1dcd2fd0c7cc44cae279a5088241bdf15f084cb8': do not merge - update to match ext4utils api
| * | am 792b0071: do not merge - update to match ext4utils apiBrian Swetland2010-09-161-1/+1
| |\| | | | | | | | | | | | | | | | | | | Merge commit '792b00712bb1411d3b0583bcea95b43b3107fb95' into gingerbread-plus-aosp * commit '792b00712bb1411d3b0583bcea95b43b3107fb95': do not merge - update to match ext4utils api
| | * do not merge - update to match ext4utils apiBrian Swetland2010-09-161-1/+1
| | | | | | | | | | | | Change-Id: I9d34e491022d7dfed653a861b0728a0a656f1fbe
* | | add missing sparseness parameterDoug Zongker2010-09-161-1/+1
| | | | | | | | | | | | Change-Id: Ie6e309b127e80cd6475f1deaa5dbadf9f5cc2746
* | | resolved conflicts for merge of 85bcf776 to masterDoug Zongker2010-09-160-0/+0
|\| | | | | | | | | | | Change-Id: Iab4f25702a5a62b9172f81fd543a8240a0e603c3
| * | am 8a8e6cc3: (cherry-pick) EMMC support in applypatchDoug Zongker2010-09-152-103/+176
| |\| | | | | | | | | | | | | | | | | | | Merge commit '8a8e6cc33cc0dcfe7e184b59d5ef1f1c29095509' into gingerbread-plus-aosp * commit '8a8e6cc33cc0dcfe7e184b59d5ef1f1c29095509': (cherry-pick) EMMC support in applypatch
| | * (cherry-pick) EMMC support in applypatchDoug Zongker2010-09-152-103/+176
| | | | | | | | | | | | | | | | | | | | | | | | Let applypatch read and write EMMC partitions as well as MTD ones. This enables incremental updates that include boot image changes, as well as OTA of new recovery partitions. Change-Id: Ib1861219c7ca66dff29ad02d6a0a14e5f03eb4d8
* | | resolved conflicts for merge of 9f89b0e4 to masterDoug Zongker2010-09-161-1/+1
|\| | | | | | | | | | | Change-Id: Id458df96fd56830fdb35397e95a80274761ecff5
| * | am 56c5105b: support for ext4/EMMC filesystems in updater binaryDoug Zongker2010-09-156-37/+76
| |\| | | | | | | | | | | | | | | | | | | Merge commit '56c5105bd7096704eaed35329b2c8c84cc282867' into gingerbread-plus-aosp * commit '56c5105bd7096704eaed35329b2c8c84cc282867': support for ext4/EMMC filesystems in updater binary
| | * support for ext4/EMMC filesystems in updater binaryDoug Zongker2010-09-156-37/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make the mount and format functions take extra parameters describing the filesystem type and add support for mounting and formatting ext4 filesystems on EMMC. Change recovery to consistently use stdout for status messages instead of mixing stdout and stderr.
* | | resolved conflicts for merge of 76445f3a to masterDoug Zongker2010-09-161-20/+9
|\| | | | | | | | | | | Change-Id: I658894dcaddbf0de428e3c51dbcdc306d3f47a52
| * | am 8674a726: (cherry-pick) support installing any .zip file on the sdcardDoug Zongker2010-09-154-29/+144
| |\| | | | | | | | | | | | | | | | | | | Merge commit '8674a726ff05a4a6c09c6934778c251635f130a8' into gingerbread-plus-aosp * commit '8674a726ff05a4a6c09c6934778c251635f130a8': (cherry-pick) support installing any .zip file on the sdcard
| | * (cherry-pick) support installing any .zip file on the sdcardDoug Zongker2010-09-154-29/+144
| | | | | | | | | | | | | | | | | | | | | | | | Replaces the "install sdcard:update zip" menu option with one that displays a menu of zip files (and subdirs) on the sdcard and lets you pick which one to install. Change-Id: Icff541525f2fdfc8939a91af626ecc386ac9dd07
* | | am 858f0a76: am 8e5e4dad: close update package before installing; allow remountDoug Zongker2010-09-165-3/+17
|\| | | | | | | | | | | | | | | | | | | | Merge commit '858f0a763d0f736eb721f54257b6164886bfcbfc' * commit '858f0a763d0f736eb721f54257b6164886bfcbfc': close update package before installing; allow remount
| * | am 8e5e4dad: close update package before installing; allow remountDoug Zongker2010-09-155-3/+17
| |\| | | | | | | | | | | | | | | | | | | Merge commit '8e5e4dada713609c9b2c45ea9cf4572bb89ef761' into gingerbread-plus-aosp * commit '8e5e4dada713609c9b2c45ea9cf4572bb89ef761': close update package before installing; allow remount
| | * close update package before installing; allow remountDoug Zongker2010-09-155-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | Close the update package before invoking the binary, to allow the installer to unmount /cache if it wants to. Add a function to allow remounting of a mount as read-only. Change-Id: Idfcc96c3da66083295177f729263560be58034e4
* | | am bd4bc088: am d12560aa: add the ability to seek to a raw location while reading MTD partitionDoug Zongker2010-09-152-0/+8
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'bd4bc088e286b87a5d1469598644125ecc0fd547' * commit 'bd4bc088e286b87a5d1469598644125ecc0fd547': add the ability to seek to a raw location while reading MTD partition
| * | am d12560aa: add the ability to seek to a raw location while reading MTD partitionDoug Zongker2010-09-152-0/+8
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'd12560aa2134d3af21a1220cd4873553f9c51743' into gingerbread-plus-aosp * commit 'd12560aa2134d3af21a1220cd4873553f9c51743': add the ability to seek to a raw location while reading MTD partition
| | * add the ability to seek to a raw location while reading MTD partitionDoug Zongker2010-09-152-0/+8
| | | | | | | | | | | | Change-Id: Id1563ca667c50e61cf1bb15d2cf783a50937eece
* | | am f94a3575: am 61ba7a83: stop treating all-zero blocks as badDoug Zongker2010-09-121-8/+1
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'f94a3575d76f1fd6df20f82ca28fff688d53cfbc' * commit 'f94a3575d76f1fd6df20f82ca28fff688d53cfbc': stop treating all-zero blocks as bad
| * | am 61ba7a83: stop treating all-zero blocks as badDoug Zongker2010-09-121-8/+1
| |\| | | | | | | | | | | | | | | | | | | Merge commit '61ba7a83ef46494689801ddaad569d7d174153b1' into gingerbread-plus-aosp * commit '61ba7a83ef46494689801ddaad569d7d174153b1': stop treating all-zero blocks as bad
| | * stop treating all-zero blocks as badDoug Zongker2010-09-121-8/+1
| | | | | | | | | | | | Change-Id: If49fa6485f66598d16a7e44fce3129de55fab422
* | | am a2c9a1e8: am aaf3f56c: block is bad if ioctl() returns nonzeroDoug Zongker2010-09-101-2/+5
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8' * commit 'a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8': block is bad if ioctl() returns nonzero
| * | am aaf3f56c: block is bad if ioctl() returns nonzeroDoug Zongker2010-09-101-2/+5
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'aaf3f56c44c37dca4ef9cc9efde68727ca26105f' into gingerbread-plus-aosp * commit 'aaf3f56c44c37dca4ef9cc9efde68727ca26105f': block is bad if ioctl() returns nonzero
| | * block is bad if ioctl() returns nonzeroDoug Zongker2010-09-101-2/+5
| | | | | | | | | | | | Change-Id: I6fc4ce796bc663d05035927c0af0ce7ab6d07218
* | | am 28cae98c: am 4bc98062: add --show_text option to recoveryDoug Zongker2010-09-033-0/+11
|\| | | | | | | | | | | | | | | | | | | | Merge commit '28cae98c834fb4bc47588b34dc3fe19811d5162b' * commit '28cae98c834fb4bc47588b34dc3fe19811d5162b': add --show_text option to recovery
| * | am 4bc98062: add --show_text option to recoveryDoug Zongker2010-09-033-0/+11
| |\| | | | | | | | | | | | | | | | | | | Merge commit '4bc980626c1cf6f1ea7d36e4b54e0023c896c9de' into gingerbread-plus-aosp * commit '4bc980626c1cf6f1ea7d36e4b54e0023c896c9de': add --show_text option to recovery
| | * add --show_text option to recoveryDoug Zongker2010-09-033-0/+11
| | | | | | | | | | | | Change-Id: Ie6c6c920260dfa759fbb15b1f352d6bb0fa7146c
* | | am 4c7c2f73: (-s ours) am 532c8600: Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3Ying Wang2010-09-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | Merge commit '4c7c2f73af773872faf5a65167d74900865d96ba' * commit '4c7c2f73af773872faf5a65167d74900865d96ba': Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3
| * | am 532c8600: Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3Ying Wang2010-09-013-6/+5
| |\| | | | | | | | | | | | | | | | | | | Merge commit '532c86002bb89db43094b27ec50f001ae173c650' into gingerbread-plus-aosp * commit '532c86002bb89db43094b27ec50f001ae173c650': Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3
| | * Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3Ying Wang2010-09-013-6/+5
| | | | | | | | | | | | Change-Id: I46e4d7fe76e4219207e46f19e50188e38bb932b7
* | | am 17b44ee3: (-s ours) am 21f0f97e: Fix for crespo.Ying Wang2010-09-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | Merge commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01' * commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01': Fix for crespo.
| * | am 21f0f97e: Fix for crespo.Ying Wang2010-09-013-5/+6
| |\| | | | | | | | | | | | | | | | | | | Merge commit '21f0f97ebabb47adcbfe8d38b02685f2019b4eb3' into gingerbread-plus-aosp * commit '21f0f97ebabb47adcbfe8d38b02685f2019b4eb3': Fix for crespo.
| | * Fix for crespo.Ying Wang2010-08-313-5/+6
| | | | | | | | | | | | Change-Id: I008510bf614606a46a630c7adc39464ce1143ec3
* | | 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
|\| | | | | | | | | | | | | | | | | | | | | | | Merge commit '979002871ddc417dfdfb6a6542b9018626af7883' * commit '979002871ddc417dfdfb6a6542b9018626af7883': fix bug in applying patches remove shadowed variable declaration
| * | 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 commit '965f9dc45345486e885b59b4776f0ca5e765ec20' into gingerbread-plus-aosp * commit '965f9dc45345486e885b59b4776f0ca5e765ec20': fix bug in applying patches remove shadowed variable declaration
| | * merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forwardJean-Baptiste Queru2010-08-240-0/+0
| | |\ | | | | | | | | | | | | Change-Id: I4d56dc0235f3df1306736c42144dccb26b876b74
| | | * fix bug in applying patchesDoug Zongker2010-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When restarting a patch from crashing in the middle of a large file, we're not finding the correct patch to apply to the copy saved in cache. Change-Id: I41cb2b87d096bb7a28a10c4cf3902facd45d4c9d
| | | * remove shadowed variable declarationDoug Zongker2010-08-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An accidental variable declaration ("int enough_space = ..." instead of "enough_space = " inside a block) shadowing the real one meant we were always using the copy-to-cache path for patching, even when not necessary. Remove it. Enforce an absolute minimum of free space as well, to avoid running into problems patching small files, now that the copy-to-cache path is (inadvertently) well-tested. Change-Id: Idb7d57241a9adcda2e11001fa44f0cd67ce40d19
* | | | am c080bc54: am fbd7ae7a: am 201cd466: remove shadowed variable declarationDoug Zongker2010-08-161-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c080bc549aaf272c77fe7903e52c2a2c0d8de1bb' * commit 'c080bc549aaf272c77fe7903e52c2a2c0d8de1bb': remove shadowed variable declaration
| * | | am fbd7ae7a: am 201cd466: remove shadowed variable declarationDoug Zongker2010-08-131-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fbd7ae7a1ce0060221241ed02c576983c1f48d34' into gingerbread-plus-aosp * commit 'fbd7ae7a1ce0060221241ed02c576983c1f48d34': remove shadowed variable declaration
| | * | am 201cd466: remove shadowed variable declarationDoug Zongker2010-08-131-1/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '201cd46680f5789e21a57fb4476ab0ba0c0ed4c0' into gingerbread * commit '201cd46680f5789e21a57fb4476ab0ba0c0ed4c0': remove shadowed variable declaration
| | | * | remove shadowed variable declarationDoug Zongker2010-08-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An accidental variable declaration ("int enough_space = ..." instead of "enough_space = " inside a block) shadowing the real one meant we were always using the copy-to-cache path for patching, even when not necessary. Remove it. Enforce an absolute minimum of free space as well, to avoid running into problems patching small files, now that the copy-to-cache path is (inadvertently) well-tested. Change-Id: Idb7d57241a9adcda2e11001fa44f0cd67ce40d19
* | | | | Changes to work with updated make_ext4fs tool that supports creating sparse images.Ken Sumrall2010-08-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An extra parameter was added to the make_ext4fs() function, we these tools need to be updated to match. Change-Id: Id640a7f2b03153eb333b00337f0f991ff5332349
* | | | | am c4e32005: am 17986e6b: am 8cd9e4f3: fix bug in applying patchesDoug Zongker2010-08-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c4e3200578ad670bee9f5a88e90e7a77089d5df7' * commit 'c4e3200578ad670bee9f5a88e90e7a77089d5df7': fix bug in applying patches
| * | | | am 17986e6b: am 8cd9e4f3: fix bug in applying patchesDoug Zongker2010-08-131-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '17986e6b8766ef9bdaa49efc7099e3867ca1978a' into gingerbread-plus-aosp * commit '17986e6b8766ef9bdaa49efc7099e3867ca1978a': fix bug in applying patches
| | * | | am 8cd9e4f3: fix bug in applying patchesDoug Zongker2010-08-131-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8cd9e4f3d4eba481b411482331293c8079ab24b2' into gingerbread * commit '8cd9e4f3d4eba481b411482331293c8079ab24b2': fix bug in applying patches
| | | * | fix bug in applying patchesDoug Zongker2010-08-131-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | When restarting a patch from crashing in the middle of a large file, we're not finding the correct patch to apply to the copy saved in cache. Change-Id: I41cb2b87d096bb7a28a10c4cf3902facd45d4c9d
* | | | support using an EMMC misc partition to store recovery argumentsDoug Zongker2010-08-132-3/+56
| | | | | | | | | | | | | | | | Change-Id: I9f912857cfc6afb8ba764f5541af7f01df029a77
* | | | Working ASLR implementationHristo Bojinov2010-08-0210-18/+649
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate files for retouch functionality are in minelf/* ASLR for shared libraries is controlled by "-a" in ota_from_target_files. Binary files are self-contained. Retouch logic can recover from crashes. Signed-off-by: Hristo Bojinov <hristo@google.com> Change-Id: I76c596abf4febd68c14f9d807ac62e8751e0b1bd
* | | | don't go into file select menu when mounting external storage failsDoug Zongker2010-08-021-1/+4
| | | | | | | | | | | | | | | | Change-Id: If0efeddc28e1dbb52d9e52abf53323e2cc97c8f0
* | | | generalize "install from sdcard" to "install from external storage"Doug Zongker2010-07-304-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow sideloading of OTA packages from USB drives that appear as /dev/block/sda1. Change-Id: I1908576c24547cd0088475d8c8917699cd906868
* | | | Mute unwanted error messageYing Wang2010-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL removes the following line from the top of build logs: "diff: out/target/product/*/obj/PACKAGING/updater_extensions_intermediates/register.inc.list: No such file or directory" Change-Id: I79c15a69a0b1b0da0e45620b45a7a0fea5625250
* | | | resolved conflicts for merge of c02c37a1 to masterDoug Zongker2010-07-092-8/+122
|\| | | | | | | | | | | | | | | Change-Id: Iafb9cb4adf27a7086d587d95e94ab1bd050099dc
| * | | am 23ceeea8: make a copy of sideloaded packages in /tmp before verifyingDoug Zongker2010-07-092-4/+117
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '23ceeea85e6a3555dd3d7140128e310954cadf7f' into gingerbread-plus-aosp * commit '23ceeea85e6a3555dd3d7140128e310954cadf7f': make a copy of sideloaded packages in /tmp before verifying
| | * | make a copy of sideloaded packages in /tmp before verifyingDoug Zongker2010-07-092-4/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy a sideloaded package into /tmp, then verify and install the copy, to prevent malicious users from overwriting the package between verification and install. Bug: 2826890 package can be replaced during verification Bug: 2058160 Recovery should copy sideloaded (sd card) update ... Change-Id: I3de148b0f1a671f1974782b6855527caeaefda23
* | | | EMMC support in applypatchDoug Zongker2010-07-082-103/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let applypatch read and write EMMC partitions as well as MTD ones. This enables incremental updates that include boot image changes, as well as OTA of new recovery partitions. Change-Id: I3766b9e77c639769ddf693b675da51d57f6e6b1d
* | | | support for ext4/EMMC filesystems in updater binaryDoug Zongker2010-07-026-37/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the mount and format functions take extra parameters describing the filesystem type and add support for mounting and formatting ext4 filesystems on EMMC. Change recovery to consistently use stdout for status messages instead of mixing stdout and stderr.
* | | | 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
| | | | | | | | | | | | | | | | | | | | Change-Id: I827af624c9ec7c64decb702de8c0310cf19b4141
* | | | | am 60faafcf: merge from open-source masterThe Android Open Source Project2010-07-010-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | Merge commit '60faafcf01ff7f4179cdcaefd24b10ac4ee7f692' * commit '60faafcf01ff7f4179cdcaefd24b10ac4ee7f692':
| * | | merge from open-source masterThe Android Open Source Project2010-07-010-0/+0
| |\ \ \ | | |/ / | |/| | | | | | Change-Id: I9d0122dbf1a9c2bd1898c41766c5bf4320f2313a
| | * | am ecc76ba5: Set adbd to be disabled by default in recoveryKenny Root2010-06-281-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab' into froyo-plus-aosp * commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab': Set adbd to be disabled by default in recovery
* | | | am c78a9698: am ecc76ba5: Set adbd to be disabled by default in recoveryKenny Root2010-06-281-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c78a9698dd55a165c2206c380f87f173bacba2aa' * commit 'c78a9698dd55a165c2206c380f87f173bacba2aa': Set adbd to be disabled by default in recovery
| * | | am ecc76ba5: Set adbd to be disabled by default in recoveryKenny Root2010-06-281-0/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab' into gingerbread * commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab': Set adbd to be disabled by default in recovery
| | * | Set adbd to be disabled by default in recoveryKenny Root2010-06-281-0/+1
| | | | | | | | | | | | | | | | Change-Id: I74fa6edc4b001247b20be52e8301d18407fede2c
* | | | am 21b97ed5: Add __attribute__((format(printf, a, b))) to printf like functions.Nick Kralevich2010-06-252-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '21b97ed5693d039e8b9dea57a160d3307f412682' * commit '21b97ed5693d039e8b9dea57a160d3307f412682': Add __attribute__((format(printf, a, b))) to printf like functions.
| * | | Add __attribute__((format(printf, a, b))) to printf like functions.Nick Kralevich2010-06-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix potential string format bug. Change-Id: Ie05aac53b2c45a48bd68e340b76ccb21edfd28b7
* | | | am dd6a0412: recovery: Add ueventd serviceColin Cross2010-05-141-0/+4
|\| | |
| * | | recovery: Add ueventd serviceColin Cross2010-05-141-0/+4
| | | | | | | | | | | | | | | | Change-Id: Iad448bc1608f88c5db2108475f35b88ea2877b07
* | | | am be42930f: am 97ca48e7: generic_x86 supportBruce Beare2010-05-041-0/+2
|\| | |
| * | | am 97ca48e7: generic_x86 supportBruce Beare2010-05-041-0/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit '97ca48e7f4ac8d3842f74f92b8f40d0e74733f38' into kraken * commit '97ca48e7f4ac8d3842f74f92b8f40d0e74733f38': generic_x86 support
| | * | generic_x86 supportBruce Beare2010-05-041-0/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Add in Makefiles and support files for x86 builds Based on changes by: wonjong.lee <wonjong.lee@windriver.com> Additional changes by: Mark Gross <mark.gross@intel.com> Additional changes by: Bruce Beare <brucex.j.beare@intel.com> Change-Id: I71fcf58f116e4e9047e7d03fdb28e3308553ce5c
* | | support installing any .zip file on the sdcardDoug Zongker2010-04-084-24/+144
| | | | | | | | | | | | | | | | | | | | | | | | Replaces the "install sdcard:update zip" menu option with one that displays a menu of zip files (and subdirs) on the sdcard and lets you pick which one to install. Change-Id: I85c94c0e9bc8e05ca52031fc29ca2624c2695ced
* | | 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
| | | | | | | | | | | | | | | | | | Encrypted File Systems integration. Recovery changes. Change-Id: I932f73a6f937aac061128e1134eab08c30f0471d
* | | 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
| | | | | | | | | | | | | | | | Change-Id: I932f73a6f937aac061128e1134eab08c30f0471d
* | | | 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
|/| | | |/ | | | | | | | | | | Merge commit '2654f5aae18c67ad9aff6dbcdf9bc67b62e37d2d' into kraken * commit '2654f5aae18c67ad9aff6dbcdf9bc67b62e37d2d': DO NOT MERGE
| * DO NOT MERGEOscar Montemayor2010-03-274-268/+2
|/ | | | | | | Removing unused recovey options. Please refer to Bug#2502219 for more info. Change-Id: I2fe3cdb0c8b93ed7e1cc4093824fbe181f5f0aea
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-091-0/+49
| | | | Change-Id: Icd177bd26120e0c8929faa8d1007f6c5bd446cb8
* make StringValue wrapper okay to call on NULLDoug Zongker2010-02-251-0/+1
| | | | | | | The docs say "don't do this", but it's trivial to make safe. Make StringValue(NULL) return NULL instead of crashing. Change-Id: I2221bcb4c98d8adb4e25c764d7bdcfa787822bcf
* refactor applypatch and friendsDoug Zongker2010-02-2312-1322/+1296
| | | | | | | | | | | | | | | | | | | Change the applypatch function to take meaningful arguments instead of argc and argv. Move all the parsing of arguments into main.c (for the standalone binary) and into install.c (for the updater function). applypatch() takes patches as Value objects, so we can pass in blobs extracted from the package without ever writing them to temp files. The patching code is changed to read the patch from memory instead of a file. A bunch of compiler warnings (mostly about signed vs unsigned types) are fixed. Support for the IMGDIFF1 format is dropped. (We've been generating IMGDIFF2 packages for some time now.) Change-Id: I217563c500012750f27110db821928a06211323f
* add missing includes to fix mac build (maybe)Doug Zongker2010-02-202-0/+4
| | | | Change-Id: Id2712940c4929f3a8b3ba5d4e9e03bb8034747ee
* relocate applypatch; add type system and new functions to edifyDoug Zongker2010-02-1822-112/+4239
| | | | | | | | | | | | | | | | | | | | | | | | | - Move applypatch to this package (from build). - Add a rudimentary type system to edify: instead of just returning a char*, functions now return a Value*, which is a struct that can carry different types of value (currently just STRING and BLOB). Convert all functions to this new scheme. - Change the one-argument form of package_extract_file to return a Value of the new BLOB type. - Add read_file() to load a local file and return a blob, and sha1_check() to test a blob (or string) against a set of possible sha1s. read_file() uses the file-loading code from applypatch so it can read MTD partitions as well. This is the start of better integration between applypatch and the rest of edify. b/2361316 - VZW Issue PP628: Continuous reset to Droid logo: framework-res.apk update failed (CR LIBtt59130) Change-Id: Ibd038074749a4d515de1f115c498c6c589ee91e5
* Filename check and free allocated stringsKenny Root2010-02-182-0/+7
| | | | | | | Make sure file is valid before we try to read it. Also free all the strings we allocate in various functions so we don't leak memory. Change-Id: Ica3c8dae992e73718c79c12ff5d7e315c290caea
* am da846fcf: am 4c382b13: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\ | | | | | | | | | | | | Merge commit 'da846fcf1b6a7bbd2f9f30c965b25f084568ef75' * commit 'da846fcf1b6a7bbd2f9f30c965b25f084568ef75': android-2.1_r1 snapshot
| * am 4c382b13: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\ | | | | | | | | | | | | | | | | | | Merge commit '4c382b13657be5d949e7dfc9ef46a66f2eb496e0' into eclair-plus-aosp * commit '4c382b13657be5d949e7dfc9ef46a66f2eb496e0': android-2.1_r1 snapshot
| | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove support for the HTC-specific "firmware" update command and the corresponding edify function write_firmware_update(). This functionality is now done by an edify extension library that lives in vendor/htc. Change-Id: I80858951ff10ed8dfff98aefb796bef009e05efb
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove (or at least stop calling) the HTC-specific mechanism for preserving the recovery log from before a radio or hboot update. Replace it with a generic device_recovery_start() function which each device's code can implement to do whatever it wants on recovery startup. Change-Id: If3cca4b498c0b1cf0565236404ecf56a1fc46123
* | | | | | add a one-argument version of package_extract_fileDoug Zongker2010-02-013-24/+113
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a version of package_extract_file that returns the file data as its return value (to be consumed by some other edify function that expects to receive a bunch of binary data as an argument). Lets us avoid having two copies of a big file in memory (extracting it into /tmp, which is a ramdisk, and then having something load it into memory) when doing things like radio updates. Change-Id: Ie26ece5fbae457eb0ddcd8a13d74d78a769fbc70
* | | | | fix parsing of dumpkeys outputDoug Zongker2010-01-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | %i can't be used to read unsigned ints (though it happens to work with bionic). Change to %x and %u as appropriate. Change-Id: I8ea9ca16a939501757cf70fc5953abee26c8231c http://b/2402231 - Parser for /res/keys interprets n0inv as a signed int
* | | | | save the recovery log from before HTC firmware updatesDoug Zongker2010-01-215-6/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing a firmware (radio or hboot) update on HTC devices, save the recovery log in block 1 of the cache partition, before the firmware image and the UI bitmaps. When we boot back into recovery after the firmware update to reformat the cache partition, copy that log out of cache before reformatting it and dump it into the current invocation's log. The practical upshot of all this is that we can see the log output from radio and hboot updates. Change-Id: Ie0e89566754c88f4bed6a90d8a0aa04047b01a27
* | | | | am 4e9332cb: am 22d79a5c: make offsets in firmware update header not point to bad blocksDoug Zongker2010-01-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4e9332cb0bb84df4c08bbb469e59a54eab2a9df0' * commit '4e9332cb0bb84df4c08bbb469e59a54eab2a9df0': make offsets in firmware update header not point to bad blocks
| * | | | am 22d79a5c: make offsets in firmware update header not point to bad blocksDoug Zongker2010-01-133-8/+51
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '22d79a5c5eab9c1e86ff2af210bb072689e2d630' into eclair-plus-aosp * commit '22d79a5c5eab9c1e86ff2af210bb072689e2d630': make offsets in firmware update header not point to bad blocks
| | * | | make offsets in firmware update header not point to bad blocksDoug Zongker2010-01-133-8/+51
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (This is being cherry-picked from master.) hboot will apparently fail to install if the first block of the image (the one pointed to by the offset in the block 0 header) is a bad block. (Hopefully it handles subsequent bad blocks.) This change makes the MTD write code keep track of the bad blocks it has skipped over, so that the offset in the header can be adjusted to be the address of the first successfully written block. http://b/2358012 - passion: failure to flash hboot (bad blocks?)
* | | | make offsets in firmware update header not point to bad blocksDoug Zongker2010-01-133-8/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hboot will apparently fail to install if the first block of the image (the one pointed to by the offset in the block 0 header) is a bad block. (Hopefully it handles subsequent bad blocks.) This change makes the MTD write code keep track of the bad blocks it has skipped over, so that the offset in the header can be adjusted to be the address of the first successfully written block. Change-Id: I45d58e32a36d0c1dbc0a7f871bd5985b6c8ff524 http://b/2358012 - passion: failure to flash hboot (bad blocks?)
* | | | am 158657bc: merge from open-source masterJean-Baptiste Queru2009-12-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '158657bc5ce438d3cf1f601255896b854fd49103' * commit '158657bc5ce438d3cf1f601255896b854fd49103': Security: Fix typo in recovery EOCD detection.
| * | | merge from open-source masterJean-Baptiste Queru2009-12-220-0/+0
| |\ \ \
| | * | | Security: Fix typo in recovery EOCD detection.Steve Kondik2009-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This issue results in the ability to modify the contents of a signed OTA recovery image.
* | | | | am d36308c2: am 17a47098: use MEMGETBADBLOCK to look for bad blocks when reading MTD partitionsDoug Zongker2009-12-161-5/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd36308c26d3f2947f4ff49f2ecc22cbb659fdf37' * commit 'd36308c26d3f2947f4ff49f2ecc22cbb659fdf37': use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions
| * | | | am 17a47098: use MEMGETBADBLOCK to look for bad blocks when reading MTD partitionsDoug Zongker2009-12-151-5/+12
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit '17a47098d2a4214397f8b30e2692c9487d7ab5ff' into eclair-plus-aosp * commit '17a47098d2a4214397f8b30e2692c9487d7ab5ff': use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions
| | * | | 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
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12' into eclair-plus-aosp * commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12': fix cut-and-paste error in verifier
* | | | | am 9b430e11: am 73ae31ce: add a simple unit test for the OTA package verifierDoug Zongker2009-12-1111-2/+203
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9b430e11d6c4fb907d0aa96667142e2c00585e09' * commit '9b430e11d6c4fb907d0aa96667142e2c00585e09': add a simple unit test for the OTA package verifier
| * \ \ \ \ am 73ae31ce: add a simple unit test for the OTA package verifierDoug Zongker2009-12-1111-2/+203
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '73ae31ce0ac09c0e45924d817644261c87ab1a60' into eclair-mr2-plus-aosp * commit '73ae31ce0ac09c0e45924d817644261c87ab1a60': add a simple unit test for the OTA package verifier
| | * | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Recovery changes for Encrypted File Systems. This change enables/disables the Encrypted file systems feature. It reads some properties form the data partition, wipes the partition out, and then rewrites the proper properties again into the data partition to signal that encrypted FS are enabled.
| * | | | | | | Recovery changes for Encrypted File Systems.Oscar Montemayor2009-12-104-22/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables/disables the Encrypted file systems feature. It reads some properties form the data partition, wipes the partition out, and then rewrites the proper properties again into the data partition to signal that encrypted FS are enabled.
* | | | | | | | am 2278a04a: am 9acf28a3: am c652e41d: fix cut-and-paste error in verifierDoug Zongker2009-12-101-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Merge commit '2278a04a0921007d726e9e1ec4b668860f961f88' * commit '2278a04a0921007d726e9e1ec4b668860f961f88': fix cut-and-paste error in verifier
| * | | | | | am 9acf28a3: am c652e41d: fix cut-and-paste error in verifierDoug Zongker2009-12-101-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9acf28a390aab3e0f394c701bc3cda6cbc9393b3' into eclair-mr2-plus-aosp * commit '9acf28a390aab3e0f394c701bc3cda6cbc9393b3': fix cut-and-paste error in verifier
| | * | | | | am c652e41d: fix cut-and-paste error in verifierDoug Zongker2009-12-091-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12' into eclair-mr2 * commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12': fix cut-and-paste error in verifier
| | | * | | | fix cut-and-paste error in verifierDoug Zongker2009-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Oops.
* | | | | | | am 6e5be9b2: merge from open-source masterJean-Baptiste Queru2009-11-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6e5be9b24c232be4cfc22b7cbabb0fdf6d869f7c' * commit '6e5be9b24c232be4cfc22b7cbabb0fdf6d869f7c': eclair snapshot
| * | | | | | merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | Merge commit 'goog/stage-korg-master' into HEAD
| | | * | | | 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 commit '4011770f2d06fcb743abc91a01a531c7ae2d9175' * commit '4011770f2d06fcb743abc91a01a531c7ae2d9175':
| * | | | | | merge from open-source masterJean-Baptiste Queru2009-10-151-3/+6
| |\| | | | | | | |_|_|/ / | |/| | | |
| | * | | | am 54ec81fe: Merge change I1c8ca2e4 into eclairDoug Zongker2009-10-083-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa' into eclair-plus-aosp * commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa': replace generic recovery icons
| | * | | | am 988500b6: add terminator to recovery\'s getopt_long options arrayDoug Zongker2009-10-071-0/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '988500b615de24455e1fee69e72055bb1dca9c86' into eclair-plus-aosp * commit '988500b615de24455e1fee69e72055bb1dca9c86': add terminator to recovery's getopt_long options array
* | | | | | | am d93a2545: simplify construction of the recovery progress barDoug Zongker2009-10-1316-26/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd93a25459cdefba940f254b4c5f54fd7d9cdaf11' * commit 'd93a25459cdefba940f254b4c5f54fd7d9cdaf11': simplify construction of the recovery progress bar
| * | | | | | simplify construction of the recovery progress barDoug Zongker2009-10-0916-26/+19
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of six separate images for the left end, right end, and tiled center portion of the full and empty progress bars, just use two images: a full bar and an empty bar. Draw the left side of the full bar and the right side of the empty one, moving the boundary rightward to "fill" the bar. This makes recovery trivially smaller, and allows fancier images to be used as progress bars. Support paletted PNG images as resources.
* | | | | | am 54ec81fe: Merge change I1c8ca2e4 into eclairDoug Zongker2009-10-123-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa' * commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa': replace generic recovery icons
| * | | | | Merge change I1c8ca2e4 into eclairAndroid (Google) Code Review2009-10-083-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * changes: replace generic recovery icons
| | * | | | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '988500b615de24455e1fee69e72055bb1dca9c86' * commit '988500b615de24455e1fee69e72055bb1dca9c86': add terminator to recovery's getopt_long options array
| * | | | | add terminator to recovery's getopt_long options arrayDoug Zongker2009-10-061-0/+1
| |/ / / / | | | | | | | | | | | | | | | http://b/2170691 - recovery argument parsing is broken
* | | | | am 8f8bc4cb: am f93d8166: confirm before wiping user data in recoveryDoug Zongker2009-09-251-69/+107
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '8f8bc4cb487e0f853c97cb5ff1481d707ac6b66d' * commit '8f8bc4cb487e0f853c97cb5ff1481d707ac6b66d': confirm before wiping user data in recovery
| * | | | am f93d8166: confirm before wiping user data in recoveryDoug Zongker2009-09-231-69/+107
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f93d8166ef4c06f6ad71293ffa8a4ce469df4fa5' into eclair-plus-aosp * commit 'f93d8166ef4c06f6ad71293ffa8a4ce469df4fa5': confirm before wiping user data in recovery
| | * | | confirm before wiping user data in recoveryDoug Zongker2009-09-231-69/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the hidden menu to wipe data in recovery, confirm before starting the wipe. (This does not affect booting with the --wipe_data flag, or using Alt+W on dream with the menu hidden -- those still wipe data immediately.)
* | | | | am 486aa290: am fd8fb0c4: reduce fraction of progress bar for verificationDoug Zongker2009-09-201-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '486aa290635dbf6f60b3435694951fed3470ffdf' * commit '486aa290635dbf6f60b3435694951fed3470ffdf': reduce fraction of progress bar for verification
| * | | | am fd8fb0c4: reduce fraction of progress bar for verificationDoug Zongker2009-09-201-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fd8fb0c49242af5147708f1a93ea3acba546555b' into eclair-plus-aosp * commit 'fd8fb0c49242af5147708f1a93ea3acba546555b': reduce fraction of progress bar for verification
| | * | | reduce fraction of progress bar for verificationDoug Zongker2009-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the fraction of the progress bar used for package verification from 50% to 25%: - verification is faster than before due to sha1 improvements - in eclair we're now verifying the compressed data rather than decompressing it - incremental packages (which is what most installs use) write more data than is contained in the package.
* | | | | am d16fb221: am 60babf8b: delete files before symlinking; log error messagesDoug Zongker2009-09-191-3/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd16fb221cd27abea8a954bd5f6554fa116366519' * commit 'd16fb221cd27abea8a954bd5f6554fa116366519': delete files before symlinking; log error messages
| * | | | am 60babf8b: delete files before symlinking; log error messagesDoug Zongker2009-09-191-3/+21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '60babf8ba766662cc0932e8271b67daa69cddd5f' into eclair-plus-aosp * commit '60babf8ba766662cc0932e8271b67daa69cddd5f': delete files before symlinking; log error messages
| | * | | delete files before symlinking; log error messagesDoug Zongker2009-09-191-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symlink() function should remove existing files before creating symlinks, so scripts are idempotent. Log messages when various system calls fail (but don't make the whole script fail).
* | | | | am 2f4fc561: am 196c25c7: don\'t complain if recovery icon is shortDoug Zongker2009-09-171-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2f4fc56183f3fe2edb5e3cd5e12329871e02518f' * commit '2f4fc56183f3fe2edb5e3cd5e12329871e02518f': don't complain if recovery icon is short
| * | | | am 196c25c7: don\'t complain if recovery icon is shortDoug Zongker2009-09-151-1/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '196c25c777daedbe2fe5a45171fb42e43ceed9af' into eclair-plus-aosp * commit '196c25c777daedbe2fe5a45171fb42e43ceed9af': don't complain if recovery icon is short
| | * | | don't complain if recovery icon is shortDoug Zongker2009-09-151-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the a recovery icon file is so short that we can't even read the 8-byte header, put a message in the log but not on the device screen. We intentionally have zero-length files for some icons on some devices, if they're never shown (eg, the firmware installation icons are only used on HTC devices).
* | | | | am b5d542cd: am a3f89eab: add a run_program() function to edifyDoug Zongker2009-09-101-0/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b5d542cd40360867bc00cdb9266c0abf26448c55' * commit 'b5d542cd40360867bc00cdb9266c0abf26448c55': add a run_program() function to edify
| * | | | am a3f89eab: add a run_program() function to edifyDoug Zongker2009-09-101-0/+49
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a3f89eabb7ddcf44add8ce3b321ceab6d35289cb' into eclair-plus-aosp * commit 'a3f89eabb7ddcf44add8ce3b321ceab6d35289cb': add a run_program() function to edify
| | * | | add a run_program() function to edifyDoug Zongker2009-09-101-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | Handy for producing debugging OTA packages (eg, running sqlite3 or whatever in recovery).
* | | | | am 9a77b613: merge from open-source masterJean-Baptiste Queru2009-09-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9a77b613f3fdf6340b0f5f24d1c725fd0001e4a9' * commit '9a77b613f3fdf6340b0f5f24d1c725fd0001e4a9':
| * | | | 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 commit 'cbf903803850deb4f70490d97a1603e7b8679cc2' * commit 'cbf903803850deb4f70490d97a1603e7b8679cc2': Not all failures to fopen_root_path() are serious.
| * | | | 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
| | | | | | | | | | | | | | | | Example: E:Can't open /cache/recovery/command.
* | | | am 34c98df7: (-s ours) do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from masterDoug Zongker2009-08-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '34c98df78a80881698f63ce0815f3e16823d85e0' * commit '34c98df78a80881698f63ce0815f3e16823d85e0': do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | after a power loss Submitted on behalf of Hong-Bin Wang <hong-binwang@motorola.com> Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
* | | | am 54e2e86c: (-s ours) do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branchDoug Zongker2009-08-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '54e2e86c5740a2c7a02e95e94c4aff362a5502cf' * commit '54e2e86c5740a2c7a02e95e94c4aff362a5502cf': do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch
| * | | 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
|/ / / | | | | | | | | | | | | | | | | | | In recovery, verify a signature that covers the entire zip file, instead of using the jarsigner format to verify individual files. Bug: 1328985
* | | 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
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Merge commit '20697b965cd923211daeea2037f60218358b9659' * commit '20697b965cd923211daeea2037f60218358b9659': only build flash_image for eng
| * | | only build flash_image for engDoug Zongker2009-07-241-0/+1
| | |/ | |/| | | | | | | | | | | | | With the recovery image being installed by applypatch, the flash_image tool isn't needed any more. Continue to build it for eng just in case it's handy for debugging.
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gcc 4.4 complains about some of the recovery ui functions not being declared. To include the header, we have to fix the 'volatile' declaration (otherwise there's a compiler error). Move the dream-specific images to vendor/htc/dream, make the default images a generic phone.
* | | | resolved conflicts for merge of 64893ccc to masterDoug Zongker2009-07-1671-5257/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | remove amendDoug Zongker2009-07-1571-5257/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | Yank all the code to install OTA packages out of the recovery binary itself. Now packages are installed by a binary included in the package (run as a child of recovery), so we can make improvements in the installation process without waiting for a new release to use them.
* | | am bec02d57: skip over all-zero blocks when reading MTD partitionDoug Zongker2009-07-031-1/+12
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'bec02d57fb85cc7dd0196a54b0e9530e306623ac' * commit 'bec02d57fb85cc7dd0196a54b0e9530e306623ac': skip over all-zero blocks when reading MTD partition
| * | skip over all-zero blocks when reading MTD partitionDoug Zongker2009-07-011-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We fail to detect certain bad blocks (marked in the factory as bad, I think?) when reading mtd partitions. These come back as a block of all zeros. Since it's fairly unlikely a legitimate boot or recovery block will contain 128k of zeros, change mtdutils to skip over such blocks. Arve says https://review.source.android.com/10535 may be a long-term fix for this, but he isn't yet sure.
* | | am d8f7c9b8: Merge change 5545 into donutAndroid (Google) Code Review2009-06-301-1/+6
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'd8f7c9b85e25fab93fef2221a84b60edc2e7b837' * commit 'd8f7c9b85e25fab93fef2221a84b60edc2e7b837': remove updater from the user system image
| * | Merge change 5545 into donutAndroid (Google) Code Review2009-06-261-1/+6
| |\ \ | | | | | | | | | | | | | | | | * changes: remove updater from the user system image
| | * | remove updater from the user system imageDoug Zongker2009-06-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | updater (which is only needed in OTA packages) is getting included in /system/bin, where it just takes up (quite a bit of) space. Use the hack of including it only in eng builds so it's not there for user builds.
* | | | am 0bbfe3d9: fix off-by-one error in set_perm()Doug Zongker2009-06-251-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0bbfe3d901885c1f0ab006e8d4cc1029c44a7376' * commit '0bbfe3d901885c1f0ab006e8d4cc1029c44a7376': fix off-by-one error in set_perm()
| * | | fix off-by-one error in set_perm()Doug Zongker2009-06-251-1/+1
| |/ / | | | | | | | | | | | | We were inadvertently skipping over the first filename in the list of arguments.
* | | am fbf3c10e: improve updater progress barDoug Zongker2009-06-252-4/+34
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'fbf3c10e45c20f8fe6bd1ac49ffe220035b9c454' * commit 'fbf3c10e45c20f8fe6bd1ac49ffe220035b9c454': improve updater progress bar
| * | improve updater progress barDoug Zongker2009-06-242-4/+34
| | | | | | | | | | | | | | | | | | Let recovery accept set_progress commands to control progress over the 'current segment' of the bar. Add a set_progress() builtin to the updater binary.
* | | add device extension mechanism to updaterDoug Zongker2009-06-222-1/+43
| | | | | | | | | | | | | | | | | | | | | Allow devices (in BoardConfig.mk) to define additional static libraries to be linked in to updater, to make device-specific functions available in edify scripts. Modify the updater makefile to arrange for device libraries to register their edify functions.
* | | add function for device-specific wipe data featuresDoug Zongker2009-06-194-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | Some devices want to do special things when recovery wipes data (eg, wipe data in their baseband processor as well). Add a hook in the device-specific recovery library that gets called when data is wiped. Also add an amend root for the "mbm" partition.
* | | am 47cace98: add file_getprop() to updaterDoug Zongker2009-06-183-11/+117
|\| | | | | | | | | | | | | | | | | | | | Merge commit '47cace98369f60df2351a65801c8065bb7f9dbf0' * commit '47cace98369f60df2351a65801c8065bb7f9dbf0': add file_getprop() to updater
| * | add file_getprop() to updaterDoug Zongker2009-06-183-11/+117
| | | | | | | | | | | | | | | | | | | | | Add a function to read a property from a ".prop"-formatted file (key=value pairs, one per line, ignore # comment lines and blank lines). Move ErrorAbort to the core of edify; it's not specific to updater now that errors aren't stored in the app cookie.
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | To do a firmware-install-on-reboot, the update binary tells recovery what file to install before rebooting. Let this file be specified as "PACKAGE:<foo>" to indicate taking the file out of the OTA package, avoiding an extra copy to /tmp. Bump the API version number to reflect this change.
* | | am e3da02e7: add less_than_int, greater_than_int to edifyDoug Zongker2009-06-152-0/+63
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'e3da02e7bcfd85c543419e7590a3c86f64d8cc8a' * commit 'e3da02e7bcfd85c543419e7590a3c86f64d8cc8a': add less_than_int, greater_than_int to edify
| * | add less_than_int, greater_than_int to edifyDoug Zongker2009-06-132-0/+63
| | | | | | | | | | | | | | | | | | | | | Add functions less_than_int() and greater_than_int() that interpret their args as ints and do the comparison. ("<" and ">" operators, if implemented, should do string comparison.) This lets us do the build time check currently done by the check_prereq binary.
* | | am d9c9d10d: fixes to edify and updater scriptDoug Zongker2009-06-159-509/+674
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'd9c9d10d9da76f067d3955bea71f7bb39e859fa5' * commit 'd9c9d10d9da76f067d3955bea71f7bb39e859fa5': fixes to edify and updater script
| * | fixes to edify and updater scriptDoug Zongker2009-06-129-509/+674
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few more changes to edify: - fix write_raw_image(); my last change neglected to close the write context, so the written image was corrupt. - each expression tracks the span of the source code from which it was compiled, so that assert()'s error message can include the source of the expression that failed. - the 'cookie' argument to each Function is replaced with a State object, which contains the cookie, the source script (for use with the above spans), and the current error message (replacing the global variables that were used for this purpose). - in the recovery image, a new command "ui_print" can be sent back through the command pipe to cause text to appear on the screen. Add a new ui_print() function to print things from scripts. Rename existing "print" function to "stdout".
* | | am 8edb00c9: edify extensions for OTA package installation, part 2Doug Zongker2009-06-157-16/+291
|\| | | | | | | | | | | | | | | | | | | | Merge commit '8edb00c990e563e6f91b278a212f2edf877cf763' * commit '8edb00c990e563e6f91b278a212f2edf877cf763': edify extensions for OTA package installation, part 2
| * | edify extensions for OTA package installation, part 2Doug Zongker2009-06-127-16/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds more edify functions for OTAs: is_mounted getprop apply_patch apply_patch_check apply_patch_space write_raw_image write_firmware_image package_extract_file This allows us to install radios, hboots, boot images, and install incremental OTA packages. Fixes a couple of dumb bugs in edify itself: - we were doubling the size of the function table each time it was *not* full, rather than each time it was full - "no such function" errors weren't visible to the parser, so they didn't prevent execution of the script.
* | | am 9dbc027b: fix sim build in donut, tooDoug Zongker2009-06-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | Merge commit '9dbc027b5f540bcf23c968398f8a70e92abd56cd' * commit '9dbc027b5f540bcf23c968398f8a70e92abd56cd': fix sim build in donut, too
| * | 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
|\| | | | | | | | | | | | | | | | | | | | Merge commit '9931f7f3c1288171319e9ff7d053ebaad07db720' * commit '9931f7f3c1288171319e9ff7d053ebaad07db720': edify extensions for OTA package installation, part 1
| * | edify extensions for OTA package installation, part 1Doug Zongker2009-06-1213-13/+694
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the following edify functions: mount unmount format show_progress delete delete_recursive package_extract symlink set_perm set_perm_recursive This set is enough to extract and install the system part of a (full) OTA package. Adds the updater binary that extracts an edify script from the OTA package and then executes it. Minor changes to the edify core (adds a sleep() builtin for debugging, adds "." to the set of characters that can appear in an unquoted string).
* | | fix simulator build by excluding more of recoveryDoug Zongker2009-06-121-3/+4
| | |
* | | fix error from change 3606Doug Zongker2009-06-111-18/+18
| | | | | | | | | | | | | | | When I changed the definition of device_perform_action() in response to a reviewer comment, I forgot to change this implementation.
* | | split out device-specific recovery UI code into vendor directoriesDoug Zongker2009-06-116-72/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | Take some device-specific details of the recovery UI (eg, what keys to press to bring up the interface and perform actions, exact text of the menu, etc.) and split them out into separate C functions. Arrange to take implementations of those functions from the appropriate vendor directory at build time. Provide a default implementation in case no vendor-specific one is available.
* | | am 9b9c2114: Merge change 3514 into donutAndroid (Google) Code Review2009-06-107-0/+889
|\| | | | | | | | | | | | | | | | | | | | Merge commit '9b9c2114bd7d02200ce43cb9ec513473079dfad9' * commit '9b9c2114bd7d02200ce43cb9ec513473079dfad9': core of edify, an eventual replacement for amend
| * | Merge change 3514 into donutAndroid (Google) Code Review2009-06-107-0/+889
| |\ \ | | | | | | | | | | | | | | | | * changes: core of edify, an eventual replacement for amend
| | * | core of edify, an eventual replacement for amendDoug Zongker2009-06-107-0/+889
| | | | | | | | | | | | | | | | | | | | | | | | Edify is a simple scripting language for OTA installation, to be used when we move to OTAs being installed via binaries shipped with the package.
* | | | Force the fb into 16 bpp mode in case the hw has some other default.Rebecca Schultz Zavin2009-06-061-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* | | | am b2ee9201: allow OTA package to provide binary instead of scriptDoug Zongker2009-06-051-1/+169
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b2ee9201be583b17ddbf0eaa69a37545f992b565' * commit 'b2ee9201be583b17ddbf0eaa69a37545f992b565': allow OTA package to provide binary instead of script
| * | | allow OTA package to provide binary instead of scriptDoug Zongker2009-06-051-1/+169
| |/ / | | | | | | | | | | | | Allow installation of OTA packages which do not contain an update-script, but instead contain an update-binary.
* | | am f28c916e: remove unused permissions scheme from amendDoug Zongker2009-06-0312-1076/+69
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'f28c916e73ee9f643c67c70d059c70381d774cb0' * commit 'f28c916e73ee9f643c67c70d059c70381d774cb0': remove unused permissions scheme from amend
| * | remove unused permissions scheme from amendDoug Zongker2009-06-0312-1076/+69
| | | | | | | | | | | | | | | | | | | | | Amend (aka the recovery command language) had a half-implemented scheme of limiting which commands OTA packages were allowed to execute. It's not clear what this was ever supposed to be good for. Remove it.
* | | am 07e1dca7: don\'t say "install complete" when it really isn\'tDoug Zongker2009-06-014-2/+14
|\| | | | | | | | | | | | | | | | | | | | Merge commit '07e1dca7068284c4f3013550335029eb72b39b82' * commit '07e1dca7068284c4f3013550335029eb72b39b82': don't say "install complete" when it really isn't
| * | don't say "install complete" when it really isn'tDoug Zongker2009-05-294-2/+14
| | | | | | | | | | | | | | | | | | | | | Change the recovery UI so that when there is a hboot or radio update pending (which the user most do a home+back reboot to actually install), the UI tells them so, instead of saying "Install from sdcard complete."
* | | am 1c4ceae: undo temporary alignment hackDoug Zongker2009-05-082-48/+8
|\| | | | | | | | | | | | | | | | | | | | Merge commit '1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9' * commit '1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9': undo temporary alignment hack
| * | undo temporary alignment hackDoug Zongker2009-05-082-48/+8
| | | | | | | | | | | | | | | | | | Remove the memory alignment that mysteriously made OTA installs work, in anticipation of a kernel that fixes the actual problem. Handle EINTR properly.
* | | am 683c462: align data passed to write() on 32k boundariesDoug Zongker2009-05-062-17/+55
|\| | | | | | | | | | | | | | | | | | | | Merge commit '683c4628039a8cb6dad1a086fae23a7d71438414' * commit '683c4628039a8cb6dad1a086fae23a7d71438414': align data passed to write() on 32k boundaries
| * | align data passed to write() on 32k boundariesDoug Zongker2009-05-062-17/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In donut, OTA installation often encounters the write() system call doing short writes -- which is legal but unexpected -- or failing with ENOSPC when plenty of space is available. Passing aligned memory buffers to write() appears to prevent (or at least reduce the frequency) of these problems. b/1833052 has been filed to look at the underlying problem, but this change aligns buffers we use with write() so we can OTA for now (or see if this problem still occurs).
* | | am 596271f: handle short writes when unzipping filesDoug Zongker2009-04-301-11/+27
|\| | | | | | | | | | | | | | | | | | | | Merge commit '596271fa71d79e3eec03c7cf6ac76cb026dd8578' * commit '596271fa71d79e3eec03c7cf6ac76cb026dd8578': handle short writes when unzipping files
| * | handle short writes when unzipping filesDoug Zongker2009-04-301-11/+27
| | | | | | | | | | | | | | | | | | | | | minzip fails if write() doesn't write all the data in one call. Apparently this was good enough before, but it causes OTAs to fail all the time now (maybe due to the recently-submitted kernel)? Change code to attempt continuing after short writes.
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | them from an external file in the recovery image. Use the test-keys for all builds. Automated import of CL 144130
| * | | AI 144082: Remove the unused "unpacking" recovery icon.Doug Zongker2009-04-013-2/+0
| | | | | | | | | | | | | | | | Automated import of CL 144082
| * | | AI 144070: Add an option to wipe cache (only) to the recovery menu.Doug Zongker2009-04-011-0/+9
| | | | | | | | | | | | | | | | Automated import of CL 144070
| * | | AI 143128: Use PNG instead of BMP for recovery image icons. This savesDoug Zongker2009-03-2736-101/+68
| | | | | | | | | | | | | | | | | | | | | | | | about 60k from the recovery and system images. Automated import of CL 143128
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | them from an external file in the recovery image. Use the test-keys for all builds. Original author: dougz Merged from: //branches/donutburger/... Automated import of CL 144132
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original author: dougz Merged from: //branches/donutburger/... Automated import of CL 144105
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original author: dougz Merged from: //branches/donutburger/... Automated import of CL 144101
* | | | | 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
| | | | | | | | | | | | Resolves http://code.google.com/p/android/issues/detail?id=2077
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | about 60k from the recovery and system images. Original author: dougz Merged from: //branches/donutburger/... Automated import of CL 143289
* | | | 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