aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Merge "Remove some commented-out code."Elliott Hughes2015-04-091-10/+0
| | |\ \ | | | |/ | | |/|
| | | * Remove some commented-out code.Elliott Hughes2015-04-091-10/+0
| | |/ | | | | | | | | | Change-Id: Ifb466ee2a89da88832c04086fa43da2b8409c232
* | | am 382ec478: am 52222a58: Merge "Move file paging into ScreenRecoveryUI."Elliott Hughes2015-04-095-95/+104
|\ \ \ | |/ / | | | | | | | | | * commit '382ec478d1ed1576d25d51205a1c67b190174172': Move file paging into ScreenRecoveryUI.
| * | am 52222a58: Merge "Move file paging into ScreenRecoveryUI."Elliott Hughes2015-04-095-95/+104
| |\ \ | | |/ | | | | | | | | | * commit '52222a58417e7e6349e91e19e4f5e293a3a971c5': Move file paging into ScreenRecoveryUI.
| | * Merge "Move file paging into ScreenRecoveryUI."Elliott Hughes2015-04-095-95/+104
| | |\
| | | * Move file paging into ScreenRecoveryUI.Elliott Hughes2015-04-085-95/+104
| | |/ | | | | | | | | | | | | | | | This fixes the N9 performance problem. Change-Id: I00c10d4162ff266a6243285e5a5e768217f6f799
* | | am 36640972: am fbde407e: Merge "Enable printf format argument checking."Elliott Hughes2015-04-094-5/+5
|\ \ \ | |/ / | | | | | | | | | * commit '36640972b04c0b91207583e35f78acded4a28190': Enable printf format argument checking.
| * | am fbde407e: Merge "Enable printf format argument checking."Elliott Hughes2015-04-094-5/+5
| |\ \ | | |/ | | | | | | | | | * commit 'fbde407e4c72965aae4ea6dff7493e30af307ca5': Enable printf format argument checking.
| | * Merge "Enable printf format argument checking."Elliott Hughes2015-04-094-5/+5
| | |\
| | | * Enable printf format argument checking.Elliott Hughes2015-04-084-5/+5
| | |/ | | | | | | | | | | | | | | | | | | The original attempt missed the fact that Print is a member function, so the first argument is the implicit 'this'. Change-Id: I963b668c5432804c767f0a2e3ef7dea5978a1218
* | | am 0d4f2b6d: am 900c9a61: Merge "Remove the fixed screen size assumptions."Elliott Hughes2015-04-092-32/+37
|\ \ \ | |/ / | | | | | | | | | * commit '0d4f2b6d9ad1c5980f3ece965c4c4a49726c29f4': Remove the fixed screen size assumptions.
| * | am 900c9a61: Merge "Remove the fixed screen size assumptions."Elliott Hughes2015-04-092-32/+37
| |\ \ | | |/ | | | | | | | | | * commit '900c9a61dee1511c9f4086ea5a3a3632b944cc0e': Remove the fixed screen size assumptions.
| | * Merge "Remove the fixed screen size assumptions."Elliott Hughes2015-04-082-32/+37
| | |\
| | | * Remove the fixed screen size assumptions.Elliott Hughes2015-04-082-32/+37
| | | | | | | | | | | | | | | | | | | | | | | | Dynamically allocate the text and menu arrays instead. Change-Id: Idbfc3fe4e4b50db4fee62ac2b6a7323cad369749
* | | | am 72ba6264: am 64346eae: Merge "Remove a couple of unused inlines from ↵Elliott Hughes2015-04-091-10/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | minzip/Zip.h." * commit '72ba6264468573c21cc6bade65172be549f5b034': Remove a couple of unused inlines from minzip/Zip.h.
| * | | am 64346eae: Merge "Remove a couple of unused inlines from minzip/Zip.h."Elliott Hughes2015-04-081-10/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '64346eae51861356f8bf0f50e68dfeb9e1d04052': Remove a couple of unused inlines from minzip/Zip.h.
| | * | Merge "Remove a couple of unused inlines from minzip/Zip.h."Elliott Hughes2015-04-081-10/+0
| | |\ \ | | | |/ | | |/|
| | | * Remove a couple of unused inlines from minzip/Zip.h.Elliott Hughes2015-04-081-10/+0
| | |/ | | | | | | | | | Change-Id: I805883e3863673416898bdef39c5703ca33f18e0
* | | am 0a7c1694: am ca7bf531: Merge "Rotate logs only when there are actual ↵Tao Bao2015-04-084-9/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | operations" * commit '0a7c16948b9750c0c063676cefce1f1354f9c971': Rotate logs only when there are actual operations
| * | am ca7bf531: Merge "Rotate logs only when there are actual operations"Tao Bao2015-04-084-9/+33
| |\ \ | | |/ | | | | | | | | | * commit 'ca7bf53189c70ef0f687d54d772e5eaadc0b1c7c': Rotate logs only when there are actual operations
| | * Merge "Rotate logs only when there are actual operations"Tao Bao2015-04-084-9/+33
| | |\
| | | * Rotate logs only when there are actual operationsTao Bao2015-04-074-9/+33
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it rotates the log files every time it boots into the recovery mode. We lose useful logs after ten times. This CL changes the rotation condition so that it will rotate only if it performs some actual operations that modify the flash (installs, wipes, sideloads and etc). Bug: 19695622 Change-Id: Ie708ad955ef31aa500b6590c65faa72391705940
* | | am 575e3739: am 6896f9d4: Merge "always use volume mount option when ↵Tao Bao2015-04-011-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | mounting a partition" * commit '575e37394ec9dc2ff0b098c7a6fe8e3f95c4808f': always use volume mount option when mounting a partition
| * | am 6896f9d4: Merge "always use volume mount option when mounting a partition"Tao Bao2015-04-011-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '6896f9d47db1f959a907d2e67e55860af23e65f8': always use volume mount option when mounting a partition
| | * Merge "always use volume mount option when mounting a partition"Tao Bao2015-03-311-1/+1
| | |\
| | | * always use volume mount option when mounting a partitionGaelle Nassiet2015-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From ROS, if enable adb using the vol.up and vol.down buttons, the /system partition is mounted by the function ensure_path_mounted() but with hardcoded mount options. As a consequence, the blocks are modified and the reboot in MOS is blocked by the dm_verity feature that detects a corruption. This patch forces the function ensure_path_mounted() to use the mount options from the volume structure, that were previously read from the fstab. Change-Id: I748d32c14cb821f4aae5bcc430089dab45375515 Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com> Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
* | | | am 8cd389c8: am ccc82eca: Merge "Refactor the codes to call ↵Tao Bao2015-04-011-22/+36
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | wipe_data/wipe_cache functions" * commit '8cd389c80568ff46c18c7f7a59396562a6cf7f59': Refactor the codes to call wipe_data/wipe_cache functions
| * | | am ccc82eca: Merge "Refactor the codes to call wipe_data/wipe_cache functions"Tao Bao2015-04-011-22/+36
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'ccc82eca9a9b63f43c69472c0841954f19f7a7f0': Refactor the codes to call wipe_data/wipe_cache functions
| | * | Merge "Refactor the codes to call wipe_data/wipe_cache functions"Tao Bao2015-03-311-22/+36
| | |\ \
| | | * | Refactor the codes to call wipe_data/wipe_cache functionsTao Bao2015-03-311-22/+36
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | It also changes the return type of wipe_data/wipe_cache to bool, so the caller can get the status accordingly. Change-Id: I3022dcdadd6504dac757a52c2932d1176ffd1918
* | | | am 9e1bba1f: am 9295980a: Merge "Revert "Erase PST partition if its marked ↵Tao Bao2015-03-310-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | to be erased."" * commit '9e1bba1f5f53f366bfec995a89e362c3b897cb37': Revert "Erase PST partition if its marked to be erased."
| * | | am 9295980a: Merge "Revert "Erase PST partition if its marked to be erased.""Tao Bao2015-03-313-44/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '9295980ac1554ff7c30531298aadec0750b027e0': Revert "Erase PST partition if its marked to be erased."
| | * | Merge "Revert "Erase PST partition if its marked to be erased.""Tao Bao2015-03-313-44/+0
| | |\ \
| | | * | Revert "Erase PST partition if its marked to be erased."Andres Morales2015-03-313-44/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This now gets done at the framework level. Doing it here breaks the signature on the partition. This reverts commit ee19387905650cab5da7dd97ada5502cd17ac93d. Bug: 19967123 Change-Id: I2a977cb0f0ba94defa1bf9091219398ddc1d3528 (cherry picked from commit 037444642bc32d8fed3bb996823b6a62faa57195)
* | | | resolved conflicts for merge of 5472176c to masterTao Bao2015-03-301-26/+49
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ib2395d806bb8c029f7743c36cb7849e5589fad7b
| * | | am 20e82d4f: Merge "Add support to enter sideload mode directly"Tao Bao2015-03-311-26/+49
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '20e82d4fb6b4ba8520bd46db2982495f0b627ed1': Add support to enter sideload mode directly
| | * | Merge "Add support to enter sideload mode directly"Tao Bao2015-03-311-26/+49
| | |\ \
| | | * | Add support to enter sideload mode directlyTao Bao2015-03-301-26/+49
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the command file contains "--sideload" (as a result of 'adb reboot sideload'), it goes into sideload mode directly. Text display will be turned on by default. It waits for user interaction upon finishing. When the command file contains "--sideload_auto_reboot", it enters sideload mode silently. And it will reboot after the installation regardless of its result, which is designed for automated testing purpose. Change-Id: Ifdf173351221c7bbf635cfd32463b48e1fff5740
* | | | Revert "Erase PST partition if its marked to be erased."Andres Morales2015-03-303-44/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | This now gets done at the framework level. Doing it here breaks the signature on the partition. This reverts commit ee19387905650cab5da7dd97ada5502cd17ac93d. Bug: 19967123 Change-Id: I447b926b733ca145f11a916d9569ce39889db627
* | | am dac24865: Merge "Factor out the "yes/no" menu and use it for "Wipe cache" ↵Elliott Hughes2015-03-261-60/+35
|\ \ \ | |/ / | | | | | | | | | | | | | | | too." * commit 'dac2486514ef7b794610e929fd5615d98c9c1932': Factor out the "yes/no" menu and use it for "Wipe cache" too.
| * | Merge "Factor out the "yes/no" menu and use it for "Wipe cache" too."Elliott Hughes2015-03-251-60/+35
| |\ \
| | * | Factor out the "yes/no" menu and use it for "Wipe cache" too.Elliott Hughes2015-03-251-60/+35
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's surprising that only one of the wipe options asks for confirmation. This change makes it easier to add confirmation to any action. I've also removed the version information from all but the main menu, because I find I'm not really reading the red text because there's so much of it all the time. (Given that fingerprints are long and menu items aren't wrapped, we might want to go with an actual "About" menu item instead.) Change-Id: I7d809fdd53f9af32efc78bee618f98a69883fffe
* | | am 43b80810: Merge "Factor out option variables from int to bool types"Tao Bao2015-03-265-14/+16
|\ \ \ | |/ / | | | | | | | | | * commit '43b80810284bd0eb43a4488044f902c910c9f3b2': Factor out option variables from int to bool types
| * | Merge "Factor out option variables from int to bool types"Tao Bao2015-03-255-14/+16
| |\ \
| | * | Factor out option variables from int to bool typesTao Bao2015-03-255-14/+16
| |/ / | | | | | | | | | Change-Id: Ia897aa43e44d115bde6de91789b35723826ace22
* | | am e31f9565: Merge "Remove support for Cupcake kernels."Elliott Hughes2015-03-241-17/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'e31f956597f758154a5f6ca7a5793230c8eff936': Remove support for Cupcake kernels.
| * | Merge "Remove support for Cupcake kernels."Elliott Hughes2015-03-241-17/+0
| |\ \
| | * | Remove support for Cupcake kernels.Elliott Hughes2015-03-241-17/+0
| |/ / | | | | | | | | | Change-Id: I7376b9d3c1e11d19e164072d6e9d09c1183114a0
* | | am 9460bb2c: Merge "Fix recovery image text rendering."Elliott Hughes2015-03-243-32/+25
|\ \ \ | |/ / | | | | | | | | | * commit '9460bb2c3df9e985c14d2dd76b03aefb3333b251': Fix recovery image text rendering.
| * | Merge "Fix recovery image text rendering."Elliott Hughes2015-03-243-32/+25
| |\ \
generated by cgit v1.1 at 2025-01-10 08:59:25 +0000