summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "updater: Add a function to check first block" am: 6f8b9b60dbTianjie Xu2016-01-080-0/+0
|\ | | | | | | | | | | | | am: a3c89623e7 * commit 'a3c89623e765a7d91d781cbd83dd8e50c6c865c9': updater: Add a function to check first block
| * Merge "updater: Add a function to check first block"Tianjie Xu2016-01-082-0/+58
| |\ | | | | | | | | | | | | | | | | | | am: 6f8b9b60db * commit '6f8b9b60dbf2d73e0ee6e757d565035f017e1ccd': updater: Add a function to check first block
| | * Merge "updater: Add a function to check first block"Tianjie Xu2016-01-082-0/+58
| | |\
| | | * updater: Add a function to check first blockTianjie Xu2016-01-072-0/+58
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add and register a function to check if the device has been remounted since last update during incremental OTA. This function reads block 0 and executes before partition recovery for version >= 4. Bug: 21124327 Change-Id: I8b915b9f1d4736b3609daa9d16bd123225be357f (cherry picked from commit 30bf4765593e639966df9f460df22c3fe912e7bf)
* | | Merge "updater: Add a function to check first block"Tianjie Xu2016-01-072-0/+58
|\ \ \
| * | | updater: Add a function to check first blockTianjie Xu2015-12-182-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add and register a function to check if the device has been remounted since last update during incremental OTA. This function reads block 0 and executes before partition recovery for version >= 4. Bug: 21124327 Change-Id: I8b915b9f1d4736b3609daa9d16bd123225be357f
* | | | Merge "imgdiff: skip spurious gzip headers in image files" am: 8e150a5b24David Riley2016-01-041-6/+13
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | am: c1de9837e3 * commit 'c1de9837e3bdb64bc1f5d9779df7a944326f5f2b': imgdiff: skip spurious gzip headers in image files
| * | | Merge "imgdiff: skip spurious gzip headers in image files"David Riley2016-01-041-6/+13
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | am: 8e150a5b24 * commit '8e150a5b240833ddf54cbc572cea30ab18e06d86': imgdiff: skip spurious gzip headers in image files
| | * | Merge "imgdiff: skip spurious gzip headers in image files"David Riley2016-01-041-6/+13
| | |\ \
| | | * | imgdiff: skip spurious gzip headers in image filesDavid Riley2015-12-231-6/+13
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dragon kernel is compressed via lz4 for boot speed and bootloader support reasons and recent prebuilts happen to include the gzip header sequence which is causing imgdiff to fail. Detect a spurious gzip header and treat the section as a normal section. Bug: 26133184 Change-Id: I369d7d576fd7d2c579c0780fc5c669a5b6ea0d3d (cherry picked from commit 0f2f6a746af517afca9e5e089a4a17be0a9766d6) Signed-off-by: David Riley <davidriley@google.com>
* | | / Merge "res: Embed FPS into icon_installing.png." am: 29b0fbe160Tao Bao2015-12-1812-42/+82
|\| | | | |_|/ |/| | | | | | | | | | | | | | am: ef911716b0 * commit 'ef911716b04a773bcba1e693638cfd9cbb9e4ddc': res: Embed FPS into icon_installing.png.
| * | Merge "res: Embed FPS into icon_installing.png."Tao Bao2015-12-1812-42/+82
| |\| | | | | | | | | | | | | | | | | | | am: 29b0fbe160 * commit '29b0fbe160f815a142fa0d056c1ce10186cea516': res: Embed FPS into icon_installing.png.
| | * Merge "res: Embed FPS into icon_installing.png."Tao Bao2015-12-1812-42/+82
| | |\
| | | * res: Embed FPS into icon_installing.png.Tao Bao2015-12-1612-42/+82
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We allow vendor-specific icon installing image but have defined private animation_fps that can't be overridden. This CL changes the image generator to optionally embed FPS (otherwise use the default value of 20) into the generated image. For wear devices, they are using individual images instead of the interlaced one. Change the animation_fps from private to protected so that it can be customized. Bug: 26009230 Change-Id: I9fbf64ec717029d4c54f72316f6cb079e8dbfb5e
* | | Merge "updater: Use O_SYNC and fsync() for package_extract_file()." am: 4e72d1a81eTao Bao2015-12-151-6/+13
|\| | | | | | | | | | | | | | | | | | | | am: 125a6349b9 * commit '125a6349b9b390bd531690099939aaaf8a7513a8': updater: Use O_SYNC and fsync() for package_extract_file().
| * | Merge "updater: Use O_SYNC and fsync() for package_extract_file()."Tao Bao2015-12-151-6/+13
| |\| | | | | | | | | | | | | | | | | | | am: 4e72d1a81e * commit '4e72d1a81e2194caf101dc8633858efaa9bdb39b': updater: Use O_SYNC and fsync() for package_extract_file().
| | * Merge "updater: Use O_SYNC and fsync() for package_extract_file()."Tao Bao2015-12-151-6/+13
| | |\
| | | * updater: Use O_SYNC and fsync() for package_extract_file().Tao Bao2015-12-151-6/+13
| | |/ | | | | | | | | | | | | | | | | | | | | | We are already using O_SYNC and fsync() for the recursive case (package_extract_dir()). Make it consistent for the single-file case. Bug: 20625549 Change-Id: I487736fe5a0647dd4a2428845e76bf642e0f0dff
* | | Merge "update_verifier: Track the API change for isSlotBootable()." am: e062645efaTao Bao2015-12-111-5/+6
|\| | | | | | | | | | | | | | | | | | | | am: 1a76924301 * commit '1a7692430123ec4af3acc01c4d08f738efc12513': update_verifier: Track the API change for isSlotBootable().
| * | Merge "update_verifier: Track the API change for isSlotBootable()."Tao Bao2015-12-111-5/+6
| |\| | | | | | | | | | | | | | | | | | | am: e062645efa * commit 'e062645efa77ce3ab9ab802daee9e36b58e67bc4': update_verifier: Track the API change for isSlotBootable().
| | * Merge "update_verifier: Track the API change for isSlotBootable()."Tao Bao2015-12-111-5/+6
| | |\
| | | * update_verifier: Track the API change for isSlotBootable().Tao Bao2015-12-091-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [1] added a new API isSlotMarkedSuccessful() to actually query if a given slot has been marked as successful. [1]: commit 72c88c915d957bf2eba73950e7f0407b220d1ef4 Change-Id: I9155c9b9233882a295a9a6e607a844d9125e4c56
* | | | Merge "uncrypt: Suppress the compiler warnings on LP64." am: ca18526760Tao Bao2015-12-111-10/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8fa5f006c1 * commit '8fa5f006c190c1f4a9e48cfbf4112ca15459cbb1': uncrypt: Suppress the compiler warnings on LP64.
| * | | Merge "uncrypt: Suppress the compiler warnings on LP64."Tao Bao2015-12-111-10/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: ca18526760 * commit 'ca185267607fff06b4d70c7bdbb23152f64d4582': uncrypt: Suppress the compiler warnings on LP64.
| | * | Merge "uncrypt: Suppress the compiler warnings on LP64."Tao Bao2015-12-111-10/+12
| | |\ \
| | | * | uncrypt: Suppress the compiler warnings on LP64.Tao Bao2015-12-091-10/+12
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have the following warnings when compiling uncrypt on LP64 (e.g. aosp_angler-userdebug). bootable/recovery/uncrypt/uncrypt.cpp:77:53: warning: format specifies type 'long long' but the argument has type 'off64_t' (aka 'long') [-Wformat] ALOGE("error seeking to offset %lld: %s\n", offset, strerror(errno)); ~~~~ ^~~~~~ %ld bootable/recovery/uncrypt/uncrypt.cpp:84:54: warning: format specifies type 'long long' but the argument has type 'unsigned long' [-Wformat] ALOGE("error writing offset %lld: %s\n", (offset + written), strerror(errno)); ~~~~ ^~~~~~~~~~~~~~~~~~ %lu bootable/recovery/uncrypt/uncrypt.cpp:246:16: warning: comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'off_t' (aka 'long') [-Wsign-compare] while (pos < sb.st_size) { ~~~ ^ ~~~~~~~~~~ According to POSIX spec [1], we have: off_t and blksize_t shall be signed integer types; size_t shall be an unsigned integer type; blksize_t and size_t are no greater than the width of type long. And on Android, we always have a 64-bit st_size from stat(2) (//bionic/libc/include/sys/stat.h). Fix the type and add necessary casts to suppress the warnings. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_types.h.html Change-Id: I5d64d5b7919c541441176c364752de047f9ecb20
* | | | Merge "updater: Output msg when recovery is called" am: 32f6298742Tianjie Xu2015-12-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3e67970c2c * commit '3e67970c2cbbed221f8c33fafa6b2f44a50cacb3': updater: Output msg when recovery is called
| * | | Merge "updater: Output msg when recovery is called"Tianjie Xu2015-12-111-1/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 32f6298742 * commit '32f6298742d5072c4b0d9f1cd09e0d0ae44cb972': updater: Output msg when recovery is called
| | * | Merge "updater: Output msg when recovery is called"Tianjie Xu2015-12-111-1/+4
| | |\ \ | | | |/ | | |/|
| | | * updater: Output msg when recovery is calledTianjie Xu2015-12-111-1/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | Output messages in log when recovery is attempted or succeeded during incremental OTA update. Change-Id: I4033df7ae3aaecbc61921d5337eda26f79164fda (cherry picked from commit b686ba211443490111729ba9d82eb0c0b305e185)
* | | Merge "updater: Output msg when recovery is called"Tianjie Xu2015-12-111-1/+4
|\ \ \
| * | | updater: Output msg when recovery is calledTianjie Xu2015-12-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Output messages in log when recovery is attempted or succeeded during incremental OTA update. Change-Id: I4033df7ae3aaecbc61921d5337eda26f79164fda
* | | | Merge changes If00669a7,Ia5504ed2 am: ddde4676b6Tao Bao2015-12-080-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | am: 50b7cfa5d7 * commit '50b7cfa5d7d9bdd1607c6c4276c63efa9e51e341': update_verifier: Log to logd instead of kernel log. Add update_verifier for A/B OTA update.
| * | | Merge changes If00669a7,Ia5504ed2Tao Bao2015-12-080-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | am: ddde4676b6 * commit 'ddde4676b6c0e175699115a67e44f09a665439b5': update_verifier: Log to logd instead of kernel log. Add update_verifier for A/B OTA update.
| | * | Merge changes If00669a7,Ia5504ed2Tao Bao2015-12-083-0/+105
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: update_verifier: Log to logd instead of kernel log. Add update_verifier for A/B OTA update.
| | | * | update_verifier: Log to logd instead of kernel log.Tao Bao2015-12-082-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logd already gets started before we call update_verifier. Bug: 26039641 Change-Id: If00669a77bf9a6e5534e33f4e50b42eabba2667a (cherry picked from commit 45eac58ef188679f6df2d80efc0391c6d7904cd8)
| | | * | Add update_verifier for A/B OTA update.Tao Bao2015-12-083-0/+109
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_verifier checks the integrity of the updated system and vendor partitions on the first boot post an A/B OTA update. It marks the current slot as having booted successfully if it passes the verification. This CL doesn't perform any actual verification work which will be addressed in follow-up CLs. Bug: 26039641 Change-Id: Ia5504ed25b799b48b5886c2fc68073a360127f42 (cherry picked from commit 1171d3a12b13ca3f1d4301985cf068076e55ae26)
* | | | Merge "updater: Replace strtok() with android::base::Split()." am: d0acbb56edTao Bao2015-12-081-133/+144
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 26edcd8f5a * commit '26edcd8f5a60ad80e98d8d289aa0130ba199c2a4': updater: Replace strtok() with android::base::Split().
| * | | Merge "updater: Replace strtok() with android::base::Split()."Tao Bao2015-12-081-133/+144
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: d0acbb56ed * commit 'd0acbb56ed9c002ccd8021b3e09567647b499e58': updater: Replace strtok() with android::base::Split().
| | * | Merge "updater: Replace strtok() with android::base::Split()."Tao Bao2015-12-081-133/+144
| | |\ \
| | | * | updater: Replace strtok() with android::base::Split().Tao Bao2015-12-071-133/+144
| | |/ / | | | | | | | | | | | | Change-Id: I36346fa199a3261da1ae1bc310b3557fe1716d96
* | | | update_verifier: Log to logd instead of kernel log. am: 45eac58ef1Tao Bao2015-12-082-12/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8162eca526 * commit '8162eca52659307879d086feb195f24d3d58e749': update_verifier: Log to logd instead of kernel log.
| * | | update_verifier: Log to logd instead of kernel log.Tao Bao2015-12-082-12/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 45eac58ef1 * commit '45eac58ef188679f6df2d80efc0391c6d7904cd8': update_verifier: Log to logd instead of kernel log.
| | * | | update_verifier: Log to logd instead of kernel log.Tao Bao2015-12-082-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logd already gets started before we call update_verifier. Bug: 26039641 Change-Id: If00669a77bf9a6e5534e33f4e50b42eabba2667a
* | | | | Add update_verifier for A/B OTA update. am: 1171d3a12bTao Bao2015-12-083-0/+109
|\| | | | | |_|_|/ |/| | | | | | | | | | | | | | | | | | | am: 6bc2155d22 * commit '6bc2155d22d059d4d744e2dcf018190faa33aad3': Add update_verifier for A/B OTA update.
| * | | Add update_verifier for A/B OTA update.Tao Bao2015-12-083-0/+109
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 1171d3a12b * commit '1171d3a12b13ca3f1d4301985cf068076e55ae26': Add update_verifier for A/B OTA update.
| | * | Add update_verifier for A/B OTA update.Tao Bao2015-12-073-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_verifier checks the integrity of the updated system and vendor partitions on the first boot post an A/B OTA update. It marks the current slot as having booted successfully if it passes the verification. This CL doesn't perform any actual verification work which will be addressed in follow-up CLs. Bug: 26039641 Change-Id: Ia5504ed25b799b48b5886c2fc68073a360127f42
* | | | Merge "Track rename from base/ to android-base/." am: 06ca938ce2Elliott Hughes2015-12-057-13/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: ff4c2c07e8 * commit 'ff4c2c07e899ab049c7499f2818cd8a45e0213d3': Track rename from base/ to android-base/.
| * | | Merge "Track rename from base/ to android-base/."Elliott Hughes2015-12-057-13/+13
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | am: 06ca938ce2 * commit '06ca938ce22681455bf75f0b6282b776814df30e': Track rename from base/ to android-base/.
| | * | Merge "Track rename from base/ to android-base/."Elliott Hughes2015-12-057-13/+13
| | |\ \
| | | * | Track rename from base/ to android-base/.Elliott Hughes2015-12-057-13/+13
| | |/ / | | | | | | | | | | | | Change-Id: I354a8c424d340a9abe21fd716a4ee0d3b177d86f
* | | | Merge "Remove the building rules for applypatch_static." am: fc23a50cefTao Bao2015-12-051-13/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0eded2ae7f * commit '0eded2ae7f38aef9ffaff4f41081851aafebb073': Remove the building rules for applypatch_static.
| * | | Merge "Remove the building rules for applypatch_static."Tao Bao2015-12-031-13/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: fc23a50cef * commit 'fc23a50cef6347651b2d25facd53cf6d50cfae67': Remove the building rules for applypatch_static.
| | * | Merge "Remove the building rules for applypatch_static."Tao Bao2015-12-021-13/+0
| | |\ \
| | | * | Remove the building rules for applypatch_static.Tao Bao2015-12-021-13/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CL in [1] has stopped building and packaging the obsolete applypatch_static tool. [1]: commit a04fca31bf1fadcdf982090c942ccbe4d9b95c71 Bug: 24621915 Change-Id: I5e98951ad7ea5c2a7b351af732fd6722763f59bd
* | | | Merge "Track name change from adb_main to adb_server_main." am: ee5c87eea7Elliott Hughes2015-11-202-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: cca6ca0953 * commit 'cca6ca0953b56176ebb406fa89766e326f4d72ac': Track name change from adb_main to adb_server_main.
| * | | Merge "Track name change from adb_main to adb_server_main."Elliott Hughes2015-11-202-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: ee5c87eea7 * commit 'ee5c87eea737e47ab38e19625a32ac2fc0057ddd': Track name change from adb_main to adb_server_main.
| | * | Merge "Track name change from adb_main to adb_server_main."Elliott Hughes2015-11-202-2/+2
| | |\ \
| | | * | Track name change from adb_main to adb_server_main.Elliott Hughes2015-11-202-2/+2
| | |/ / | | | | | | | | | | | | Change-Id: I835805348a9817c81639ad8471e3b49cae93c107
* | | | Add slot_suffix field to struct bootloader_message. am: 846c094feeDavid Zeuthen2015-11-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8f9a1575aa * commit '8f9a1575aaafa9160c247be93eabe3c50933bdeb': Add slot_suffix field to struct bootloader_message.
| * | | Add slot_suffix field to struct bootloader_message.David Zeuthen2015-11-200-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | am: 846c094fee * commit '846c094fee9e50ed2b2e63dee17f5bafb2b9d1ce': Add slot_suffix field to struct bootloader_message.
| | * | Add slot_suffix field to struct bootloader_message.David Zeuthen2015-11-161-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | This is needed by fs_mgr for certain A/B implementations. Change-Id: I7bb404d61198eb7a962c2b693911f5156745daae
* | | | Merge commit \'8f90389966fabf532b24741d49245215279533e1\' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: a550e6b412 * commit 'a550e6b4122108fa2db438afcfd7d40386b71b0b': recovery: Allow "Mount /system" for system_root_image.
| * | | Merge commit '8f90389966fabf532b24741d49245215279533e1' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-190-0/+0
| |\| |
| | * | recovery: Allow "Mount /system" for system_root_image.Tao Bao2015-11-163-19/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When system images contain the root directory, there is no entry of "/system" in the fstab. Change it to look for "/" instead if ro.build.system_root_image is true. We actually mount the partition to /system_root instead, and create a symlink to /system_root/system for /system. This allows "adb shell" to work properly. Bug: 22855115 Change-Id: I91864444950dc3229fda3cc133ddbadeb8817fb8 (cherry picked from commit abb8f7785ee24eac42f6d28dbfef37872a06c7e9)
* | | | Merge commit \'32ac97675bade3681203c46d001f76b11a359fd5\' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 312f7c71f4 * commit '312f7c71f4a71feb0e8c3d202164ddeefa0ec661': applypatch: Fix the checking in WriteToPartition().
| * | | Merge commit '32ac97675bade3681203c46d001f76b11a359fd5' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-190-0/+0
| |\| |
| | * | applypatch: Fix the checking in WriteToPartition().Tao Bao2015-11-161-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WriteToPartition() should consider a target name as valid if it contains multiple colons. But only the first two fields will be used. Bug: 22725128 Change-Id: I9d0236eaf97df9db9704acf53690d0ef85188e45 (cherry picked from commit 1ce7a2a63db84527e6195a6b123b1617f87c0f38)
* | | | Merge commit \'f47259b18492c921445d9e437a9f9ed11c52fac6\' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 681b3c9fd0 * commit '681b3c9fd0ecf378e054e0c039c6085844705a9c': applypatch: Support flash mode.
| * | | Merge commit 'f47259b18492c921445d9e437a9f9ed11c52fac6' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-190-0/+0
| |\| |
| | * | applypatch: Support flash mode.Tao Bao2015-11-163-16/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We may carry a full copy of recovery image in the /system, and use /system/bin/install-recovery.sh to install the recovery. This CL adds support to flash the recovery partition with the given image. Bug: 22641135 Change-Id: I345eaaee269f6443527f45a9be7e4ee47f6b2b39 (cherry picked from commit 68c5a6796737bb583a8bdfa4c9cd9c7f12ef4276)
* | | | Merge commit \'3b199267d6d4c279cbef3286a74e16bf92dd8d8a\' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 06ec3bab56 * commit '06ec3bab56371fee051326cbd5f2b72a53462d29': updater: libapplypatch needs libbase now.
| * | | Merge commit '3b199267d6d4c279cbef3286a74e16bf92dd8d8a' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-190-0/+0
| |\| |
| | * | updater: libapplypatch needs libbase now.Tao Bao2015-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibe3173edd6274b61bd9ca5ec394d7f6b4a403639 (cherry picked from commit 1b1ea17d554d127a970afe1d6004dd4627cd596e)
* | | | Merge commit \'27604fcbee0010b800bfc16b5bf7a48c365c2cf3\' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8b254cfc3c * commit '8b254cfc3ccb67953b62412b0a453f382907b841': applypatch: Refactor strtok().
| * | | Merge commit '27604fcbee0010b800bfc16b5bf7a48c365c2cf3' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-190-0/+0
| |\| |
| | * | applypatch: Refactor strtok().Tao Bao2015-11-162-86/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We have android::base::Split() for the work. Change-Id: Ic529db42090f700e6455d465c8b84b7f52d34d63 (cherry picked from commit 0a47ce27de454e272a883a0c452fad627fd7f419)
* | | | DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp. am: 818fa781d1 -s oursTao Bao2015-11-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: f4848f63ad -s ours * commit 'f4848f63ad6041fcc01ad1f520ccc0ceddd80f61': DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp.
| * | | DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp.Tao Bao2015-11-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 818fa781d1 -s ours * commit '818fa781d1dbe35c0c5bfff3ebff1b45a2a676f0': DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp.
| | * | DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp.Tao Bao2015-11-1615-300/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly trivial changes to make cpp compiler happy. Change-Id: I69bd1d96fcccf506007f6144faf37e11cfba1270 (cherry picked from commit ba9a42aa7e10686de186636fe9fecbf8c4cc7c19)
* | | | Add error and range checks to parse_range am: 806f72f9e6 -s oursSami Tolvanen2015-11-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 81faa274d0 * commit '81faa274d0c3e36eb68b4a436695047949130d70': Add error and range checks to parse_range
| * | | Add error and range checks to parse_rangeSami Tolvanen2015-11-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 806f72f9e6 -s ours * commit '806f72f9e6ec0d15b550b79b0baa92a93fc646e3': Add error and range checks to parse_range
| | * | Add error and range checks to parse_rangeSami Tolvanen2015-11-161-10/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only trusted input is passed to parse_range, but check for invalid input to catch possible problems in transfer lists. Bug: 21033983 Bug: 21034030 Bug: 21034172 Bug: 21034406 Change-Id: I1e266de3de15c99ee596ebdb034419fdfe7eba1f (cherry picked from commit f2bac04e1ba0a5b79f8adbc35b493923b776f8b2)
* | | | Stop using libstdc++. am: 56deefba73 -s oursDan Albert2015-11-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 34a265cbac * commit '34a265cbacc3d365cca4aaa7edbe738ef3e904d6': Stop using libstdc++.
| * | | Stop using libstdc++.Dan Albert2015-11-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 56deefba73 -s ours * commit '56deefba73fb318ba0498da49adc64de960a6e29': Stop using libstdc++.
| | * | Stop using libstdc++.Dan Albert2015-11-163-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are already getting libc++, so it isn't necessary. If any of the other static libraries (such as adb) use new or delete from libc++, there will be symbol collisions. Change-Id: I55e43ec60006d3c2403122fa1174bde06f18e09f (cherry picked from commit e49a9e527a51f43db792263bb60bfc91293848da)
* | | | recovery: Switch to clang am: 7101b2e285 -s oursTao Bao2015-11-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 29cc06e50c * commit '29cc06e50c3702e1835c1af911f5d2c69699e1c7': recovery: Switch to clang
| * | | recovery: Switch to clangTao Bao2015-11-190-0/+0
| |\| | | | |/ | |/| | | | | | | | | | | | | am: 7101b2e285 -s ours * commit '7101b2e2854985727b7ef65e5b5057e0ecf2d034': recovery: Switch to clang
| | * recovery: Switch to clangTao Bao2015-11-1613-11/+38
| | | | | | | | | | | | | | | | | | | | | And a few trival fixes to suppress warnings. Change-Id: Id28e3581aaca4bda59826afa80c0c1cdfb0442fc (cherry picked from commit 80e46e08de5f65702fa7f7cd3ef83f905d919bbc)
* | | Merge "Create convert_fbe breadcrumb file to support conversion to FBE"Paul Lawrence2015-11-133-3/+35
|\ \ \
| * | | Create convert_fbe breadcrumb file to support conversion to FBEPaul Lawrence2015-11-133-3/+35
| | | | | | | | | | | | | | | | Change-Id: I38b29e1e34ea793e4b87cd27a1d39fa905fddf7a
* | | | Merge "We can use fclose directly in std::unique_ptr."Elliott Hughes2015-11-132-16/+5
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | am: 5c6912148b * commit '5c6912148b2143cbdf4cc580c723fac05e9324f8': We can use fclose directly in std::unique_ptr.
| * | Merge "We can use fclose directly in std::unique_ptr."Elliott Hughes2015-11-132-16/+5
| |\ \
| | * | We can use fclose directly in std::unique_ptr.Elliott Hughes2015-11-132-16/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | It turns out the standard explicitly states that if the pointer is null, the deleter function won't be called. So it doesn't matter that fclose(3) doesn't accept null. Change-Id: I10e6e0d62209ec03ac60e673edd46f32ba279a04
* | | Merge "uncrypt: remove O_SYNC to avoid time-out failures"Tao Bao2015-11-051-1/+1
|\| | | | | | | | | | | | | | | | | | | | am: e4a3da9f51 * commit 'e4a3da9f51ca1e02179a1e0851f26015f4ec07fa': uncrypt: remove O_SYNC to avoid time-out failures
| * | Merge "uncrypt: remove O_SYNC to avoid time-out failures"Tao Bao2015-11-051-1/+1
| |\ \
| | * | uncrypt: remove O_SYNC to avoid time-out failuresJaegeuk Kim2015-11-041-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes costly O_SYNC flag for encrypted block device. After writing whole decrypted blocks, fsync should guarantee their consistency from further power failures. This patch reduces the elapsed time significantly consumed by upgrading packages on an encrypted partition, so that it could avoid another time-out failures too. Change-Id: I1fb9022c83ecc00bad09d107fc87a6a09babb0ec Signed-off-by: Jaegeuk Kim <jaegeuk@motorola.com>
* | | Merge "recovery: Depend on mkfs.f2fs only if needed." am: a412198699Tao Bao2015-10-281-0/+2
|\| | | | | | | | | | | | | | | | | | | | am: 4ea2b0c4ac * commit '4ea2b0c4acddb4509c741ba0390be7b39e0b9de1': recovery: Depend on mkfs.f2fs only if needed.
| * | Merge "recovery: Depend on mkfs.f2fs only if needed."Tao Bao2015-10-281-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | am: a412198699 * commit 'a4121986990d7dde7918252a96d87e4c3c11c13c': recovery: Depend on mkfs.f2fs only if needed.
| | * \ Merge "recovery: Depend on mkfs.f2fs only if needed."Tao Bao2015-10-281-0/+2
| | |\ \
| | | * | recovery: Depend on mkfs.f2fs only if needed.Tao Bao2015-10-281-0/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | Don't build mkfs.f2fs unless device defines TARGET_USERIMAGES_USE_F2FS. Change-Id: Ifac592c30315bbe7590c8fbf3a0844e6a7a31a1a
* | | | Merge "updater: Bump up the BBOTA version to 4." am: f204185f71Tao Bao2015-10-231-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: cc9dd3d524 * commit 'cc9dd3d524755da156ec95ed3a91bcf7966e7e7e': updater: Bump up the BBOTA version to 4.
| * | | Merge "updater: Bump up the BBOTA version to 4."Tao Bao2015-10-231-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: f204185f71 * commit 'f204185f7138687769f95c28fe22fa88143bc004': updater: Bump up the BBOTA version to 4.
| | * | Merge "updater: Bump up the BBOTA version to 4."Tao Bao2015-10-231-1/+1
| | |\ \
| | | * | updater: Bump up the BBOTA version to 4.Tao Bao2015-10-231-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To accommodate new changes in N release, such as error correction [1] and other potential changes to the updater. [1]: commit 0a7b47397db3648afe6f3aeb2abb175934c2cbca Change-Id: I4dd44417d07dd0a31729894628635a0aa1659008
* | | | am 339ec2ef: am 78615fa5: Merge "Error correction: Use libfec in blockimg.cpp for recovery"Sami Tolvanen2015-10-192-1/+78
|\| | | | | | | | | | | | | | | | | | | * commit '339ec2ef02614f17823f9b00af8b35c1f8ee734c': Error correction: Use libfec in blockimg.cpp for recovery
| * | | am 78615fa5: Merge "Error correction: Use libfec in blockimg.cpp for recovery"Sami Tolvanen2015-10-192-1/+78
| |\| | | | | | | | | | | | | | | | | | * commit '78615fa50bb10318035d31bccdf502913e1041b7': Error correction: Use libfec in blockimg.cpp for recovery
| | * | Merge "Error correction: Use libfec in blockimg.cpp for recovery"Sami Tolvanen2015-10-192-1/+78
| | |\ \
| | | * | Error correction: Use libfec in blockimg.cpp for recoverySami Tolvanen2015-10-192-1/+78
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add block_image_recover function to rewrite corrupted blocks on the partition. This can be attempted if block_image_verify fails. Note that we cannot use libfec during block_image_update as it may overwrite blocks required for error correction. A separate recovery pass in case the image is corrupted is the only viable option. Bug: 21893453 Change-Id: I6ff25648fff68d5f50b41a601c95c509d1cc5bce
* | | | am 4c6c96a5: am 245b2da1: am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file."Tao Bao2015-10-011-0/+4
|\| | | | | | | | | | | | | | | | | | | * commit '4c6c96a59566e8e876cc803be84c16d3f04f31d4': updater: Skip empty lines in the transfer list file.
| * | | am 245b2da1: am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file."Tao Bao2015-10-011-0/+4
| |\| | | | | | | | | | | | | | | | | | * commit '245b2da1711db8a9b8e333395d68235df5163483': updater: Skip empty lines in the transfer list file.
| | * | am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file."Tao Bao2015-10-011-0/+4
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '754ebaa90a3e11012e2456013e69b34a30272c4a': updater: Skip empty lines in the transfer list file.
| | | * \ Merge "updater: Skip empty lines in the transfer list file."Tao Bao2015-10-011-0/+4
| | | |\ \
| | | | * | updater: Skip empty lines in the transfer list file.Tao Bao2015-09-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have the last line being empty as a result of android::base::Split("a\nb\n"), which leads to "missing command" warnings in the update. Just skip all the empty lines. Bug: 24373789 Change-Id: I5827e4600bd5cf0418d95477e4592fec47bbd3a9
* | | | | | am 6eb2668d: am aa59a989: am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread."Yabin Cui2015-09-301-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6eb2668de1afca57b7c64532f98f84b7fcec1f60': minadbd: use strdup() to create argument for sideload thread.
| * | | | | am aa59a989: am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread."Yabin Cui2015-09-301-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa59a9898824c39cad3f1a1dde5fc4c8ceeabb40': minadbd: use strdup() to create argument for sideload thread.
| | * | | | am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread."Yabin Cui2015-09-301-2/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b66a280d314ab5aeb5027fe5b0023ae1f25ecca': minadbd: use strdup() to create argument for sideload thread.
| | | * | | Merge "minadbd: use strdup() to create argument for sideload thread."Yabin Cui2015-09-301-2/+4
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | minadbd: use strdup() to create argument for sideload thread.Yabin Cui2015-09-301-2/+4
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So sideload thread will not use argument which is to be freed in the main thread. Bug: 23968770 Change-Id: I9d6dadc6c33cfbe4b5759382a80fe14cd0d54355
* | | | | am d7156748: am f61eec3e: am 2bdac629: Merge changes Ic769eafc,I63f28b3bTao Bao2015-09-253-57/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd715674899b9026ce5f5c653dc218fc7b67f9c7b': updater: Use android::base::ParseInt() to parse integers. Suppress some compiler warnings due to signedness.
| * | | | am f61eec3e: am 2bdac629: Merge changes Ic769eafc,I63f28b3bTao Bao2015-09-253-57/+42
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f61eec3e2db4e0e9bfa37cff23e5e05c92384e83': updater: Use android::base::ParseInt() to parse integers. Suppress some compiler warnings due to signedness.
| | * | | am 2bdac629: Merge changes Ic769eafc,I63f28b3bTao Bao2015-09-253-57/+42
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2bdac629f1d109dc79370edec8a31e20fbbe384c': updater: Use android::base::ParseInt() to parse integers. Suppress some compiler warnings due to signedness.
| | | * | Merge changes Ic769eafc,I63f28b3bTao Bao2015-09-253-57/+42
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: updater: Use android::base::ParseInt() to parse integers. Suppress some compiler warnings due to signedness.
| | | | * | updater: Use android::base::ParseInt() to parse integers.Tao Bao2015-09-242-52/+37
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic769eafc8d9535b1d517d3dcbd398c3fd65cddd9
| | | | * | Suppress some compiler warnings due to signedness.Tao Bao2015-09-242-5/+5
| | | |/ / | | | | | | | | | | | | | | | Change-Id: I63f28b3b4ba4185c23b972fc8f93517295b1672a
* | | | | am 7c7d876d: am f7319f4d: am 3317d501: Merge "minadbd: move from D() to VLOG()."Yabin Cui2015-09-242-5/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '7c7d876d152e27a5b15617f9e907e18314f08fa5': minadbd: move from D() to VLOG().
| * | | | am f7319f4d: am 3317d501: Merge "minadbd: move from D() to VLOG()."Yabin Cui2015-09-242-5/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f7319f4dbd04f72a53f5ad313794ade240530406': minadbd: move from D() to VLOG().
| | * | | am 3317d501: Merge "minadbd: move from D() to VLOG()."Yabin Cui2015-09-242-5/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '3317d5017963684cdbf4573d6cc6c0ff4cee0869': minadbd: move from D() to VLOG().
| | | * | Merge "minadbd: move from D() to VLOG()."Yabin Cui2015-09-242-5/+2
| | | |\ \
| | | | * | minadbd: move from D() to VLOG().Yabin Cui2015-09-242-5/+2
| | | |/ / | | | | | | | | | | | | | | | Change-Id: I542e2ae8f5ef18b2d6b3dbc1888b3ce1e02a7404
* | | | | am c66b9ead: am cd3c8c4e: am b739a32b: Merge "recovery: Add timestamps in update logs."Tao Bao2015-09-181-16/+98
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'c66b9ead27cdcdd94184a7c16e13369d4e62eb4d': recovery: Add timestamps in update logs.
| * | | | am cd3c8c4e: am b739a32b: Merge "recovery: Add timestamps in update logs."Tao Bao2015-09-181-16/+98
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'cd3c8c4eacbab792e2144b4b71ace63100ff792a': recovery: Add timestamps in update logs.
| | * | | am b739a32b: Merge "recovery: Add timestamps in update logs."Tao Bao2015-09-181-16/+98
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit 'b739a32b7c32279da4d5ac55601f06bc5c81f1d5': recovery: Add timestamps in update logs.
| | | * | Merge "recovery: Add timestamps in update logs."Tao Bao2015-09-181-16/+98
| | | |\ \
| | | | * | recovery: Add timestamps in update logs.Tao Bao2015-09-171-16/+98
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fork a logger process and send over the log lines through a pipe. Prepend a timestamp to each line for debugging purpose. Timestamps are relative to the start of the logger. Example lines with the change in this CL: [ 445.948393] Verifying update package... [ 446.279139] I:comment is 1738 bytes; signature 1720 bytes from end [ 449.463652] I:whole-file signature verified against RSA key 0 [ 449.463704] I:verify_file returned 0 Change-Id: I139d02ed8f2e944c1618c91d5cc43282efd50b99
* | | | | am 53cfad08: (-s ours) am cde72079: am 838768ca: am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '53cfad08cef87b7e81c664384ce971bc3df829df': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| * | | | am cde72079: am 838768ca: am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-170-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit 'cde720797f55ca3ca1bfc82b7b928447c37e7656': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | * | | am 838768ca: am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-170-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '838768ca57d087025dbd31587ee895150bca9e10': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | | * \ \ am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-170-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15da523e5fe7dbdc3a8d49c809042bc760081920': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | | | * \ \ am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-170-0/+0
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c7f655bf0382776617d3c98293e28d9967c9a96': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | | | | * \ \ am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-170-0/+0
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e804d542a2c151d254cad0d8581d9709a394a9a': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | | | | | * \ \ am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-170-0/+0
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd396b9dbd99924f7c8687227b22220a87c85d9c7': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | | | | | | * \ \ am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-120-0/+0
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '710b6bb9d7d36ce16453850efc3112016a77e9ff': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | | | | | | | * \ \ am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-100-0/+0
| | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec4b58ad8a21b511bf6b136792bb924eb6e9e299': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | | | | | | | | * \ \ am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-101-0/+1
| | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec63d564a86ad5b30f75aa307b4bd271f6a96a56': Track usage of Vector / SortedVector from libutils DO NOT MERGE
| | | | | | | | | | * | | Track usage of Vector / SortedVector from libutils DO NOT MERGENarayan Kamath2015-09-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 22953624 Change-Id: Ifcc17e39433ac91ca41da5d336fb3006dfbb65a8
* | | | | | | | | | | | | am 6e9f726f: am f66e08a2: am a42a322d: Merge "updater: Manage buffers with std::vector."Tao Bao2015-09-161-228/+168
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e9f726f8e897ec39320ebf099b4662788bb59a1': updater: Manage buffers with std::vector.
| * | | | | | | | | | | | am f66e08a2: am a42a322d: Merge "updater: Manage buffers with std::vector."Tao Bao2015-09-161-228/+168
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f66e08a2a0c4bcc3f0447aac318e71b829e2743b': updater: Manage buffers with std::vector.
| | * | | | | | | | | | | am a42a322d: Merge "updater: Manage buffers with std::vector."Tao Bao2015-09-161-228/+168
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a42a322d8f6de0157625b518d12d1919f1e0dd7e': updater: Manage buffers with std::vector.
| | | * | | | | | | | | | Merge "updater: Manage buffers with std::vector."Tao Bao2015-09-161-228/+168
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | updater: Manage buffers with std::vector.Tao Bao2015-09-101-228/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ide489e18dd8daf161b612f65b28921b61cdd8d8d
* | | | | | | | | | | | | | am cd3a68ce: am 49a49e4f: am ee17242f: Merge "minadbd: update service_to_fd() signature."David Pursell2015-09-141-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd3a68ce371fd446b0b5d8dde4f4a262be1e1fe9': minadbd: update service_to_fd() signature.
| * | | | | | | | | | | | | am 49a49e4f: am ee17242f: Merge "minadbd: update service_to_fd() signature."David Pursell2015-09-141-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '49a49e4f0659696b71c0ec2d32a0ac4948c5d977': minadbd: update service_to_fd() signature.
| | * | | | | | | | | | | | am ee17242f: Merge "minadbd: update service_to_fd() signature."David Pursell2015-09-141-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ee17242f904730c759272b2576aafc59d764525b': minadbd: update service_to_fd() signature.
| | | * | | | | | | | | | | Merge "minadbd: update service_to_fd() signature."David Pursell2015-09-141-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | minadbd: update service_to_fd() signature.David Pursell2015-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional change, just matching the signature to an adb change. See https://android-review.googlesource.com/#/c/169601/. Change-Id: Ic826864e126054849b3a4d193ded8acc5ee5269c
* | | | | | | | | | | | | | | am 8b2dcfb1: am 60524198: am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."Tao Bao2015-09-122-4/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b2dcfb1049ddc2ff6111c4faa81ae20c6545285': recovery: Remove redirect_stdio() when calling ShowFile().
| * | | | | | | | | | | | | | am 60524198: am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."Tao Bao2015-09-122-4/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '605241984cc41f62e2f2e005865d7afed504a972': recovery: Remove redirect_stdio() when calling ShowFile().
| | * | | | | | | | | | | | | am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."Tao Bao2015-09-122-4/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b83fd518262853d42b5a73a61ec6fdfafe0f5564': recovery: Remove redirect_stdio() when calling ShowFile().
| | | * | | | | | | | | | | | Merge "recovery: Remove redirect_stdio() when calling ShowFile()."Tao Bao2015-09-122-4/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | recovery: Remove redirect_stdio() when calling ShowFile().Tao Bao2015-09-102-4/+1
| | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling ScreenRecoveryUI::ShowFile(), the only thing that gets inadequately logged is the progress bar. Replace the call to ScreenRecoveryUI::Print() with ScreenRecoveryUI::PrintOnScreenOnly() for the progress bar, so we can avoid calling redirect_stdio(). Change-Id: I4d7c5d5b39bebe0d5880a99d7a72cee4f0b8f325
* | | | | | | | | | | | | | | am 7c3d09c2: am 0cf19d9b: am 7a677807: Merge "updater: Fix the line breaks in ui_print commands."Tao Bao2015-09-101-26/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c3d09c2f3524e546989125d75f7944f280fc6fe': updater: Fix the line breaks in ui_print commands.
| * | | | | | | | | | | | | | am 0cf19d9b: am 7a677807: Merge "updater: Fix the line breaks in ui_print commands."Tao Bao2015-09-101-26/+32
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0cf19d9ba10c325af928e44d2c11bc74daa39a7c': updater: Fix the line breaks in ui_print commands.
| | * | | | | | | | | | | | | am 7a677807: Merge "updater: Fix the line breaks in ui_print commands."Tao Bao2015-09-101-26/+32
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7a6778078b2525c245869061366eb1f92942542a': updater: Fix the line breaks in ui_print commands.
| | | * | | | | | | | | | | | Merge "updater: Fix the line breaks in ui_print commands."Tao Bao2015-09-101-26/+32
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | updater: Fix the line breaks in ui_print commands.Tao Bao2015-09-101-26/+32
| | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When processing ui_print commands in the updater, it misses a line break when printing to the recovery log. Also clean up uiPrintf() and UIPrintFn() with std::string's. Change-Id: Ie5dbbfbc40b024929887d3c3ccd3a334249a8c9d
* | | | | | | | | | | | | | am 272d268c: am 50828f58: am e520f1d4: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."Tao Bao2015-09-091-29/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '272d268c17a181b4b20ea8c6101e6450511ce786': updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.
| * | | | | | | | | | | | | am 50828f58: am e520f1d4: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."Tao Bao2015-09-091-29/+26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '50828f58caf1ee8f905c67f85c4dccd4a4f3304b': updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.
| | * | | | | | | | | | | | am e520f1d4: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."Tao Bao2015-09-091-29/+26
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e520f1d4cddeca4208ccc385313d900581ff117c': updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.
| | | * | | | | | | | | | | Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."Tao Bao2015-09-091-29/+26
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.Tao Bao2015-09-081-29/+26
| | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And inline the call to LoadSrcTgtVersion1() into SaveStash(). Change-Id: Ibf4ef2bfa2cc62df59c4e8de99fd7d8039e71ecf
* | | | | | | | | | | | | | am d4547c1d: am e5571a0f: am 585a50ce: Merge "imgdiff: fix file descriptor leak"Tao Bao2015-09-081-1/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4547c1ddaf6ac4b13e9a160582f6baba44860b6': imgdiff: fix file descriptor leak
| * | | | | | | | | | | | | am e5571a0f: am 585a50ce: Merge "imgdiff: fix file descriptor leak"Tao Bao2015-09-081-1/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e5571a0ff8217a6fe1b3defdb22295596e36c280': imgdiff: fix file descriptor leak
| | * | | | | | | | | | | | am 585a50ce: Merge "imgdiff: fix file descriptor leak"Tao Bao2015-09-081-1/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '585a50cecbccf59666dd65e9fc4320eaa3511634': imgdiff: fix file descriptor leak
| | | * | | | | | | | | | | Merge "imgdiff: fix file descriptor leak"Tao Bao2015-09-081-1/+9
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | imgdiff: fix file descriptor leakJeremy Compostella2015-09-081-1/+9
| | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mkstemp() allocates a file description that is never released. If MakePatch() is called too many time, imgdiff reaches the Operating System EMFILE (too many open files) limit. Change-Id: Icbe1399f6f6d32cfa1830f879cacf7d75bbd9fc3 Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com> Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
* | | | | | | | | | | | | | am 1e8e6a83: am cf11a160: am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc"Tom Cherry2015-09-042-0/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1e8e6a839438a345a9054319d8efda6c95236557': move uncrypt from init.rc to uncrypt.rc
| * | | | | | | | | | | | | am cf11a160: am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc"Tom Cherry2015-09-042-0/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cf11a1601522c669c6df2095d71601546cc7fc7f': move uncrypt from init.rc to uncrypt.rc
| | * | | | | | | | | | | | am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc"Tom Cherry2015-09-042-0/+11
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f8c303f9c197ed9247dbc88a5bf392f1f2c65639': move uncrypt from init.rc to uncrypt.rc
| | | * | | | | | | | | | | Merge "move uncrypt from init.rc to uncrypt.rc"Tom Cherry2015-09-042-0/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | move uncrypt from init.rc to uncrypt.rcTom Cherry2015-09-042-0/+11
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move uncrypt from /init.rc to /system/etc/init/uncrypt.rc using the LOCAL_INIT_RC mechanism Bug 23186545 Change-Id: Ib8cb6dffd2212f524298279787fd557bc84aa7b9
* | | | | | | | | | | | | am 834c92b7: am 8e9c6801: recovery: Fix the bug that truncates menu entries.Tao Bao2015-09-031-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '834c92b7b145b0ae1800f869170e9ae6d2834fef': recovery: Fix the bug that truncates menu entries.
| * | | | | | | | | | | | am 8e9c6801: recovery: Fix the bug that truncates menu entries.Tao Bao2015-09-031-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8e9c68019f9c284b89155c71922ad8ac84af6ab6': recovery: Fix the bug that truncates menu entries.
| | * | | | | | | | | | | recovery: Fix the bug that truncates menu entries.Tao Bao2015-09-021-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are 20 entries (like 10 last_log* and 10 last_kmg* in "view recovery logs"), there's no "Back" entry. Because the number of entries (21) exceeds text_rows (20) in WearRecoveryUI::StartMenu(). Since we have scrollable menu, having more entries than text_rows won't be an issue. Bug: 23752519 Change-Id: I12573d7a34852a1a3d130c9e88522cee737eb08f
* | | | | | | | | | | | | am ceb81e49: am 1b3195cb: am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message."David Zeuthen2015-09-031-1/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ceb81e4931a307c8c907d0063ab2a8f53445d2c9': Add slot_suffix field to struct bootloader_message.
| * | | | | | | | | | | | am 1b3195cb: am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message."David Zeuthen2015-09-031-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b3195cb917dcaff5d563d3e17e497b855442461': Add slot_suffix field to struct bootloader_message.
| | * | | | | | | | | | | am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message."David Zeuthen2015-09-031-1/+9
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4c223f4e396e1b66a945601561fce4cd63fc31ae': Add slot_suffix field to struct bootloader_message.
| | | * | | | | | | | | | Merge "Add slot_suffix field to struct bootloader_message."David Zeuthen2015-09-031-1/+9
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Add slot_suffix field to struct bootloader_message.David Zeuthen2015-09-021-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed by fs_mgr for certain A/B implementations. Change-Id: I7bb404d61198eb7a962c2b693911f5156745daae
* | | | | | | | | | | | | | am 31dde162: am 6f1f2062: am 6997c287: Merge "updater: Clean up C codes."Tao Bao2015-09-031-602/+429
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31dde162b6e27d99270b0a0e9b5aa82c527c67a2': updater: Clean up C codes.
| * | | | | | | | | | | | | am 6f1f2062: am 6997c287: Merge "updater: Clean up C codes."Tao Bao2015-09-031-602/+429
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f1f20622e269a4118e73c8da71a235b01924fee': updater: Clean up C codes.
| | * | | | | | | | | | | | am 6997c287: Merge "updater: Clean up C codes."Tao Bao2015-09-031-602/+429
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6997c287bedbd32fb5ffb84fc2efd081e6f56d3e': updater: Clean up C codes.
| | | * | | | | | | | | | | Merge "updater: Clean up C codes."Tao Bao2015-09-021-602/+429
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | updater: Clean up C codes.Tao Bao2015-09-011-602/+429
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace C-string with std::string, pointers with references, and variable-size arrays in struct with std::vector. Change-Id: I57f361a0e58286cbcd113e9be225981da56721b2
* | | | | | | | | | | | | am d845a2d1: am 73468ee8: (-s ours) am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd845a2d1ea4e2ce17d8f788d5ae33bab2bb82dd2':
| * | | | | | | | | | | | am 73468ee8: (-s ours) am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '73468ee8fb5b152b3c8be19ade89e9a31d733316':
| | * | | | | | | | | | | am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."Tao Bao2015-08-261-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5': updater: Remove the unused isunresumable in SaveStash().
* | | | | | | | | | | | | | am 5e3a40f9: am 304c65b8: (-s ours) am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e3a40f934ca7d435496dfacf00b7909d3b3d98d':
| * | | | | | | | | | | | | am 304c65b8: (-s ours) am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '304c65b8fc2e80c0337454320f23582e357bca1c':
| | * | | | | | | | | | | | am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"Tao Bao2015-08-261-46/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dc61d17d5b3c9e85a2863ec461170263325f1466': GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
* | | | | | | | | | | | | | | am 1a42ebc1: am 822685a8: (-s ours) am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a42ebc16e68d18394f613145aca7d8fd88f2588':
| * | | | | | | | | | | | | | am 822685a8: (-s ours) am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '822685a8648e91aca6ce35992087c18165d4d609':
| | * | | | | | | | | | | | | am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."Tao Bao2015-08-215-37/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dbbdcf3fd817128f89474f9ea8c84743fc648a1a': edify: Switch to C++.
* | | | | | | | | | | | | | | | am b13fe892: am a9a50fef: (-s ours) am 4854e292: am ad509fd4: Merge "Fix potential crash"Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b13fe892d82a2ccde3e338c426b6cf70aea1e564':
| * | | | | | | | | | | | | | | am a9a50fef: (-s ours) am 4854e292: am ad509fd4: Merge "Fix potential crash"Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a9a50fef97d388ef5fb06a5953caaa79ab16496d':
| | * | | | | | | | | | | | | | am 4854e292: am ad509fd4: Merge "Fix potential crash"Tao Bao2015-08-111-5/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4854e292e0cd0eb58bce4488dc849273904d9302': Fix potential crash
* | | | | | | | | | | | | | | | | am dffdd5eb: am 06e6ccb9: (-s ours) am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dffdd5eb6d366b2f35ec87f20f91207e3b4657c3':
| * | | | | | | | | | | | | | | | am 06e6ccb9: (-s ours) am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '06e6ccb98ab7b557e98a41af562ca515714e776a':
| | * | | | | | | | | | | | | | | am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."Tao Bao2015-08-103-16/+91
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '434a1761aac48b8e3c13d5a6cb3edd90c8667f6f': Use unique_ptr and unique_fd to manager FDs.
* | | | | | | | | | | | | | | | | | am 85afda17: am b65a9023: (-s ours) am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85afda17522e25637bab37bdff1c5ea56b7c7a51':
| * | | | | | | | | | | | | | | | | am b65a9023: (-s ours) am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b65a90235e7d4fc3a2dbf68bb73ac323a88f1abc':
| | * | | | | | | | | | | | | | | | am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."Tao Bao2015-08-105-288/+185
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f89389a0b55d13ee1c9026c33f17dc1cc9c7ace': updater: Clean up char* with std::string.
* | | | | | | | | | | | | | | | | | | am 85a77d2a: am c2e91625: (-s ours) am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."Dan Albert2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85a77d2abef598099b1f64b9efd1af481f2f62fd':
| * | | | | | | | | | | | | | | | | | am c2e91625: (-s ours) am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."Dan Albert2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c2e91625a7333ae993bab4c7069f25c2e9ecc8d3':
| | * | | | | | | | | | | | | | | | | am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."Dan Albert2015-08-081-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '236b3eb6a085bd0762849b5feca880f6dc63787d': Use CPPFLAGS instead of CFLAGS.
* | | | | | | | | | | | | | | | | | | | am 34fa6d38: am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build."Elliott Hughes2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '34fa6d3891aceef6af910f114310cec17e13b372':
| * | | | | | | | | | | | | | | | | | | am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build."Elliott Hughes2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8fa0007a3eb59174f7c2fbf40a2a972dfb344531':
| | * | | | | | | | | | | | | | | | | | am a9390df6: am 06689dc5: Merge "Fix recovery image build."Elliott Hughes2015-08-072-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a9390df6c6b8d6cc98b102aeffc8e7acd300c857': Fix recovery image build.
* | | | | | | | | | | | | | | | | | | | | am 371ab905: am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aospTao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '371ab9058e923679e7dd451bc8351e6e0ce0c3b0':
| * | | | | | | | | | | | | | | | | | | | am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aospTao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7daa48e62fa0ba002cffeddf8d520426a52d69a7':
| | * | | | | | | | | | | | | | | | | | | resolved conflicts for merge of be19dce8 to mnc-dev-plus-aospTao Bao2015-08-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic11b543d45f565ffb5a1f2b7b06e953f0235bfb3
* | | | | | | | | | | | | | | | | | | | | am ea5d8f0a: am 0e2efab3: (-s ours) am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea5d8f0affc1170fc9bd6ff05a00adca712f18d6':
| * | | | | | | | | | | | | | | | | | | | am 0e2efab3: (-s ours) am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e2efab34546e1678855c979f06f0f56f4f38eb0':
| | * | | | | | | | | | | | | | | | | | | am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."Tao Bao2015-08-041-0/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '393d1e739fc10e526bd3b7b83836a266bfa24079': udpater: Call fsync() after rename().
* | | | | | | | | | | | | | | | | | | | | | am 3fd097f8: am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3fd097f8a81b57046f7200f659211971025ad7bf':
| * | | | | | | | | | | | | | | | | | | | | am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '854ae7f9ba8981e0122549dceae9b371ad4f7be1':
| | * | | | | | | | | | | | | | | | | | | | am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."Tao Bao2015-07-313-19/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2e979ef6fd21e1681a8ec7ca2f5582ca8e14ddcd': recovery: Allow "Mount /system" for system_root_image.
* | | | | | | | | | | | | | | | | | | | | | | am 77de4783: am f3f27990: (-s ours) am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '77de478325225ae1adf8e669adff5cd5052cbea8':
| * | | | | | | | | | | | | | | | | | | | | | am f3f27990: (-s ours) am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f3f27990f23a338c02a52bea713bf391e7994028':
| | * | | | | | | | | | | | | | | | | | | | | am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."Tao Bao2015-07-281-6/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7666f65b2a1e4352c52df9fe7a0b26ce923a1477': updater: Hoist fsync() to outer loop.
* | | | | | | | | | | | | | | | | | | | | | | | am 05c4b53e: am cb0e7f2d: (-s ours) am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '05c4b53eb53c069ebb2433947193f7d613e4ff04':
| * | | | | | | | | | | | | | | | | | | | | | | am cb0e7f2d: (-s ours) am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb0e7f2da04b7dcaef50ec7a942cd5b5e64b4823':
| | * | | | | | | | | | | | | | | | | | | | | | am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."Tao Bao2015-07-251-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0622ccb34d504170b76b8f4dd5f0639794be679a': applypatch: Fix the checking in WriteToPartition().
* | | | | | | | | | | | | | | | | | | | | | | | | am f6bebbd7: am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6bebbd72cf25acc65373cf26c3eac7d4b6bf686':
| * | | | | | | | | | | | | | | | | | | | | | | | am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '33185233541dda72af3fd8a1fc1786251c88e122':
| | * | | | | | | | | | | | | | | | | | | | | | | am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."Tao Bao2015-07-243-16/+97
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b753ad5da2ade45548f95b4a76219db3043db49': applypatch: Support flash mode.
* | | | | | | | | | | | | | | | | | | | | | | | | | am d37f91d1: am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd37f91d18da6e87eb3f2d11dd1cd1645e255cd38':
| * | | | | | | | | | | | | | | | | | | | | | | | | am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f0654b4414c750703f50d4e84319d31d57e86284':
| | * | | | | | | | | | | | | | | | | | | | | | | | am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."Tao Bao2015-07-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c69095d8cd9685f9d9c7e3863a5e087efeadba3a': uncrypt: Support file level encryption.
* | | | | | | | | | | | | | | | | | | | | | | | | | | am c73e18f0: am 7665d443: (-s ours) am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c73e18f0a433268300cfaa767b06424df71ff63b':
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 7665d443: (-s ours) am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7665d443e2e3de775661068c29df38581476cc71':
| | * | | | | | | | | | | | | | | | | | | | | | | | | am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."Tao Bao2015-07-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '87f2c673dfbc310d1a80ea1c3b00d9e1adb1947f': updater: libapplypatch needs libbase now.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am f075f9a1: am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f075f9a17ab01fa13a651c675aed2837a8bf3191':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5040636abd451e4e45227493f328f1cda39a5177':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."Tao Bao2015-07-242-86/+56
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1dc71bec8d3dc3c1eb7eb40aed2eeb04b47f75ce': applypatch: Refactor strtok().
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ca66fc1c: am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ca66fc1cb204dfe9e9b8c8eaad5be95a78207212':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '596219d9c2ea760a473c9f90bfa0317c326913af':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."Tao Bao2015-07-245-29/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b91e700544e0fca378a7fb5f8c807842bb284986': recovery: Switch fuse_* to C++.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d33e21a7: am 0e7368a5: (-s ours) am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd33e21a7ae7b37590ad41fac56f87141c597616c':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0e7368a5: (-s ours) am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e7368a505f647a07cf3b6b93622b48ef27c3f45':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."Tao Bao2015-07-173-20/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '328cb8cb5a434ba9d897443a408d11e8ee8c64a0': Clean up LOG functions.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 9da33c67: am 3231c7ca: (-s ours) am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9da33c67655c5d113f75a1f493b51cfee86d298c':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3231c7ca: (-s ours) am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."Tao Bao2015-07-1515-300/+304
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '307eecfdc7dc73ce8f53f742e3c468e63b42f0e2': recovery: Switch applypatch/ and updater/ to cpp.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f0e341b4: am 5391dfdb: (-s ours) am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f0e341b44949564de0d33361c1284b8aff19a8bd':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5391dfdb: (-s ours) am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5391dfdb35221f782a4d0da29e31f4725dc507d3':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""Tao Bao2015-07-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2853e27472728d3a24293ab4bfc445c74be6a15': Revert "Zero blocks before BLKDISCARD"
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3ac4765a: am 1915dd56: (-s ours) am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-devPaul Lawrence2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3ac4765a14334f0aa574b5cffb5349cc1c214cfe':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1915dd56: (-s ours) am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-devPaul Lawrence2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1915dd56e3cdc73d4d83453971486b64880e4603':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-devPaul Lawrence2015-07-071-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '10cf0942a7f4b2bfd539416e4767aaaf866a6527': Revert "Change init sequence to support file level encryption"
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b3f4921c: am 2fc4d435: (-s ours) am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"Tao Bao2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3f4921c67bdc3260bfd6274c2ab53d10b53a9c2':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2fc4d435: (-s ours) am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"Tao Bao2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2fc4d4359b268cbf3d0f73d670a219f12d440e86':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"Tao Bao2015-07-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4e6507f32817e2943b1f27d12f56b485993c2a44': Allow mounting squashfs partitions
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 04d9b850: am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-devPaul Lawrence2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '04d9b8501a58de6ee7c5aa3635673150bf88cb06':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-devPaul Lawrence2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7624d0d830ad6b185f0ba50f5ffd8b0e20386228':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-devPaul Lawrence2015-07-061-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd6b2b65dc40c5af7feecf634b8ae55bf14fe8e6c': Change init sequence to support file level encryption
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 165c6ad3: am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."Tao Bao2015-08-261-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '165c6ad300380fcd132a676f809560a606894e52': updater: Remove the unused isunresumable in SaveStash().
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."Tao Bao2015-08-261-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5': updater: Remove the unused isunresumable in SaveStash().
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."Tao Bao2015-08-261-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | / / / / / / / / / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eef991389c7f739dd80bbe6e4a3699322c12dcfb': updater: Remove the unused isunresumable in SaveStash().
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove the unused isunresumable in SaveStash()."Tao Bao2015-08-261-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Remove the unused isunresumable in SaveStash().Tao Bao2015-08-261-3/+3
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a8d9bea4c1cd8ea7b534682061b90e893b227a2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1a3ccc88: am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"Tao Bao2015-08-261-46/+48
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a3ccc881f451ff733a587b9fac8d73a83c12dfd': GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"Tao Bao2015-08-261-46/+48
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dc61d17d5b3c9e85a2863ec461170263325f1466': GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"Tao Bao2015-08-261-46/+48
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '50c17f9da69ed3de0cd3ed032c50af067c1dc1f1': GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"Tao Bao2015-08-261-46/+48
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GOOGLEGMS-749 Fix integer overflow while applying block based OTA packageShrinivas Sahukar2015-08-221-46/+48
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is an integer overflow when the size of system goes beyond the signed int limits. Hence changing pos to size_t. Change-Id: I6e5e1b2f0e72030b30a6df09a01642f4c82abc79
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ba781587: am 337db14f: recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.Tao Bao2015-08-253-0/+788
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ba781587cb1926782d7561aa7dcb5db44d09a70b': recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 337db14f: recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.Tao Bao2015-08-253-0/+788
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '337db14f274fc73dd540aa71d2c21c431fe686ec': recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.Tao Bao2015-08-253-0/+788
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every watch has a (mostly identical) copy of the wear_ui. Factor them out into a single copy for easier maintenance. Device-specific settings should be defined in recovery_ui.cpp that inherits WearRecoveryUI class. Bug: 22451422 Change-Id: Id07efca37d1b1d330e6327506c7b73ccf6ae9241
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f0355aeb: am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."Tao Bao2015-08-215-37/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f0355aebe8bc833a6d287e11bf8cc9a56c43d32d': edify: Switch to C++.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."Tao Bao2015-08-215-37/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dbbdcf3fd817128f89474f9ea8c84743fc648a1a': edify: Switch to C++.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 93fa4b67: Merge "edify: Switch to C++."Tao Bao2015-08-215-37/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | / / / / / / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93fa4b677cac9288e936915f15ca8e5f76a4e4b6': edify: Switch to C++.
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Switch to C++."Tao Bao2015-08-215-37/+27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | edify: Switch to C++.Tao Bao2015-08-205-37/+27
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I71aede6e29af1dc4bb858a62016c8035db5d3452
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e57ca0ec: am 4854e292: am ad509fd4: Merge "Fix potential crash"Tao Bao2015-08-111-5/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e57ca0ec07f357a1ef38d9a7439ea080bada4e74': Fix potential crash
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4854e292: am ad509fd4: Merge "Fix potential crash"Tao Bao2015-08-111-5/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4854e292e0cd0eb58bce4488dc849273904d9302': Fix potential crash
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ad509fd4: Merge "Fix potential crash"Tao Bao2015-08-111-5/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad509fd4a2c597ced8e53b0817f754cb2209b98a': Fix potential crash
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix potential crash"Tao Bao2015-08-111-5/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix potential crashJeremy Compostella2015-08-051-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Malloc might fail when replacing package path. In this case, print a clear error message in the logs and let the OTA fails. Change-Id: I7209d95edc025e3ee1b4478f5e04f6e852d97205 Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com> Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0d42440e: am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."Tao Bao2015-08-103-16/+91
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0d42440ecb1c664862eaa7848cc45fb7ff0fb514': Use unique_ptr and unique_fd to manager FDs.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."Tao Bao2015-08-103-16/+91
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '434a1761aac48b8e3c13d5a6cb3edd90c8667f6f': Use unique_ptr and unique_fd to manager FDs.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."Tao Bao2015-08-103-16/+91
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0d46c7ab02eb97d6b4b2e26b9202fd9b4e9dd8c8': Use unique_ptr and unique_fd to manager FDs.
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use unique_ptr and unique_fd to manager FDs."Tao Bao2015-08-103-16/+91
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Use unique_ptr and unique_fd to manager FDs.Tao Bao2015-08-103-16/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up leaky file descriptors in uncrypt/uncrypt.cpp. Add unique_fd for open() and unique_file for fopen() to close FDs on destruction. Bug: 21496020 Change-Id: I0174db0de9d5f59cd43b44757b8ef0f5912c91a2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 36ca3800: am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."Tao Bao2015-08-105-288/+185
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ca3800bc5231972ecfde53d1241e715a98ad4e': updater: Clean up char* with std::string.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."Tao Bao2015-08-105-288/+185
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f89389a0b55d13ee1c9026c33f17dc1cc9c7ace': updater: Clean up char* with std::string.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7c511184: Merge "updater: Clean up char* with std::string."Tao Bao2015-08-105-288/+185
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c511184bf3ed44f3590027730a64d565c0e12ee': updater: Clean up char* with std::string.
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up char* with std::string."Tao Bao2015-08-105-288/+185
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Clean up char* with std::string.Tao Bao2015-08-065-288/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we can remove a few free()s. And also replace a few pointers with references. Change-Id: I4b6332216704f4f9ea4a044b8d4bb7aa42a7ef26
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f2a23a94: am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."Dan Albert2015-08-081-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2a23a94cb9649ad7888749a82976ce01988e0f9': Use CPPFLAGS instead of CFLAGS.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."Dan Albert2015-08-081-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '236b3eb6a085bd0762849b5feca880f6dc63787d': Use CPPFLAGS instead of CFLAGS.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."Dan Albert2015-08-081-4/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e67104a6a778f70bd479e737b09eb32c835e250e': Use CPPFLAGS instead of CFLAGS.
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use CPPFLAGS instead of CFLAGS."Dan Albert2015-08-081-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Use CPPFLAGS instead of CFLAGS.Dan Albert2015-08-081-4/+4
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we build these as C, to the build system they are technically C++ and are subject to the global CPPFLAGS. Set LOCAL_CPPFLAGS here instead of LOCAL_CFLAGS so we can be sure we override anything provided by the build system. Bug: http://b/23043421 Change-Id: I344b54ae4ff9f142365a42c33ba160c1be17a342
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2496489c: am a9390df6: am 06689dc5: Merge "Fix recovery image build."Elliott Hughes2015-08-082-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2496489cb4ec75f13b0d30f580332e74bf4a2fa8': Fix recovery image build.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a9390df6: am 06689dc5: Merge "Fix recovery image build."Elliott Hughes2015-08-072-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a9390df6c6b8d6cc98b102aeffc8e7acd300c857': Fix recovery image build.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 06689dc5: Merge "Fix recovery image build."Elliott Hughes2015-08-072-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '06689dc53d14ab0449c64c097d2937179f986873': Fix recovery image build.
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix recovery image build."Elliott Hughes2015-08-072-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Fix recovery image build.Elliott Hughes2015-08-072-2/+2
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent adb cleanup changed the signature of adb_main. Change-Id: I98d084f999966f1a7aa94c63e9ed996b3375096d
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am 68e77434: resolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aospTao Bao2015-08-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '68e77434d8967baf7f1a5b79a61febcc60e6cb0a': udpater: Call fsync() after rename().
| * | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aospTao Bao2015-08-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iba4d2e5c5c7d0e0c1088403ff32d8f0d12da925d
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am be19dce8: udpater: Call fsync() after rename().Tao Bao2015-08-041-0/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'be19dce86ce7d4a83f1cfcd11db393f8be8f4397': udpater: Call fsync() after rename().
| | | * | | | | | | | | | | | | | | | | | | | | | | | | udpater: Call fsync() after rename().Tao Bao2015-08-041-0/+20
| | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to ensure the renamed filename reaches the underlying storage. Bug: 22840552 Change-Id: I824b6e9d8a9c5966035be7b42a73678d07376342 (cherry picked from commit dc3922622a94af4f6412fd68e8f075f839ab2348)
* | | | | | | | | | | | | | | | | | | | | | | | | | | am ddbfdf79: am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."Tao Bao2015-08-041-0/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ddbfdf79518699b232837bae1052e70b701bd524': udpater: Call fsync() after rename().
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."Tao Bao2015-08-041-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '393d1e739fc10e526bd3b7b83836a266bfa24079': udpater: Call fsync() after rename().
| | * | | | | | | | | | | | | | | | | | | | | | | | | am 27c1ab20: Merge "udpater: Call fsync() after rename()."Tao Bao2015-08-041-0/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | / / / / / / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '27c1ab2095f25253d0920eb6afe7cd2791a708dc': udpater: Call fsync() after rename().
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "udpater: Call fsync() after rename()."Tao Bao2015-08-041-0/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | udpater: Call fsync() after rename().Tao Bao2015-08-041-0/+20
| | | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to ensure the renamed filename reaches the underlying storage. Bug: 22840552 Change-Id: Ide2e753a2038691d472b6ee173cbf68ac998a084
* | | | | | | | | | | | | | | | | | | | | | | | | am 414c576c: am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."Tao Bao2015-08-013-19/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '414c576cf8fb5a8defef40d72f6c75012acdecab': recovery: Allow "Mount /system" for system_root_image.
| * | | | | | | | | | | | | | | | | | | | | | | | am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."Tao Bao2015-08-013-19/+39
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2e979ef6fd21e1681a8ec7ca2f5582ca8e14ddcd': recovery: Allow "Mount /system" for system_root_image.
| | * | | | | | | | | | | | | | | | | | | | | | | am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."Tao Bao2015-07-313-19/+39
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '302779e71cb1be68f60cb044c85436d4d6bcfecc': recovery: Allow "Mount /system" for system_root_image.
| | | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Allow "Mount /system" for system_root_image."Tao Bao2015-07-313-19/+39
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | recovery: Allow "Mount /system" for system_root_image.Tao Bao2015-07-313-19/+39
| | | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When system images contain the root directory, there is no entry of "/system" in the fstab. Change it to look for "/" instead if ro.build.system_root_image is true. We actually mount the partition to /system_root instead, and create a symlink to /system_root/system for /system. This allows "adb shell" to work properly. Bug: 22855115 Change-Id: Ibac493a5a9320c98ee3b60bd2cc635b925f5454a
* | | | | | | | | | | | | | | | | | | | | | | | am 7d71725d: am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."Tao Bao2015-07-281-6/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d71725d7667afa6b705fe0e20151e03d9db75d2': updater: Hoist fsync() to outer loop.
| * | | | | | | | | | | | | | | | | | | | | | | am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."Tao Bao2015-07-281-6/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7666f65b2a1e4352c52df9fe7a0b26ce923a1477': updater: Hoist fsync() to outer loop.
| | * | | | | | | | | | | | | | | | | | | | | | am 62e19231: Merge "updater: Hoist fsync() to outer loop."Tao Bao2015-07-281-6/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '62e1923194de067c0ac589abcfc4f04fdddf2b1a': updater: Hoist fsync() to outer loop.
| | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Hoist fsync() to outer loop."Tao Bao2015-07-281-6/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | updater: Hoist fsync() to outer loop.Tao Bao2015-07-271-6/+5
| | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the fsync() inside write_all() may be called multiple times when performing a command. Move that to the outer loop and call it only after completing the command. Also remove the O_SYNC flag when writing a stash. Change-Id: I71e51d76051a2f7f504eef1aa585d2cb7a000d80
* | | | | | | | | | | | | | | | | | | | | | | am 4b3ad009: am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."Tao Bao2015-07-251-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b3ad009f7a1dd0ac85d996d9f3a87a6a83b0e97': applypatch: Fix the checking in WriteToPartition().
| * | | | | | | | | | | | | | | | | | | | | | am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."Tao Bao2015-07-251-3/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0622ccb34d504170b76b8f4dd5f0639794be679a': applypatch: Fix the checking in WriteToPartition().
| | * | | | | | | | | | | | | | | | | | | | | am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."Tao Bao2015-07-251-3/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a4a33e39ea2fa8626335f6b9cccf407c71c0588': applypatch: Fix the checking in WriteToPartition().
| | | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the checking in WriteToPartition()."Tao Bao2015-07-251-3/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | applypatch: Fix the checking in WriteToPartition().Tao Bao2015-07-251-3/+4
| | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WriteToPartition() should consider a target name as valid if it contains multiple colons. But only the first two fields will be used. Bug: 22725128 Change-Id: Ie9404375e24045c115595eec6ce5b6423da8fc3e
* | | | | | | | | | | | | | | | | | | | | | am 6a06034d: am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."Tao Bao2015-07-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a06034d031464b220bc78bda2654f80d6ef1ad1': applypatch: Support flash mode.
| * | | | | | | | | | | | | | | | | | | | | am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."Tao Bao2015-07-243-16/+97
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b753ad5da2ade45548f95b4a76219db3043db49': applypatch: Support flash mode.
| | * | | | | | | | | | | | | | | | | | | | am dd738c11: Merge "applypatch: Support flash mode."Tao Bao2015-07-243-16/+97
| | |\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd738c11a49d594183dde9f0e46f56c7a575900a': applypatch: Support flash mode.
| | | * | | | | | | | | | | | | | | | | | Merge "applypatch: Support flash mode."Tao Bao2015-07-243-16/+97
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | applypatch: Support flash mode.Tao Bao2015-07-243-16/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We may carry a full copy of recovery image in the /system, and use /system/bin/install-recovery.sh to install the recovery. This CL adds support to flash the recovery partition with the given image. Bug: 22641135 Change-Id: I7a275b62fdd1bf41f97f6aab62d0200f7dae5aa1 (cherry picked from commit 68c5a6796737bb583a8bdfa4c9cd9c7f12ef4276)
* | | | | | | | | | | | | | | | | | | | | | am e657f0fb: am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."Tao Bao2015-07-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e657f0fb8ec21b09831ed19d18ba05a7630a4fb0': uncrypt: Support file level encryption.
| * | | | | | | | | | | | | | | | | | | | | am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."Tao Bao2015-07-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c69095d8cd9685f9d9c7e3863a5e087efeadba3a': uncrypt: Support file level encryption.
| | * | | | | | | | | | | | | | | | | | | | am afb8f320: Merge "uncrypt: Support file level encryption."Tao Bao2015-07-241-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'afb8f320bf244630035e011f7840f90120ec4f8f': uncrypt: Support file level encryption.
| | | * | | | | | | | | | | | | | | | | | Merge "uncrypt: Support file level encryption."Tao Bao2015-07-241-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | uncrypt: Support file level encryption.Tao Bao2015-07-241-1/+1
| | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22534003 Change-Id: I2bc22418c416491da573875dce78daed24f2c046 (cherry picked from commit 6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332)
* | | | | | | | | | | | | | | | | | | | am 3f640620: am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."Tao Bao2015-07-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f6406204c9886ee59209a98e1bb8b64ae615656': updater: libapplypatch needs libbase now.
| * | | | | | | | | | | | | | | | | | | am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."Tao Bao2015-07-241-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '87f2c673dfbc310d1a80ea1c3b00d9e1adb1947f': updater: libapplypatch needs libbase now.
| | * | | | | | | | | | | | | | | | | | am cc3c3414: Merge "updater: libapplypatch needs libbase now."Tao Bao2015-07-241-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc3c34145e4816a84fe597ce273b016ae9587530': updater: libapplypatch needs libbase now.
| | | * | | | | | | | | | | | | | | | Merge "updater: libapplypatch needs libbase now."Tao Bao2015-07-241-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | updater: libapplypatch needs libbase now.Tao Bao2015-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I18da9e6da64fccab495dc5a96e3efd95cc6d88bf (cherry picked from commit 1b1ea17d554d127a970afe1d6004dd4627cd596e)
* | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 49a24460 to masterTao Bao2015-07-240-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."Tao Bao2015-07-242-86/+56
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1dc71bec8d3dc3c1eb7eb40aed2eeb04b47f75ce': applypatch: Refactor strtok().
| | * | | | | | | | | | | | | | | | | | am cfd9d9c7: Merge "applypatch: Refactor strtok()."Tao Bao2015-07-242-86/+56
| | |\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cfd9d9c7ce03b847946977a98efcbfca2f067fd3': applypatch: Refactor strtok().
| | | * | | | | | | | | | | | | | | | Merge "applypatch: Refactor strtok()."Tao Bao2015-07-242-86/+56
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | applypatch: Refactor strtok().Tao Bao2015-07-242-86/+56
| | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have android::base::Split() for the work. Change-Id: I0fb562feb203c9b15e2f431d8e84355fd682376a (cherry picked from commit 0a47ce27de454e272a883a0c452fad627fd7f419)
* | | | | | | | | | | | | | | | | | am 052796ea: am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."Tao Bao2015-07-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '052796ea09bcf33f7031aa8218628bf1c9ced02a': recovery: Switch fuse_* to C++.
| * | | | | | | | | | | | | | | | | am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."Tao Bao2015-07-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b91e700544e0fca378a7fb5f8c807842bb284986': recovery: Switch fuse_* to C++.
| | * | | | | | | | | | | | | | | | am 85090d0c: Merge "recovery: Switch fuse_* to C++."Tao Bao2015-07-205-29/+14
| | |\| | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85090d0c98f1684147fc180a8b2adea93e4af642': recovery: Switch fuse_* to C++.
| | | * | | | | | | | | | | | | | Merge "recovery: Switch fuse_* to C++."Tao Bao2015-07-205-29/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | recovery: Switch fuse_* to C++.Tao Bao2015-07-205-29/+14
| | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I68770ad1a9e99caee292f8010cfd37dfea3acc64
* | | | | | | | | | | | | | | | | am 0d4e0026: recovery: Switch fuse_* to C++.Tao Bao2015-07-245-29/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0d4e002670064157aa34ba8c391184151b7d402a': recovery: Switch fuse_* to C++.
| * | | | | | | | | | | | | | | | recovery: Switch fuse_* to C++.Tao Bao2015-07-245-29/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id50c3e6febd0ab61f10a654b9b265cf21a2d1701 (cherry picked from commit 71dc365f25676cfb3f62dbb7163697a8c3c5243d)
* | | | | | | | | | | | | | | | | applypatch: Support flash mode.Tao Bao2015-07-223-16/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We may carry a full copy of recovery image in the /system, and use /system/bin/install-recovery.sh to install the recovery. This CL adds support to flash the recovery partition with the given image. Bug: 22641135 Change-Id: I345eaaee269f6443527f45a9be7e4ee47f6b2b39
* | | | | | | | | | | | | | | | | Merge "updater: libapplypatch needs libbase now."Tao Bao2015-07-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | updater: libapplypatch needs libbase now.Tao Bao2015-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe3173edd6274b61bd9ca5ec394d7f6b4a403639
* | | | | | | | | | | | | | | | | | applypatch: Refactor strtok().Tao Bao2015-07-172-86/+56
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have android::base::Split() for the work. Change-Id: Ic529db42090f700e6455d465c8b84b7f52d34d63
* | | | | | | | | | | | | | | | | am f2c4e4ce: am 6e9dda70: uncrypt: Support file level encryption.Tao Bao2015-07-171-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2c4e4ce767103603cdc6137339f013af3dc1ad1': uncrypt: Support file level encryption.
| * | | | | | | | | | | | | | | | am 6e9dda70: uncrypt: Support file level encryption.Tao Bao2015-07-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332': uncrypt: Support file level encryption.
| | * | | | | | | | | | | | | | | uncrypt: Support file level encryption.Tao Bao2015-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22534003 Change-Id: Iaf42a6e5b40cfef904de66e212ae8b77b2953ef7
* | | | | | | | | | | | | | | | | am ac780c90: am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."Tao Bao2015-07-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac780c904670f61083f6831bb2d09bc0a15a0bd6': Clean up LOG functions.
| * | | | | | | | | | | | | | | | am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."Tao Bao2015-07-173-20/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '328cb8cb5a434ba9d897443a408d11e8ee8c64a0': Clean up LOG functions.
| | * | | | | | | | | | | | | | | am 025c0e79: Merge "Clean up LOG functions."Tao Bao2015-07-173-20/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | / / / / / / / | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | * commit '025c0e79c3e05babd4df0bab8249466b489c0870': Clean up LOG functions.
| | | * | | | | | | | | | | | | Merge "Clean up LOG functions."Tao Bao2015-07-173-20/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Clean up LOG functions.Tao Bao2015-07-173-20/+20
| | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For fatal errors, use LOGE to show messages. Bug: 22236461 Change-Id: I2b7d761576894ac37fcbadcba690ae14affe8f07 (cherry picked from commit d7d0f7503456c3d275a49f90be35e03f02c51bbd)
* | | | | | | | | | | | | | | | Clean up LOG functions.Tao Bao2015-07-163-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For fatal errors, use LOGE to show messages. Bug: 22236461 Change-Id: Ie2ce7ec769f4502d732fbb53fb7b303c0cf9ed68
* | | | | | | | | | | | | | | | am 48248273: am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."Tao Bao2015-07-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4824827340cc76927f8b24d000638624b15021ac': recovery: Switch applypatch/ and updater/ to cpp.
| * | | | | | | | | | | | | | | am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."Tao Bao2015-07-1415-300/+304
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '307eecfdc7dc73ce8f53f742e3c468e63b42f0e2': recovery: Switch applypatch/ and updater/ to cpp.
| | * | | | | | | | | | | | | | am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."Tao Bao2015-07-1415-300/+304
| | |\| | | | | | | | | | | | | | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0bacbfd03c866b9078f86216e6786da91238ac91': recovery: Switch applypatch/ and updater/ to cpp.
| | | * | | | | | | | | | | | Merge "recovery: Switch applypatch/ and updater/ to cpp."Tao Bao2015-07-1415-300/+304
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | recovery: Switch applypatch/ and updater/ to cpp.Tao Bao2015-07-1415-300/+304
| | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly trivial changes to make cpp compiler happy. Change-Id: I69bd1d96fcccf506007f6144faf37e11cfba1270
* | | | | | | | | | | | | | | recovery: Switch applypatch/ and updater/ to cpp.Tao Bao2015-07-1415-300/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly trivial changes to make cpp compiler happy. Change-Id: I1b0481465c67c3bbca35a839d0764190d84ff34e (cherry picked from commit ba9a42aa7e10686de186636fe9fecbf8c4cc7c19)
* | | | | | | | | | | | | | | am a91335ae: am 90c75b0b: Change init sequence to support file level encryptionPaul Lawrence2015-07-141-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a91335aedcdf1eae07e82bb4f247616832f05928': Change init sequence to support file level encryption
| * | | | | | | | | | | | | | am 90c75b0b: Change init sequence to support file level encryptionPaul Lawrence2015-07-131-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '90c75b0beb375b8d261e2df92292e9b542470f6e': Change init sequence to support file level encryption
| | * | | | | | | | | | | | | Change init sequence to support file level encryptionPaul Lawrence2015-07-071-3/+3
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File level encryption must get the key between mounting userdata and calling post_fs_data when the directories are created. This requires access to keymaster, which in turn is found from a system property. Split property loaded into system and data, and load in right order. Bug: 22233063 Change-Id: I409c12e3f4a8cef474eb48818e96760fe292cc49
* | | | | | | | | | | | | | am 79e95b2d: am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""Tao Bao2015-07-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '79e95b2d167becd93e7c456e5aa0c482edaeefcc': Revert "Zero blocks before BLKDISCARD"
| * | | | | | | | | | | | | am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""Tao Bao2015-07-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2853e27472728d3a24293ab4bfc445c74be6a15': Revert "Zero blocks before BLKDISCARD"
| | * | | | | | | | | | | | am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""Tao Bao2015-07-111-17/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | / / / / / / / | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | * commit '65c230f4b3c9fd6b42f6502b96e5b47c7b1c2f61': Revert "Zero blocks before BLKDISCARD"
| | | * | | | | | | | | | Merge "Revert "Zero blocks before BLKDISCARD""Tao Bao2015-07-111-17/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Revert "Zero blocks before BLKDISCARD"Tao Bao2015-07-111-17/+1
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b65f0272c860771f2105668accd175be1ed95ae9. It slows down the update too much on some devices (e.g. increased from 8 mins to 40 mins to take a full OTA update). Bug: 22129621 Change-Id: I016e3b47313e3113f01bb4f8eb3c14856bdc35e5 (cherry picked from commit 7125f9594db027ce4313d940ce2cafac67ae8c31)
* | | | | | | | | | | | | am b6b31549: am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-devPaul Lawrence2015-07-071-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b6b31549dfe3c9ec6b32e2862ee7e08a949e2f9c': Revert "Change init sequence to support file level encryption"
| * | | | | | | | | | | | am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-devPaul Lawrence2015-07-071-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '10cf0942a7f4b2bfd539416e4767aaaf866a6527': Revert "Change init sequence to support file level encryption"
| | * | | | | | | | | | | Merge "Revert "Change init sequence to support file level encryption"" into mnc-devPaul Lawrence2015-07-071-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Revert "Change init sequence to support file level encryption"Paul Lawrence2015-07-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 98c1a3de23ae8b589c36e74939193c44d25cac65. Change-Id: I524060418de18f97c3865ebc4435f501015e92ee
* | | | | | | | | | | | | am e93fa6b7: am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"Tao Bao2015-07-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e93fa6b7428a7bdd6386159b417d70090b20f2df': Allow mounting squashfs partitions
| * | | | | | | | | | | | am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"Tao Bao2015-07-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4e6507f32817e2943b1f27d12f56b485993c2a44': Allow mounting squashfs partitions
| | * | | | | | | | | | | am 2490dbc9: Merge "Allow mounting squashfs partitions"Tao Bao2015-07-071-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2490dbc9325ad522ec5ee031f5493d2e975f3a49': Allow mounting squashfs partitions
| | | * | | | | | | | | | Merge "Allow mounting squashfs partitions"Tao Bao2015-07-071-0/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Allow mounting squashfs partitionsMohamad Ayyash2015-07-071-0/+1
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifb8f84063a406db7aad3f9ef12c349ea09a54e07 Signed-off-by: Mohamad Ayyash <mkayyash@google.com> (cherry picked from commit 0ddfa329acb1e6464fe5d66b58257013abf21116)
* | | | | | | | | | | | | am 3cc51480: am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-devPaul Lawrence2015-07-071-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3cc5148007a7ad2ff0b868ae89c7835286dd148c': Change init sequence to support file level encryption
| * | | | | | | | | | | | am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-devPaul Lawrence2015-07-061-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | / / / / / / / | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | * commit 'd6b2b65dc40c5af7feecf634b8ae55bf14fe8e6c': Change init sequence to support file level encryption
| | * | | | | | | | | | Merge "Change init sequence to support file level encryption" into mnc-devPaul Lawrence2015-07-061-3/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Change init sequence to support file level encryptionPaul Lawrence2015-07-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File level encryption must get the key between mounting userdata and calling post_fs_data when the directories are created. This requires access to keymaster, which in turn is found from a system property. Split property loaded into system and data, and load in right order. Bug: 22233063 Change-Id: I409c12e3f4a8cef474eb48818e96760fe292cc49
* | | | | | | | | | | | am 08b63396: am 501282a4: am b4b41daa: am 0ddfa329: Allow mounting squashfs partitionsMohamad Ayyash2015-07-031-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '08b63396f9a2361a891f37831e20fda502b2afa4': Allow mounting squashfs partitions
| * | | | | | | | | | | am 501282a4: am b4b41daa: am 0ddfa329: Allow mounting squashfs partitionsMohamad Ayyash2015-07-021-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '501282a42dfbd9f4d33a1009daa387d1d0f0f368': Allow mounting squashfs partitions
| | * | | | | | | | | | am b4b41daa: am 0ddfa329: Allow mounting squashfs partitionsMohamad Ayyash2015-07-021-0/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b4b41daa2ddbe8849dacdeeafd240e2a265cb594': Allow mounting squashfs partitions
| | | * | | | | | | | | am 0ddfa329: Allow mounting squashfs partitionsMohamad Ayyash2015-07-021-0/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ddfa329acb1e6464fe5d66b58257013abf21116': Allow mounting squashfs partitions
| | | | * | | | | | | | | Allow mounting squashfs partitionsMohamad Ayyash2015-07-011-0/+1
| | | | | |_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic023eb7d8a11e2a65172a23ff39fa902ef566183 Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
* | | | | | | | | | | | am 6284431d: am 8409b088: Merge "Add drm support to minui" into mnc-devVincent Palatin2015-07-034-0/+484
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6284431df56aff58a0ea46f06341d23cb9ff94cd': Add drm support to minui
| * | | | | | | | | | | am 8409b088: Merge "Add drm support to minui" into mnc-devVincent Palatin2015-07-024-0/+484
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8409b08888d5ec914d7b4aae552bc78f23bcddd5': Add drm support to minui
| | * | | | | | | | | | Merge "Add drm support to minui" into mnc-devVincent Palatin2015-07-024-0/+484
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Add drm support to minuiStéphane Marchesin2015-07-024-0/+484
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22231636 Change-Id: I103c8e906b7dd9862b7bb89d8642268e9a3006b4 Signed-off-by: Stéphane Marchesin <marcheu@chromium.org>
* | | | | | | | | | | | am c4b6f87f: am 7125f959: Revert "Zero blocks before BLKDISCARD"Tao Bao2015-07-031-17/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c4b6f87f7ab969be7ee177baa8704774869ecb56': Revert "Zero blocks before BLKDISCARD"
| * | | | | | | | | | | am 7125f959: Revert "Zero blocks before BLKDISCARD"Tao Bao2015-07-011-17/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7125f9594db027ce4313d940ce2cafac67ae8c31': Revert "Zero blocks before BLKDISCARD"
| | * | | | | | | | | | Revert "Zero blocks before BLKDISCARD"Tao Bao2015-07-011-17/+1
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b65f0272c860771f2105668accd175be1ed95ae9. It slows down the update too much on some devices (e.g. increased from 8 mins to 40 mins to take a full OTA update). Bug: 22129621 Change-Id: I4e8d4f6734967caf4f0d19c734027f7b6c107370
* | | | | | | | | | | am 2b3c599c: am c3dddce2: More accurate checking for overlapped ranges.Tao Bao2015-06-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b3c599c6a6b7c2cf8da3e6ad9ada5812df3f831': More accurate checking for overlapped ranges.
| * | | | | | | | | | am c3dddce2: More accurate checking for overlapped ranges.Tao Bao2015-06-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c3dddce205ef44933813394013ee5ef89b63653b': More accurate checking for overlapped ranges.
| | * | | | | | | | | More accurate checking for overlapped ranges.Tao Bao2015-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A RangeSet has half-closed half-open bounds. For example, "3,5" contains blocks 3 and 4. So "3,5" and "5,7" are actually not overlapped. Bug: 22098085 Change-Id: I362d259f8b5d62478858ad0422b635bc5068698d (cherry picked from commit c0f56ad76680df555689d4a2397487ef8c16b1a6)
* | | | | | | | | | | am b102404d: am cb9450e1: Use f_bavail to calculate free spacecaozhiyuan2015-06-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b102404d1defbfd3e63ca8f8721327f4384e2d69': Use f_bavail to calculate free space
| * | | | | | | | | | am cb9450e1: Use f_bavail to calculate free spacecaozhiyuan2015-06-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb9450e11337700907a7a5ec290902196c74fa9b': Use f_bavail to calculate free space
| | * | | | | | | | | Use f_bavail to calculate free spacecaozhiyuan2015-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failures are seen on devices with Linux 3.10. And they are mainly due to this change: https://lwn.net/Articles/546473/ The blocks reserved in this change is not the same thing as what we think are reserved for common usage of root user. And this part is included in free blocks but not in available blocks. Bug: 22118089 Change-Id: I81c9531703298019a4fc11839f28d2cc8b9df34e (cherry picked from commit 3b4977638f48e59d23d7ea2bb6dde78552c257fb)
* | | | | | | | | | | am f90651e4: am 89d3634f: am b36d9c3f: Merge "More accurate checking for overlapped ranges."Tao Bao2015-06-261-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f90651e4c43ac9b803ca67582a3ffd5e8dc0f192': More accurate checking for overlapped ranges.
| * | | | | | | | | | am 89d3634f: am b36d9c3f: Merge "More accurate checking for overlapped ranges."Tao Bao2015-06-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '89d3634ffe0855456fe4b33b6aa2abdffeeddfc6': More accurate checking for overlapped ranges.
| | * | | | | | | | | am b36d9c3f: Merge "More accurate checking for overlapped ranges."Tao Bao2015-06-261-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b36d9c3f00e75dba464ff62eab94dd46d93ac94e': More accurate checking for overlapped ranges.
| | | * | | | | | | | Merge "More accurate checking for overlapped ranges."Tao Bao2015-06-261-1/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | More accurate checking for overlapped ranges.Tao Bao2015-06-261-1/+1
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A RangeSet has half-closed half-open bounds. For example, "3,5" contains blocks 3 and 4. So "3,5" and "5,7" are actually not overlapped. Bug: 22098085 Change-Id: I75e54a6506f2a20255d782ee710e889fad2eaf29
* | | | | | | | | | | am 8f7a2afe: am 1572820c: am ec18d495: Merge "recovery: Use xxhdpi resources for 560dpi devices"Tao Bao2015-06-241-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8f7a2afede744f548ea13761ae6eb27327485a35': recovery: Use xxhdpi resources for 560dpi devices
| * | | | | | | | | | am 1572820c: am ec18d495: Merge "recovery: Use xxhdpi resources for 560dpi devices"Tao Bao2015-06-241-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1572820cd005c8b150c1c807b1b686d8f2da78ad': recovery: Use xxhdpi resources for 560dpi devices
| | * | | | | | | | | am ec18d495: Merge "recovery: Use xxhdpi resources for 560dpi devices"Tao Bao2015-06-241-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec18d495058a9a6dd6f3dd442aa0f5d0041504e4': recovery: Use xxhdpi resources for 560dpi devices
| | | * | | | | | | | Merge "recovery: Use xxhdpi resources for 560dpi devices"Tao Bao2015-06-241-0/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | recovery: Use xxhdpi resources for 560dpi devicesTao Bao2015-06-241-0/+1
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a symbolic link to res-xxhdpi for res-560dpi. 560dpi devices (like shamu) are currently using a fallback option of xhdpi (320dpi) resources. Now they can get closer ones (480dpi), such as larger fonts on UI screen. Change-Id: I427c3091d7e9892d9a7a1886be6adca14c122b06
* | | | | | | | | | | am 2c7fa669: am 4b619469: am 719e4e5d: Merge "Just use fstat in sysMapFile."Elliott Hughes2015-06-243-71/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2c7fa6695e3c04810a9cca0619cae5b928a717dd': Just use fstat in sysMapFile.
| * | | | | | | | | | am 4b619469: am 719e4e5d: Merge "Just use fstat in sysMapFile."Elliott Hughes2015-06-243-71/+24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b6194696e3fdb9e0bab5dc53d91c3bca9267123': Just use fstat in sysMapFile.
| | * | | | | | | | | am 719e4e5d: Merge "Just use fstat in sysMapFile."Elliott Hughes2015-06-243-71/+24
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '719e4e5d9bb7b7f9ffbe48407feee8c985ce7623': Just use fstat in sysMapFile.
| | | * | | | | | | | Merge "Just use fstat in sysMapFile."Elliott Hughes2015-06-243-71/+24
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Just use fstat in sysMapFile.Elliott Hughes2015-06-233-71/+24
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also turn on -Werror and remove a dead function. Change-Id: I436f0a91c40e36db985190b3b98b0a4527cf0eeb
* | | | | | | | | | | am 997534d0: am c35f3ce3: Allow sideloading without authentication.Elliott Hughes2015-06-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '997534d0efcdb9145fbc58f78cb3409db8d04804': Allow sideloading without authentication.
| * | | | | | | | | | am c35f3ce3: Allow sideloading without authentication.Elliott Hughes2015-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c35f3ce30e4bb0de33fe6fcf0b928d0e4b7269b0': Allow sideloading without authentication.
| | * | | | | | | | | Allow sideloading without authentication.Elliott Hughes2015-06-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/22025550 Change-Id: I20f09ae442536f924f19ede0abf6a2bcc0a5cedf (cherry picked from commit 9813f5ba57fe7d90d45cb1c2b6f65920ce580e72)
* | | | | | | | | | | am 687bf071: am 6dd443fd: am ea13fe23: Merge "Allow sideloading without authentication."Elliott Hughes2015-06-231-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '687bf071ad5f19a1fe91569f47e474e6e9a239d7': Allow sideloading without authentication.
| * | | | | | | | | | am 6dd443fd: am ea13fe23: Merge "Allow sideloading without authentication."Elliott Hughes2015-06-231-1/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6dd443fd51062efb4eae87b8f0e1f6cebf332b37': Allow sideloading without authentication.
| | * | | | | | | | | am ea13fe23: Merge "Allow sideloading without authentication."Elliott Hughes2015-06-231-1/+5
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea13fe233e8a95d9e5b69b131fbf840a60d1f04e': Allow sideloading without authentication.
| | | * | | | | | | | Merge "Allow sideloading without authentication."Elliott Hughes2015-06-231-1/+5
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Allow sideloading without authentication.Elliott Hughes2015-06-231-1/+5
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/22025550 Change-Id: I20f09ae442536f924f19ede0abf6a2bcc0a5cedf
* | | | | | | | | | | am deb4ebb2: am d2a59288: am 22ccc87a: Merge "Unmount sdcard if no package file is selected."Elliott Hughes2015-06-111-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'deb4ebb2876b0352ddf042f680339696b89ec125': Unmount sdcard if no package file is selected.
| * | | | | | | | | | am d2a59288: am 22ccc87a: Merge "Unmount sdcard if no package file is selected."Elliott Hughes2015-06-111-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd2a592888b1c8103b7d5c4807230102b78aa3d23': Unmount sdcard if no package file is selected.
| | * | | | | | | | | am 22ccc87a: Merge "Unmount sdcard if no package file is selected."Elliott Hughes2015-06-111-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '22ccc87a7dffd089662a111aa96127b3476d65fc': Unmount sdcard if no package file is selected.
| | | * | | | | | | | Merge "Unmount sdcard if no package file is selected."Elliott Hughes2015-06-111-0/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Unmount sdcard if no package file is selected.caozhiyuan2015-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I12b4f880802135a98dbc11a19e74172a3a5ef921
* | | | | | | | | | | | am 7ccec497: am d7c9bf41: Merge "Zero blocks before BLKDISCARD" into mnc-devSami Tolvanen2015-06-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ccec497f293e1e2629ecb9c906de69305976ff7': Zero blocks before BLKDISCARD
| * | | | | | | | | | | am d7c9bf41: Merge "Zero blocks before BLKDISCARD" into mnc-devSami Tolvanen2015-06-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd7c9bf41daa865ca016dee12a68282ba457c31fb': Zero blocks before BLKDISCARD
| | * | | | | | | | | | Merge "Zero blocks before BLKDISCARD" into mnc-devSami Tolvanen2015-06-101-1/+17
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Zero blocks before BLKDISCARDSami Tolvanen2015-06-101-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to observed BLKDISCARD flakiness, overwrite blocks that we want to discard with zeros first to avoid later issues with dm-verity if BLKDISCARD is not successful. Bug: 20614277 Bug: 20881595 Change-Id: I4f6f2db39db990879ff10468c9db41606497bd6f (cherry picked from commit a3c75e3ea60d61df93461f5c356befe825c429d2)
* | | | | | | | | | | | | am 1e8bc40b: am 0005f89c: Split WipeData into PreWipeData and PostWipeData.Elliott Hughes2015-06-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1e8bc40b02e372403ba58e4681952347bea3fb34': Split WipeData into PreWipeData and PostWipeData.
| * | | | | | | | | | | | am 0005f89c: Split WipeData into PreWipeData and PostWipeData.Elliott Hughes2015-06-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0005f89c31dfc2ca9053512900571620a0eba842': Split WipeData into PreWipeData and PostWipeData.
| | * | | | | | | | | | | Split WipeData into PreWipeData and PostWipeData.Elliott Hughes2015-06-102-24/+22
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/21760064 Change-Id: Idde268fe4d7e27586ca4469de16783f1ffdc5069 (cherry picked from commit 945548ef7b3eee5dbfb46f6291465d4b0b6d02e1)
* | | | | | | | | | | | am 12c8ea68: am e21ff08e: am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData."Elliott Hughes2015-06-112-24/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '12c8ea6827f2de5b4376524790dd9d2c9d6ef6ad': Split WipeData into PreWipeData and PostWipeData.
| * | | | | | | | | | | am e21ff08e: am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData."Elliott Hughes2015-06-112-24/+22
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e21ff08ea6a94bcd751a3cb0e6123275e0f18a2b': Split WipeData into PreWipeData and PostWipeData.
| | * | | | | | | | | | am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData."Elliott Hughes2015-06-102-24/+22
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a1009c346827c89f35d4feb011d01dd18de1b134': Split WipeData into PreWipeData and PostWipeData.
| | | * | | | | | | | | Merge "Split WipeData into PreWipeData and PostWipeData."Elliott Hughes2015-06-102-24/+22
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Split WipeData into PreWipeData and PostWipeData.Elliott Hughes2015-06-102-24/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/21760064 Change-Id: Idde268fe4d7e27586ca4469de16783f1ffdc5069
* | | | | | | | | | | | | am a66cdf40: am 915fc970: am 280cb6e9: Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-1/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a66cdf40c3d9ee8248049ce076673e3fe96a7080': Zero blocks before BLKDISCARD
| * | | | | | | | | | | | am 915fc970: am 280cb6e9: Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-1/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '915fc970d1a5181496f846cd8673716966ddf6fb': Zero blocks before BLKDISCARD
| | * | | | | | | | | | | am 280cb6e9: Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-1/+17
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '280cb6e90c3379072d7677101564b23dfb70182c': Zero blocks before BLKDISCARD
| | | * | | | | | | | | | Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-1/+17
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Zero blocks before BLKDISCARDSami Tolvanen2015-06-101-1/+17
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to observed BLKDISCARD flakiness, overwrite blocks that we want to discard with zeros first to avoid later issues with dm-verity if BLKDISCARD is not successful. Bug: 20614277 Bug: 20881595 Change-Id: I4f6f2db39db990879ff10468c9db41606497bd6f
* | | | | | | | | | | | | am 11cad65d: am 059e391f: am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD""Sami Tolvanen2015-06-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '11cad65d2a2b829d5bae02589c6f1d167cf4e53f': Revert "Zero blocks before BLKDISCARD"
| * | | | | | | | | | | | am 059e391f: am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD""Sami Tolvanen2015-06-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '059e391f9eac7fd2d152da79fbfac9b0bb5a2fad': Revert "Zero blocks before BLKDISCARD"
| | * | | | | | | | | | | am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD""Sami Tolvanen2015-06-101-5/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6f6097a7d59ae8443d7c7e5e39ecdc43b77f3ab': Revert "Zero blocks before BLKDISCARD"
| | | * | | | | | | | | | Merge "Revert "Zero blocks before BLKDISCARD""Sami Tolvanen2015-06-101-5/+9
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Revert "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 96392b97f6bf1670d478494fb6df89a3410e53fa. Change-Id: I77acc27158bad3cd8948390a3955197646a43a31
* | | | | | | | | | | | | am 758f56ef: am 6abd52f6: Revert "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-5/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '758f56efd5401e508fecfd1ad26813ab3e5f3df8': Revert "Zero blocks before BLKDISCARD"
| * | | | | | | | | | | | am 6abd52f6: Revert "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-5/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6abd52f62be24981398a99ebefc8717eb2294f97': Revert "Zero blocks before BLKDISCARD"
| | * | | | | | | | | | | Revert "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-101-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 604c583c9dd3d47906b1a57c14a7e9650df7471e. Change-Id: I2b0b283dc3f44bae55c5e9f7231d7c712630c2b5
* | | | | | | | | | | | | am 8ee89e7b: am b89452ef: am 1a03b400: Merge "uncrypt: Write status when it reboots to factory reset"Tao Bao2015-06-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8ee89e7b60e4b6c51a810b0f121a18dc079585e4': uncrypt: Write status when it reboots to factory reset
| * | | | | | | | | | | | am b89452ef: am 1a03b400: Merge "uncrypt: Write status when it reboots to factory reset"Tao Bao2015-06-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b89452efa8d1a17ab67301ed87083bd12f09cf0a': uncrypt: Write status when it reboots to factory reset
| | * | | | | | | | | | | am 1a03b400: Merge "uncrypt: Write status when it reboots to factory reset"Tao Bao2015-06-101-7/+10
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a03b4009095f0e766da19338e4681d715feeb90': uncrypt: Write status when it reboots to factory reset
| | | * | | | | | | | | | Merge "uncrypt: Write status when it reboots to factory reset"Tao Bao2015-06-101-7/+10
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | uncrypt: Write status when it reboots to factory resetTao Bao2015-06-101-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When it reboots into recovery for a factory reset, it still needs to write the uncrypt status (-1) to the pipe. Bug: 21511893 (cherry picked from commit 2c2cae8a4a18b85043bb6260a59ac7d1589016bf) Change-Id: Ia5a75c5edf3afbd916153da1b4de4db2f00d0209
* | | | | | | | | | | | | | am 5a1aa4c7: am 2880e0fc: (-s ours) am 2cf180f6: Merge "Separate uncrypt into two modes"Tao Bao2015-06-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a1aa4c789335d1750a421ea5244663d20438cea': Separate uncrypt into two modes
| * | | | | | | | | | | | | am 2880e0fc: (-s ours) am 2cf180f6: Merge "Separate uncrypt into two modes"Tao Bao2015-06-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2880e0fc5fe0f485209c49f1a2474b6d6ad46148': Separate uncrypt into two modes
| | * | | | | | | | | | | | am 2cf180f6: Merge "Separate uncrypt into two modes"Tao Bao2015-06-102-95/+92
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2cf180f6cc3275592f82a57ab98b72723937e0fb': Separate uncrypt into two modes
| | | * | | | | | | | | | | Merge "Separate uncrypt into two modes"Tao Bao2015-06-102-95/+92
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Separate uncrypt into two modesTao Bao2015-06-102-95/+92
| | | | | |_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uncrypt needs to be triggered to prepare the OTA package before rebooting into the recovery. Separate uncrypt into two modes. In mode 1, it uncrypts the OTA package, but will not reboot the device. In mode 2, it wipes the /misc partition and reboots. Needs matching changes in frameworks/base, system/core and external/sepolicy to work properly. Bug: 20012567 Bug: 20949086 (cherry picked from commit 158e11d6738a751b754d09df7275add589c31191) Change-Id: I349f6d368a0d6f6ee4332831c4cd4075a47426ff
* | | | | | | | | | | | | am 9df159da: am 604c583c: Zero blocks before BLKDISCARDSami Tolvanen2015-06-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9df159da877cad258dea99d7c2d24ced3797ff40': Zero blocks before BLKDISCARD
| * | | | | | | | | | | | am 604c583c: Zero blocks before BLKDISCARDSami Tolvanen2015-06-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '604c583c9dd3d47906b1a57c14a7e9650df7471e': Zero blocks before BLKDISCARD
| | * | | | | | | | | | | Zero blocks before BLKDISCARDSami Tolvanen2015-06-091-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to observed BLKDISCARD flakiness, overwrite blocks that we want to discard with zeros first to avoid later issues with dm-verity if BLKDISCARD is not successful. Bug: 20614277 Bug: 20881595 Change-Id: I0280fe115b020dcab35f49041fb55b7f8e793da3 (cherry picked from commit 96392b97f6bf1670d478494fb6df89a3410e53fa)
* | | | | | | | | | | | | am 1692fc8b: am 2fd12979: am 69608fe7: Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-091-9/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1692fc8bcba768cedd8bd5cc2a9875d354df1fcd': Zero blocks before BLKDISCARD
| * | | | | | | | | | | | am 2fd12979: am 69608fe7: Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-091-9/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2fd12979eac8987d4aaa89b56c508a710450c33d': Zero blocks before BLKDISCARD
| | * | | | | | | | | | | am 69608fe7: Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-091-9/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '69608fe7548727ee765c89f69a6861479f391487': Zero blocks before BLKDISCARD
| | | * | | | | | | | | | Merge "Zero blocks before BLKDISCARD"Sami Tolvanen2015-06-091-9/+5
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | / / / / / / / | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Zero blocks before BLKDISCARDSami Tolvanen2015-06-091-9/+5
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to observed BLKDISCARD flakiness, overwrite blocks that we want to discard with zeros first to avoid later issues with dm-verity if BLKDISCARD is not successful. Bug: 20614277 Bug: 20881595 Change-Id: I0280fe115b020dcab35f49041fb55b7f8e793da3
* | | | | | | | | | | am db553d5d: am 7baa13f6: am 3f9db6af: Merge "recovery: Switch to clang"Tao Bao2015-06-0413-11/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db553d5d5a3b413bf37339f735b3e8f2ad6d93b8': recovery: Switch to clang
| * | | | | | | | | | am 7baa13f6: am 3f9db6af: Merge "recovery: Switch to clang"Tao Bao2015-06-0413-11/+38
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7baa13f6d6ffa77e35e3596018efa5ca9a1febf7': recovery: Switch to clang
| | * | | | | | | | | am 3f9db6af: Merge "recovery: Switch to clang"Tao Bao2015-06-0413-11/+38
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f9db6af3d8f8659637da7288e9e2bceda4366d0': recovery: Switch to clang
| | | * | | | | | | | Merge "recovery: Switch to clang"Tao Bao2015-06-0413-11/+38
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | recovery: Switch to clangTao Bao2015-06-0313-11/+38
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And a few trival fixes to suppress warnings. Change-Id: I38734b5f4434643e85feab25f4807b46a45d8d65
* | | | | | | | | | | am 3ed20cff: am 028d216c: am 227069d7: Merge "Fix build: fprintf without modifier"Tao Bao2015-06-031-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3ed20cffa685e4f89cdfdf71cd19058aa4137a08': Fix build: fprintf without modifier
| * | | | | | | | | | am 028d216c: am 227069d7: Merge "Fix build: fprintf without modifier"Tao Bao2015-06-031-2/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '028d216c83f80673a125d946d555d43418307c81': Fix build: fprintf without modifier
| | * | | | | | | | | am 227069d7: Merge "Fix build: fprintf without modifier"Tao Bao2015-06-031-2/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '227069d77f90aa7965d4cd5ab4f4a5302194fc73': Fix build: fprintf without modifier
| | | * | | | | | | | Merge "Fix build: fprintf without modifier"Tao Bao2015-06-031-2/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix build: fprintf without modifierTao Bao2015-06-031-2/+1
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I66ae21a25a25fa3c70837bc54a7d406182d4cf37
* | | | | | | | | | | am 5393149d: am d107e6dc: am a69e608a: Merge "Log update outputs in order"Tao Bao2015-06-036-13/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5393149d53785cc8a690b93ca4f0db490d216937': Log update outputs in order
| * | | | | | | | | | am d107e6dc: am a69e608a: Merge "Log update outputs in order"Tao Bao2015-06-036-13/+44
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd107e6dc104dfb6e5043cedaf348f354f7cd46cc': Log update outputs in order
| | * | | | | | | | | am a69e608a: Merge "Log update outputs in order"Tao Bao2015-06-036-13/+44
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a69e608a521f7818cc0f17ba86710bd5b18137f2': Log update outputs in order
| | | * | | | | | | | Merge "Log update outputs in order"Tao Bao2015-06-036-13/+44
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Log update outputs in orderTao Bao2015-06-036-13/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although stdout and stderr are both redirected to log file with no buffering, we are seeing some outputs are mixed in random order. This is because ui_print commands from the updater are passed to the recovery binary via a pipe, which may interleave with other outputs that go to stderr directly. In recovery, adding ui::PrintOnScreenOnly() function to handle ui_print command, which skips printing to stdout. Meanwhile, updater prints the contents to stderr in addition to piping them to recovery. Change-Id: Idda93ea940d2e23a0276bb8ead4aa70a3cb97700
* | | | | | | | | | | | am 2c51ec95: am 02b64725: Merge "uncrypt: Write status when it reboots to factory reset" into mnc-devTao Bao2015-06-011-7/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2c51ec953c434992ea4d64001a54ec08f8543984': uncrypt: Write status when it reboots to factory reset
| * | | | | | | | | | | am 02b64725: Merge "uncrypt: Write status when it reboots to factory reset" into mnc-devTao Bao2015-06-011-7/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '02b6472546b899ebc16029371eb75364059871d2': uncrypt: Write status when it reboots to factory reset
| | * | | | | | | | | | Merge "uncrypt: Write status when it reboots to factory reset" into mnc-devTao Bao2015-05-301-7/+10
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | uncrypt: Write status when it reboots to factory resetTao Bao2015-05-291-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When it reboots into recovery for a factory reset, it still needs to write the uncrypt status (-1) to the pipe. Bug: 21511893 Change-Id: I1a725820f1e1875146e49b5a6f28af2fbf284fc7
* | | | | | | | | | | | | am 7132e792: am b5dabd25: Really don\'t use TEMP_FAILURE_RETRY with close in recovery.Elliott Hughes2015-06-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7132e79266f827b5420f6a6df399e890e0501a62': Really don't use TEMP_FAILURE_RETRY with close in recovery.
| * | | | | | | | | | | | am b5dabd25: Really don\'t use TEMP_FAILURE_RETRY with close in recovery.Elliott Hughes2015-06-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5dabd25e1d04ce134837b49fbef889e511d4d35': Really don't use TEMP_FAILURE_RETRY with close in recovery.
| | * | | | | | | | | | | Really don't use TEMP_FAILURE_RETRY with close in recovery.Elliott Hughes2015-05-291-1/+1
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I missed one last time. Bug: http://b/20501816 Change-Id: I9896ee2704237d61ee169f898680761e946e0a56 (cherry picked from commit b3ac676192a093c561b7f15064cbd67733407b12)
* | | | | | | | | | | | am 07ec625a: am 92eea1bc: Handle BLKDISCARD failuresSami Tolvanen2015-06-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07ec625a61263ea760db93c106d966d4406fbc54': Handle BLKDISCARD failures
| * | | | | | | | | | | am 92eea1bc: Handle BLKDISCARD failuresSami Tolvanen2015-06-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '92eea1bc414a7b6faedaf812c33ede17403fcaf7': Handle BLKDISCARD failures
| | * | | | | | | | | | Handle BLKDISCARD failuresSami Tolvanen2015-05-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the block updater, if BLKDISCARD fails, the error is silently ignored and some of the blocks may not be erased. This means the target partition will have inconsistent contents. If the ioctl fails, return an error and abort the update. Bug: 20614277 Change-Id: I33867ba9337c514de8ffae59f28584b285324067 (cherry picked from commit cc2428c8181d18c9a88db908fa4eabd2db5601ad)
* | | | | | | | | | | | am 8339bc67: am 5944bcd8: am 1441a965: Merge "Really don\'t use TEMP_FAILURE_RETRY with close in recovery."Elliott Hughes2015-05-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8339bc672a0c5a31d286fb55ff22341d73efc119': Really don't use TEMP_FAILURE_RETRY with close in recovery.
| * | | | | | | | | | | am 5944bcd8: am 1441a965: Merge "Really don\'t use TEMP_FAILURE_RETRY with close in recovery."Elliott Hughes2015-05-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5944bcd8eba6f012c1439972c050a2dc874765ae': Really don't use TEMP_FAILURE_RETRY with close in recovery.
| | * | | | | | | | | | am 1441a965: Merge "Really don\'t use TEMP_FAILURE_RETRY with close in recovery."Elliott Hughes2015-05-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1441a9654feee7e32ec6b39b1992c27635feb50f': Really don't use TEMP_FAILURE_RETRY with close in recovery.
| | | * | | | | | | | | Merge "Really don't use TEMP_FAILURE_RETRY with close in recovery."Elliott Hughes2015-05-291-1/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Really don't use TEMP_FAILURE_RETRY with close in recovery.Elliott Hughes2015-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I missed one last time. Bug: http://b/20501816 Change-Id: I9896ee2704237d61ee169f898680761e946e0a56
* | | | | | | | | | | | | am f827034f: am eec204be: am 74f5e0e0: Merge "Use f_bavail to calculate free space"Tao Bao2015-05-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f827034fe191b02fd25bd605cdb57816d023446a': Use f_bavail to calculate free space
| * | | | | | | | | | | | am eec204be: am 74f5e0e0: Merge "Use f_bavail to calculate free space"Tao Bao2015-05-291-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eec204be63ed115f6a8fec941224fad3d5b6a720': Use f_bavail to calculate free space
| | * | | | | | | | | | | am 74f5e0e0: Merge "Use f_bavail to calculate free space"Tao Bao2015-05-291-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '74f5e0e09e16ba38d007fdc4aeede20129c817bc': Use f_bavail to calculate free space
| | | * | | | | | | | | | Merge "Use f_bavail to calculate free space"Tao Bao2015-05-291-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Use f_bavail to calculate free spacecaozhiyuan2015-05-291-1/+1
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failures are seen on devices with Linux 3.10. And they are mainly due to this change: https://lwn.net/Articles/546473/ The blocks reserved in this change is not the same thing as what we think are reserved for common usage of root user. And this part is included in free blocks but not in available blocks. Change-Id: Ib29e12d775b86ef657c0af7fa7a944d2b1e12dc8
* | | | | | | | | | | | | am 127ab1fc: resolved conflicts for merge of 158e11d6 to mnc-dev-plus-aospTao Bao2015-05-292-95/+92
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '127ab1fc2d6eab382d4464bc1b5b6cbd30bbc6d1': Separate uncrypt into two modes
| * | | | | | | | | | | | resolved conflicts for merge of 158e11d6 to mnc-dev-plus-aospTao Bao2015-05-292-95/+92
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I164cdc4915b6ca1b623b206c0ccbb12e0fc3fa77
| | * | | | | | | | | | | Separate uncrypt into two modesTao Bao2015-05-282-98/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uncrypt needs to be triggered to prepare the OTA package before rebooting into the recovery. Separate uncrypt into two modes. In mode 1, it uncrypts the OTA package, but will not reboot the device. In mode 2, it wipes the /misc partition and reboots. Needs matching changes in frameworks/base, system/core and external/sepolicy to work properly. Bug: 20012567 Bug: 20949086 Change-Id: I14d25cb62770dd405cb56824d05d649c3a94f315
* | | | | | | | | | | | | am e938682e: am cd391c23: am aa4df5c4: Merge "Handle BLKDISCARD failures"Sami Tolvanen2015-05-281-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e938682e0ed9bc326b940bba31dc0c8472e81848': Handle BLKDISCARD failures
| * | | | | | | | | | | | am cd391c23: am aa4df5c4: Merge "Handle BLKDISCARD failures"Sami Tolvanen2015-05-281-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd391c23882cfa876c06fdf26146469489f41e8b': Handle BLKDISCARD failures
| | * | | | | | | | | | | am aa4df5c4: Merge "Handle BLKDISCARD failures"Sami Tolvanen2015-05-281-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa4df5c45b99438282db3a94cb7682c480e0eccd': Handle BLKDISCARD failures
| | | * | | | | | | | | | Merge "Handle BLKDISCARD failures"Sami Tolvanen2015-05-281-2/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Handle BLKDISCARD failuresSami Tolvanen2015-05-281-2/+1
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the block updater, if BLKDISCARD fails, the error is silently ignored and some of the blocks may not be erased. This means the target partition will have inconsistent contents. If the ioctl fails, return an error and abort the update. Bug: 20614277 Change-Id: I33867ba9337c514de8ffae59f28584b285324067
* | | | | | | | | | | | am d026a28c: am 9a5e2a26: am f272b9e7: Merge "Clean up the sleep()\'s after poking init services"Tao Bao2015-05-283-13/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd026a28c22dfb15728b6db88d5b8e9b093de2fd7': Clean up the sleep()'s after poking init services
| * | | | | | | | | | | am 9a5e2a26: am f272b9e7: Merge "Clean up the sleep()\'s after poking init services"Tao Bao2015-05-283-13/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a5e2a2611997d7803f079b8adb3535b6abc80fb': Clean up the sleep()'s after poking init services
| | * | | | | | | | | | am f272b9e7: Merge "Clean up the sleep()\'s after poking init services"Tao Bao2015-05-283-13/+20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f272b9e777de92f96b9298889bf145e40c5db2e3': Clean up the sleep()'s after poking init services
| | | * | | | | | | | | Merge "Clean up the sleep()'s after poking init services"Tao Bao2015-05-283-13/+20
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Clean up the sleep()'s after poking init servicesTao Bao2015-05-273-13/+20
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I77564fe5c59e604f1377b278681b7d1bff53a77a
* | | | | | | | | | | | am e6f54e74: am 7b126d77: am 73151b51: Merge "recovery: change the way of rebooting when using power key combo"Tao Bao2015-05-281-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6f54e743a5919549431d28667df5c5bd4500e97': recovery: change the way of rebooting when using power key combo
| * | | | | | | | | | | am 7b126d77: am 73151b51: Merge "recovery: change the way of rebooting when using power key combo"Tao Bao2015-05-281-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b126d77e85fce7f34f3888bfa34081d7d347b02': recovery: change the way of rebooting when using power key combo
| | * | | | | | | | | | am 73151b51: Merge "recovery: change the way of rebooting when using power key combo"Tao Bao2015-05-271-1/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '73151b5101c132091d5853dd635b3fc941f242dc': recovery: change the way of rebooting when using power key combo
| | | * | | | | | | | | Merge "recovery: change the way of rebooting when using power key combo"Tao Bao2015-05-271-1/+3
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | recovery: change the way of rebooting when using power key comboGaelle Nassiet2015-05-271-1/+3
| | | | | |/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The power key combo allow to reboot from recovery mode by pressing power button 7 times in a row. It calls directly the function android_reboot() and lead to permission denial errors because of SE Linux rules enforcement. The right way to reboot from recovery is to set the property "sys.powerctl" and let init handle it. Change-Id: Ic7b81e446c3ee13dfbad10cda13a6a1f93123b76 Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
* | | | | | | | | | | | am 8af11cff: am 6f6e5bb8: am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo""Nick Kralevich2015-05-271-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8af11cffeb3ebe44300ce9066b547d35ab0c6815': Revert "recovery: change the way of rebooting when using power key combo"
| * | | | | | | | | | | am 6f6e5bb8: am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo""Nick Kralevich2015-05-271-2/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f6e5bb89bf7019b57fc746de76913141b999c59': Revert "recovery: change the way of rebooting when using power key combo"
| | * | | | | | | | | | am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo""Nick Kralevich2015-05-271-2/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '41928ce61da9b4e328f361f8295f83bd1149d430': Revert "recovery: change the way of rebooting when using power key combo"
| | | * | | | | | | | | Merge "Revert "recovery: change the way of rebooting when using power key combo""Nick Kralevich2015-05-271-2/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Revert "recovery: change the way of rebooting when using power key combo"Nick Kralevich2015-05-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code doesn't compile: bootable/recovery/ui.cpp: In member function 'void RecoveryUI::ProcessKey(int, int)': bootable/recovery/ui.cpp:177:60: error: 'property_set' was not declared in this scope property_set(ANDROID_RB_PROPERTY, "reboot,"); ^ make: *** [out/target/product/generic/obj/EXECUTABLES/recovery_intermediates/ui.o] Error 1 This reverts commit 074c1c2312746aba29e1ffdf133685c8213c7378. Change-Id: I3e0a24279e202df29308ce41eaacc86bfde89e5a
* | | | | | | | | | | | | am f0e2927d: am 6d1d7ffa: am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo"Nick Kralevich2015-05-271-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f0e2927d7c534693bb06a675fde08f2fdf423669': recovery: change the way of rebooting when using power key combo
| * | | | | | | | | | | | am 6d1d7ffa: am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo"Nick Kralevich2015-05-271-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d1d7ffa051a3aaba40c9ca2ea7d68c0465e0a52': recovery: change the way of rebooting when using power key combo
| | * | | | | | | | | | | am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo"Nick Kralevich2015-05-271-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b48bdbeda03af04ec8e0d52f6af680a9062eb916': recovery: change the way of rebooting when using power key combo
| | | * | | | | | | | | | Merge "recovery: change the way of rebooting when using power key combo"Nick Kralevich2015-05-271-1/+2
| | | |\| | | | | | | | | | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | recovery: change the way of rebooting when using power key comboGaelle Nassiet2015-05-271-1/+2
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The power key combo allow to reboot from recovery mode by pressing power button 7 times in a row. It calls directly the function android_reboot() and lead to permission denial errors because of SE Linux rules enforcement. The right way to reboot from recovery is to set the property "sys.powerctl" and let init handle it. Change-Id: I5a6c3c49b27cef305815cef96da729390e19c9bc Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
* | | | | | | | | | | am 9e9cbc9b: am 0b1d1574: am a8cd96ad: Merge "Stop using libstdc++."Dan Albert2015-05-203-5/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9e9cbc9bbc9e87be3b83a471c02dbd21396fb484': Stop using libstdc++.
| * | | | | | | | | | am 0b1d1574: am a8cd96ad: Merge "Stop using libstdc++."Dan Albert2015-05-203-5/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0b1d15742f4cc7f930981fc63ee74b5df51ce719': Stop using libstdc++.
| | * | | | | | | | | am a8cd96ad: Merge "Stop using libstdc++."Dan Albert2015-05-203-5/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8cd96adeeb530eda74e435e626900a3a76844a7': Stop using libstdc++.
| | | * | | | | | | | Merge "Stop using libstdc++."Dan Albert2015-05-203-5/+3
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Stop using libstdc++.Dan Albert2015-05-193-5/+3
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are already getting libc++, so it isn't necessary. If any of the other static libraries (such as adb) use new or delete from libc++, there will be symbol collisions. Change-Id: I55e43ec60006d3c2403122fa1174bde06f18e09f
* | | | | | | | | | | am b135645c: am 6dc1e6a6: am 6253753a: Merge "Add error and range checks to parse_range"Sami Tolvanen2015-05-181-10/+71
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b135645c31bdb1f969453623c1e3f4b45508779f': Add error and range checks to parse_range
| * | | | | | | | | | am 6dc1e6a6: am 6253753a: Merge "Add error and range checks to parse_range"Sami Tolvanen2015-05-181-10/+71
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6dc1e6a6ef943abf73f7b78f076fe395dc509c86': Add error and range checks to parse_range
| | * | | | | | | | | am 6253753a: Merge "Add error and range checks to parse_range"Sami Tolvanen2015-05-181-10/+71
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6253753ab9b8c8912f31aeb5cc2877a856ecfe82': Add error and range checks to parse_range
| | | * | | | | | | | Merge "Add error and range checks to parse_range"Sami Tolvanen2015-05-181-10/+71
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Add error and range checks to parse_rangeSami Tolvanen2015-05-151-10/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only trusted input is passed to parse_range, but check for invalid input to catch possible problems in transfer lists. Bug: 21033983 Bug: 21034030 Bug: 21034172 Bug: 21034406 Change-Id: Ia17537a2d23d5f701522fbc42ed38924e1ee3366
* | | | | | | | | | | | am 621fa7aa: am 1857a7f5: Don\'t use TEMP_FAILURE_RETRY on close in recovery.Elliott Hughes2015-05-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '621fa7aaf72da2243328a5b9b92130011e0f5c7f': Don't use TEMP_FAILURE_RETRY on close in recovery.
| * | | | | | | | | | | am 1857a7f5: Don\'t use TEMP_FAILURE_RETRY on close in recovery.Elliott Hughes2015-05-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1857a7f57929a3bb4c831199b702059b259b0e3e': Don't use TEMP_FAILURE_RETRY on close in recovery.
| | * | | | | | | | | | Don't use TEMP_FAILURE_RETRY on close in recovery.Elliott Hughes2015-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/20501816 Change-Id: I35efcd8dcec7a6492ba70602d380d9980cdda31f (cherry picked from commit b47afedb42866e85b76822736d915afd371ef5f0)
* | | | | | | | | | | | am 0b1e527a: am 09050fc9: am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery."Elliott Hughes2015-05-161-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0b1e527a804b8593d352e00738ed57dafd4b3f45': Don't use TEMP_FAILURE_RETRY on close in recovery.
| * | | | | | | | | | | am 09050fc9: am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery."Elliott Hughes2015-05-161-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '09050fc92ef94a5ea0ee84f09f511850424f9216': Don't use TEMP_FAILURE_RETRY on close in recovery.
| | * | | | | | | | | | am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery."Elliott Hughes2015-05-161-2/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd7d9d8374f45c7e2eb14d8dbabf3cf7c221a5b8': Don't use TEMP_FAILURE_RETRY on close in recovery.
| | | * | | | | | | | | Merge "Don't use TEMP_FAILURE_RETRY on close in recovery."Elliott Hughes2015-05-161-2/+2
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Don't use TEMP_FAILURE_RETRY on close in recovery.Elliott Hughes2015-05-161-2/+2
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/20501816 Change-Id: I35efcd8dcec7a6492ba70602d380d9980cdda31f
* | | | | | | | | | | am 1fce2426: am 5bb8d551: am 3badd563: Merge "init sets the default PATH itself, better."Elliott Hughes2015-05-131-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1fce242653db7dbeca07523871175c758a47eea1': init sets the default PATH itself, better.
| * | | | | | | | | | am 5bb8d551: am 3badd563: Merge "init sets the default PATH itself, better."Elliott Hughes2015-05-131-1/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5bb8d55180db37bbfaedccc2261a2f55f21c4b73': init sets the default PATH itself, better.
| | * | | | | | | | | am 3badd563: Merge "init sets the default PATH itself, better."Elliott Hughes2015-05-121-1/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3badd56326422a79b5b09a98fc0282d915cf5e32': init sets the default PATH itself, better.
| | | * | | | | | | | Merge "init sets the default PATH itself, better."Elliott Hughes2015-05-121-1/+0
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | init sets the default PATH itself, better.Elliott Hughes2015-05-121-1/+0
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes 'su' and 'strace' in the recovery image. Change-Id: I83c2664d32a15da92bb6092fbdfc772184013c88
* | | | | | | | | | | am 9cd94f87: am cfe46542: am 3128176e: Merge "Fix build following adb change."Dan Albert2015-05-081-5/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9cd94f87283159d80a51e1fce6ff68c97158b7ae': Fix build following adb change.
| * | | | | | | | | | am cfe46542: am 3128176e: Merge "Fix build following adb change."Dan Albert2015-05-081-5/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cfe46542e424e5e2159cf5212f72ae8f53c589a6': Fix build following adb change.
| | * | | | | | | | | am 3128176e: Merge "Fix build following adb change."Dan Albert2015-05-081-5/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3128176e7d8f5cee4afdff3b5fdcadbe66ef97af': Fix build following adb change.
| | | * | | | | | | | Merge "Fix build following adb change."Dan Albert2015-05-081-5/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix build following adb change.Dan Albert2015-05-081-5/+1
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2e0fb7e880e205b0bca324ff53ffdb5df9e34baf
* | | | | | | | | | | am 81ad2bf8: am 3257155e: am 77a2c883: Merge "Add an alternate screen for viewing recovery logs."Elliott Hughes2015-05-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81ad2bf86354638cfe5d7fa1eeb84882d69be19d': Add an alternate screen for viewing recovery logs.
| * | | | | | | | | | am 3257155e: am 77a2c883: Merge "Add an alternate screen for viewing recovery logs."Elliott Hughes2015-05-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3257155e8957b8cba4b59d7928990f1642183415': Add an alternate screen for viewing recovery logs.
| | * | | | | | | | | am 77a2c883: Merge "Add an alternate screen for viewing recovery logs."Elliott Hughes2015-05-073-55/+79
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '77a2c8839f2de5947184605815015bc2696c3207': Add an alternate screen for viewing recovery logs.
| | | * | | | | | | | Merge "Add an alternate screen for viewing recovery logs."Elliott Hughes2015-05-073-55/+79
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Add an alternate screen for viewing recovery logs.Elliott Hughes2015-05-073-55/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to go back and forth without losing current output. Also make the display more like regular more(1). Bug: http://b/20834540 Change-Id: Icc5703e9c8a378cc7072d8ebb79e34451267ee1b
* | | | | | | | | | | | am 92a13f56: am 25a67fde: am 7ff339ea: Merge "uncrypt: Switch to C++"Tao Bao2015-05-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '92a13f5697228c6460bf740ccce4021b8a5e0bc8': uncrypt: Switch to C++
| * | | | | | | | | | | am 25a67fde: am 7ff339ea: Merge "uncrypt: Switch to C++"Tao Bao2015-05-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '25a67fde9fe5ebaeb79dbb3edf0fc4857adf5da2': uncrypt: Switch to C++
| | * | | | | | | | | | am 7ff339ea: Merge "uncrypt: Switch to C++"Tao Bao2015-05-062-42/+40
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ff339ea1b36d46439e9255364cd9a4b2e73719a': uncrypt: Switch to C++
| | | * | | | | | | | | Merge "uncrypt: Switch to C++"Tao Bao2015-05-062-42/+40
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | uncrypt: Switch to C++Tao Bao2015-05-062-42/+40
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also apply some trivial changes like int -> bool and clean-ups. Change-Id: Ic55fc8b82d7e91b321f69d10175be23d5c04eb92
* | | | | | | | | | | am 11342f78: am df52e1e1: Add an alternate screen for viewing recovery logs.Elliott Hughes2015-05-073-55/+79
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '11342f78cf78fe10042feedcb4fc7390235ff347': Add an alternate screen for viewing recovery logs.
| * | | | | | | | | | am df52e1e1: Add an alternate screen for viewing recovery logs.Elliott Hughes2015-05-073-55/+79
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'df52e1e119804cc5e7d0b7f77a7d1bf42b2da9dc': Add an alternate screen for viewing recovery logs.
| | * | | | | | | | | Add an alternate screen for viewing recovery logs.Elliott Hughes2015-05-073-55/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to go back and forth without losing current output. Also make the display more like regular more(1). Bug: http://b/20834540 Change-Id: Icc5703e9c8a378cc7072d8ebb79e34451267ee1b (cherry picked from commit c049163234003ef463bca018920622bc8269c69b)
* | | | | | | | | | | am 2ab0a572: resolved conflicts for merge of 550bd340 to mnc-dev-plus-aospTao Bao2015-05-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2ab0a57211bbfe62f8730550b8456e17ce59d5cf': uncrypt: package on non-data partition should follow the right path
| * | | | | | | | | | resolved conflicts for merge of 550bd340 to mnc-dev-plus-aospTao Bao2015-05-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | Change-Id: Ia447435f1345a0bf9648d1d5593e276191d6a99c
| | * | | | | | | | | am aeb980bd: Merge "uncrypt: package on non-data partition should follow the right path"Tao Bao2015-05-061-20/+41
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aeb980bd8958e3c6e135835aa7d34b5c4e3a601b': uncrypt: package on non-data partition should follow the right path
| | | * | | | | | | | Merge "uncrypt: package on non-data partition should follow the right path"Tao Bao2015-05-061-20/+41
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | uncrypt: package on non-data partition should follow the right pathTao Bao2015-05-061-20/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the accidental change of behavior in [1]. OTA packages not on /data partition should still go through the path that has validity checks and wipe_misc() steps. [1]: commit eaf33654c1817bd665831a13c5bd0c04daabee02. Change-Id: Ice9a049f6259cd2368d2fb95a991f8a6a0120bdd
* | | | | | | | | | | | am a6fb5418: am 48150842: am 41c7ef54: Merge "Track adb_thread_create API change."Elliott Hughes2015-05-071-4/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a6fb541857d822939cada24574f566df87dda35d': Track adb_thread_create API change.
| * | | | | | | | | | | am 48150842: am 41c7ef54: Merge "Track adb_thread_create API change."Elliott Hughes2015-05-071-4/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '481508426cb258ebf809a9f46ec4f5689d0459ef': Track adb_thread_create API change.
| | * | | | | | | | | | am 41c7ef54: Merge "Track adb_thread_create API change."Elliott Hughes2015-05-051-4/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '41c7ef5400634508db5127ea45108cf94f8e36ab': Track adb_thread_create API change.
| | | * | | | | | | | | Merge "Track adb_thread_create API change."Elliott Hughes2015-05-051-4/+2
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Track adb_thread_create API change.Elliott Hughes2015-05-051-4/+2
| | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia3f30f3ba85c0246d4b667fb7723cfcdce299d4a
* | | | | | | | | | | | am d5148f35: am 185e8204: am c7f64fdf: Merge "Keep multiple kernel logs"Tao Bao2015-05-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd5148f35ec2bbbc3365568d1472a2bdc10fecb05': Keep multiple kernel logs
| * | | | | | | | | | | am 185e8204: am c7f64fdf: Merge "Keep multiple kernel logs"Tao Bao2015-05-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '185e8204c6e29e2177721a30c73928fb4e5382fa': Keep multiple kernel logs
| | * | | | | | | | | | am c7f64fdf: Merge "Keep multiple kernel logs"Tao Bao2015-05-051-82/+73
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c7f64fdf08b254ff94012c1815198b9635f508a7': Keep multiple kernel logs
| | | * | | | | | | | | Merge "Keep multiple kernel logs"Tao Bao2015-05-051-82/+73
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Keep multiple kernel logsTao Bao2015-05-051-82/+73
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we are keeping one copy of the kernel log (LAST_KMSG_FILE). This CL changes to keep up to KEEP_LOG_COUNT copies for kernel logs. Bug: http://b/18092237 Change-Id: I1bf5e230de3efd6a48a5b2ae5a34241cb4d9ca90
* | | | | | | | | | | am c017c597: am 3e8d28b5: uncrypt: Switch to C++Tao Bao2015-05-062-42/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c017c597b266605f23d3de7d956535e486ad76b1': uncrypt: Switch to C++
| * | | | | | | | | | am 3e8d28b5: uncrypt: Switch to C++Tao Bao2015-05-062-42/+40
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3e8d28b547cd75af3f77f38a7e2895d0dbd2e232': uncrypt: Switch to C++
| | * | | | | | | | | uncrypt: Switch to C++Tao Bao2015-05-062-42/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also apply some trivial changes like int -> bool and clean-ups. Change-Id: I5c6c42d34965305c394f4f2de78487bd1174992a (cherry picked from commit 381f455cac0905b023dde79625b06c27b6165dd0)
* | | | | | | | | | | am 8d312ed6: am 8853cb2f: uncrypt: package on non-data partition should follow the right pathTao Bao2015-05-061-20/+41
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8d312ed601d15123a442d8227df901160083f2a7': uncrypt: package on non-data partition should follow the right path
| * | | | | | | | | | am 8853cb2f: uncrypt: package on non-data partition should follow the right pathTao Bao2015-05-061-20/+41
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8853cb2f296adfdc57871e9482a8e97b0011b323': uncrypt: package on non-data partition should follow the right path
| | * | | | | | | | | uncrypt: package on non-data partition should follow the right pathTao Bao2015-05-061-20/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the accidental change of behavior in [1]. OTA packages not on /data partition should still go through the path that has validity checks and wipe_misc() steps. [1]: commit eaf33654c1817bd665831a13c5bd0c04daabee02. Change-Id: I3e86e19f06603bfe6ecc691c9aa66a8a8a79c5fb (cherry picked from commit fb4ccef1df4f0bd8fa830c750f2970dd2df9e51b)
* | | | | | | | | | | am 38fcdfe0: am 93cec9a0: Keep multiple kernel logsTao Bao2015-05-061-82/+73
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38fcdfe06cb45c1efc816ecc5e8ff82e5442d893': Keep multiple kernel logs
| * | | | | | | | | | am 93cec9a0: Keep multiple kernel logsTao Bao2015-05-051-82/+73
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93cec9a0c402d6ca5d41e10db738bb5f61b19be2': Keep multiple kernel logs
| | * | | | | | | | | Keep multiple kernel logsTao Bao2015-05-051-82/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we are keeping one copy of the kernel log (LAST_KMSG_FILE). This CL changes to keep up to KEEP_LOG_COUNT copies for kernel logs. Bug: http://b/18092237 Change-Id: Ied862b5b70cbbae7775f59c78c32ec62aeeca655 (cherry picked from commit bef39710ff50cedf6a4de8eb6c7802f66930aab4)
* | | | | | | | | | | am 6c3b7634: am 6d820f2c: Turn on text display for debuggable buildsTao Bao2015-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6c3b76344f3b64fe8150a191217f4a2ebb0d7d49': Turn on text display for debuggable builds
| * | | | | | | | | | am 6d820f2c: Turn on text display for debuggable buildsTao Bao2015-05-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d820f2c91f6cafcec5b378ae896b7118ca8921d': Turn on text display for debuggable builds
| | * | | | | | | | | Turn on text display for debuggable buildsTao Bao2015-05-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For userdebug and eng builds, turn on the text display automatically if no command is specified. (cherry-pick of 785d22c88cda46972331c04ebc9df97371a696da.) Bug: http://b/17489952 Change-Id: I38377c45f2a8e45ca788e5506695aa88c769cbcf
* | | | | | | | | | | am e9ce252c: am 0a7b9276: am f8f88321: Merge "Turn on text display for debuggable builds"Tao Bao2015-05-041-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e9ce252cf0f7b996a2e1977d30928b0812e371ba': Turn on text display for debuggable builds
| * | | | | | | | | | am 0a7b9276: am f8f88321: Merge "Turn on text display for debuggable builds"Tao Bao2015-05-041-0/+7
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a7b92762a42be7dd01da87b5f67a405f6f07d31': Turn on text display for debuggable builds
| | * | | | | | | | | am f8f88321: Merge "Turn on text display for debuggable builds"Tao Bao2015-05-041-0/+7
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f8f8832179003ad0a4e9359ef16e2f49d9f38345': Turn on text display for debuggable builds
| | | * | | | | | | | Merge "Turn on text display for debuggable builds"Tao Bao2015-05-041-0/+7
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Turn on text display for debuggable buildsTao Bao2015-05-041-0/+7
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For userdebug and eng builds, turn on the text display automatically if no command is specified. Bug: http://b/17489952 Change-Id: I3d42ba2848b968da12164ddfda915ca69dcecba1
* | | | | | | | | | | am 759febda: am 4cf34d5d: Fix mips64 minadbd_test build.Elliott Hughes2015-05-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '759febdabcf76ea5908f506e2e5c2ef77854111d': Fix mips64 minadbd_test build.
| * | | | | | | | | | am 4cf34d5d: Fix mips64 minadbd_test build.Elliott Hughes2015-05-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4cf34d5d297db4f7130a7f1472c394e38ea0e642': Fix mips64 minadbd_test build.
| | * | | | | | | | | Fix mips64 minadbd_test build.Elliott Hughes2015-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like the mips64 linker isn't as good as the others at GCing unused stuff, which means it needs libcutils. Change-Id: I5f768e44514350fb81e5360351db3e9cc4201702 (cherry picked from commit dbb20c48633e63c7c244e84f3fea76e083e225d7)
* | | | | | | | | | | am 007a7141: am 4b3004a6: am 59e1e3e7: Merge "Fix mips64 minadbd_test build."Elliott Hughes2015-05-021-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '007a71416b5f824fe7c77e53e2992a164003f37b': Fix mips64 minadbd_test build.
| * | | | | | | | | | am 4b3004a6: am 59e1e3e7: Merge "Fix mips64 minadbd_test build."Elliott Hughes2015-05-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b3004a6c93481e659647e7b40beb572f140683b': Fix mips64 minadbd_test build.
| | * | | | | | | | | am 59e1e3e7: Merge "Fix mips64 minadbd_test build."Elliott Hughes2015-05-021-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '59e1e3e78f53438cb5843d7e151dddb0d782328c': Fix mips64 minadbd_test build.
| | | * | | | | | | | Merge "Fix mips64 minadbd_test build."Elliott Hughes2015-05-021-1/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix mips64 minadbd_test build.Elliott Hughes2015-05-021-1/+1
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like the mips64 linker isn't as good as the others at GCing unused stuff, which means it needs libcutils. Change-Id: I5f768e44514350fb81e5360351db3e9cc4201702
* | | | | | | | | | | am 227dcf8a: am 15931924: Move minadb over to new API.Elliott Hughes2015-05-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '227dcf8af14faaef239f8d28ba46bc6b4ef229cf': Move minadb over to new API.
| * | | | | | | | | | am 15931924: Move minadb over to new API.Elliott Hughes2015-05-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15931924e1820d4c2bc9f9c0c7734c43c92b866b': Move minadb over to new API.
| | * | | | | | | | | Move minadb over to new API.Elliott Hughes2015-05-022-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I889bcf2222245c7665287513669cae8831e37081 (cherry picked from commit 4039933c62f52dda06e6f355cf42ac9b392d0888)
* | | | | | | | | | | am 0cd8f5b4: am 87ec73a2: Fix minadb_test build breakage.Elliott Hughes2015-05-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0cd8f5b429e15b89ec77bd26d3994b3508d3aebf': Fix minadb_test build breakage.
| * | | | | | | | | | am 87ec73a2: Fix minadb_test build breakage.Elliott Hughes2015-05-020-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '87ec73a264530f5fa19cde2598d5e65c4c67a686': Fix minadb_test build breakage.
| | * | | | | | | | | Fix minadb_test build breakage.Elliott Hughes2015-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I98bb900debb7d7dd57d3f8f84d605163ec192b03 (cherry picked from commit 3e7d82c621240bb80f9882c64377c4f5f3d97c7b)
* | | | | | | | | | | am 41e4f5ae: am c0537d68: am 6bc2d538: Merge "Move minadb over to new API."Elliott Hughes2015-05-022-13/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '41e4f5ae1ce47b475881ffded632d07e91f1ce19': Move minadb over to new API.
| * | | | | | | | | | am c0537d68: am 6bc2d538: Merge "Move minadb over to new API."Elliott Hughes2015-05-022-13/+9
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c0537d688529bd38e691ead93815ece29ad15b7b': Move minadb over to new API.
| | * | | | | | | | | am 6bc2d538: Merge "Move minadb over to new API."Elliott Hughes2015-05-022-13/+9
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6bc2d538ae304edbd6bf514cb61444844313032d': Move minadb over to new API.
| | | * | | | | | | | Merge "Move minadb over to new API."Elliott Hughes2015-05-022-13/+9
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Move minadb over to new API.Elliott Hughes2015-05-022-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I889bcf2222245c7665287513669cae8831e37081
* | | | | | | | | | | | am ea874f8f: am c67e89ad: am 30cea3dc: Merge "Fix minadb_test build breakage."Elliott Hughes2015-05-021-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea874f8fb70e98f5595ab2d582c31e9d79f300f7': Fix minadb_test build breakage.
| * | | | | | | | | | | am c67e89ad: am 30cea3dc: Merge "Fix minadb_test build breakage."Elliott Hughes2015-05-021-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c67e89ada5b8f549e8844e0b722d3310398bf4e8': Fix minadb_test build breakage.
| | * | | | | | | | | | am 30cea3dc: Merge "Fix minadb_test build breakage."Elliott Hughes2015-05-021-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '30cea3dcaf1dcf4be9954178f67b4f8dff0fb9f9': Fix minadb_test build breakage.
| | | * | | | | | | | | Merge "Fix minadb_test build breakage."Elliott Hughes2015-05-021-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Fix minadb_test build breakage.Elliott Hughes2015-05-021-1/+1
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I98bb900debb7d7dd57d3f8f84d605163ec192b03
* | | | | | | | | | | am 073e3381: am 2f5feedf: Check all lseek calls succeed.Elliott Hughes2015-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '073e3381a2755c08e9e108640ff576f18cdff118': Check all lseek calls succeed.
| * | | | | | | | | | am 2f5feedf: Check all lseek calls succeed.Elliott Hughes2015-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f5feedf1d705b53e5bf90c8b5207dd91f4522f1': Check all lseek calls succeed.
| | * | | | | | | | | Check all lseek calls succeed.Elliott Hughes2015-04-3014-128/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add missing TEMP_FAILURE_RETRYs on read, write, and lseek. Bug: http://b/20625546 Change-Id: I03b198e11c1921b35518ee2dd005a7cfcf4fd94b (cherry picked from commit 7bad7c4646ee8fd8d6e6ed0ffd3ddbb0c1b41a2f)
* | | | | | | | | | | am f6c7af28: am 34d3a3d0: am 34c7731a: Merge "Check all lseek calls succeed."Elliott Hughes2015-04-3014-128/+112
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6c7af289c2990bd16d422ae689317a938f77fdc': Check all lseek calls succeed.
| * | | | | | | | | | am 34d3a3d0: am 34c7731a: Merge "Check all lseek calls succeed."Elliott Hughes2015-04-3014-128/+112
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '34d3a3d074e977cace29797c428795e1de5b3223': Check all lseek calls succeed.
| | * | | | | | | | | am 34c7731a: Merge "Check all lseek calls succeed."Elliott Hughes2015-04-3014-128/+112
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '34c7731a0bb296a1289b85a83f53026117aa3677': Check all lseek calls succeed.
| | | * | | | | | | | Merge "Check all lseek calls succeed."Elliott Hughes2015-04-3014-128/+112
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Check all lseek calls succeed.Elliott Hughes2015-04-3014-128/+112
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add missing TEMP_FAILURE_RETRYs on read, write, and lseek. Bug: http://b/20625546 Change-Id: I03b198e11c1921b35518ee2dd005a7cfcf4fd94b
* | | | | | | | | | | am 15a2e46b: am f7466f9f: Stop using adb_strtok, and check argument validity.Elliott Hughes2015-04-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15a2e46bdc9674d114a0f22a0471f3c3c8bcf8b5': Stop using adb_strtok, and check argument validity.
| * | | | | | | | | | am f7466f9f: Stop using adb_strtok, and check argument validity.Elliott Hughes2015-04-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f7466f9f2334b0e9025e1c7ecf65b4d04a246b20': Stop using adb_strtok, and check argument validity.
| | * | | | | | | | | Stop using adb_strtok, and check argument validity.Elliott Hughes2015-04-281-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit ba45ddf37cf4543143af6b2e27fc1214f3dbe892) Change-Id: Iba4f77f7db54ca0184437bd8ea96abfadabc72a3
* | | | | | | | | | | am b1195d1c: am bc4e69fc: am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity."Elliott Hughes2015-04-281-9/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b1195d1c77fa8b5d49fc32ce0daca26f40af767d': Stop using adb_strtok, and check argument validity.
| * | | | | | | | | | am bc4e69fc: am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity."Elliott Hughes2015-04-281-9/+10
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / / | | | | | | | | | | * commit 'bc4e69fc2827d7b8648a30d3b29eca3cb886fc9a': Stop using adb_strtok, and check argument validity.
| | * | | | | | | | am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity."Elliott Hughes2015-04-281-9/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8c389e9c769c8632cf16c0794f1e84f49996077c': Stop using adb_strtok, and check argument validity.
| | | * | | | | | | Merge "Stop using adb_strtok, and check argument validity."Elliott Hughes2015-04-281-9/+10
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Stop using adb_strtok, and check argument validity.Elliott Hughes2015-04-281-9/+10
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I323ffda71b82cc939aed446f9c9fb86ca78df153
* | | | | | | | | | am 5c025ac5: (-s ours) am 599fc2c0: (-s ours) am c94fa0b0: (-s ours) DO NOT MERGE Revert "Erase PST partition if its marked to be erased."Andres Morales2015-04-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c025ac5c84c19e4eac6ca6e9f5c2f51e09add54': DO NOT MERGE Revert "Erase PST partition if its marked to be erased."
| * | | | | | | | | am 599fc2c0: (-s ours) am c94fa0b0: (-s ours) DO NOT MERGE Revert "Erase PST partition if its marked to be erased."Andres Morales2015-04-270-0/+0
|/| | | | | | | | | | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '599fc2c0edbeb2ce8f38905fd770dbd7f43e647c': DO NOT MERGE Revert "Erase PST partition if its marked to be erased."
| * | | | | | | | am c94fa0b0: (-s ours) DO NOT MERGE Revert "Erase PST partition if its marked to be erased."Andres Morales2015-04-260-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | * commit 'c94fa0b01b43709531dfbcdb94abb2a1cc23be3d': DO NOT MERGE Revert "Erase PST partition if its marked to be erased."
| | * | | | | | DO NOT MERGE Revert "Erase PST partition if its marked to be erased."Andres Morales2015-04-023-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 5a95719b: am 6725ebc7: Merge "Revert "Revert "init re-execs to set its security context now."""Elliott Hughes2015-04-241-7/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a95719bd9ac27d573388e6aa4b48715d9aa3d9e': Revert "Revert "init re-execs to set its security context now.""
| * | | | | | | am 6725ebc7: Merge "Revert "Revert "init re-execs to set its security context now."""Elliott Hughes2015-04-241-7/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '6725ebc7b41ae0702adb28d9b40fbd392c6bfb9a': Revert "Revert "init re-execs to set its security context now.""
| | * | | | | | Merge "Revert "Revert "init re-execs to set its security context now."""Elliott Hughes2015-04-241-7/+0
| | |\ \ \ \ \ \
| | | * | | | | | Revert "Revert "init re-execs to set its security context now.""Elliott Hughes2015-04-241-7/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c819dbe95bf80645178b0180f519ab2983da01a0. Bug: http://b/19702273 Change-Id: I5c75b148a12e644dd247a4df4f67dc9b4b9ff8cf
* | | | | | | | am f6c03a80: am c690332c: Merge "Revert "init re-execs to set its security context now.""Nick Kralevich2015-04-241-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6c03a80f08542afc82780f3b7cafe994d7a41e4': Revert "init re-execs to set its security context now."
| * | | | | | | am c690332c: Merge "Revert "init re-execs to set its security context now.""Nick Kralevich2015-04-241-0/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c690332c5e4008d0f58d7a356311a821ef07d0cf': Revert "init re-execs to set its security context now."
| | * | | | | | Merge "Revert "init re-execs to set its security context now.""Nick Kralevich2015-04-241-0/+7
| | |\ \ \ \ \ \
| | | * | | | | | Revert "init re-execs to set its security context now."Nick Kralevich2015-04-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shamu isn't booting now This reverts commit c57453d5377a13445c4b1d3f73c0e0ab19aa0c1e. Change-Id: I8efbf6260f5fcf983e5056fac6d03916415b944e
* | | | | | | | | am 7058b89f: am 38a82cac: Merge "init re-execs to set its security context now."Elliott Hughes2015-04-241-7/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7058b89f02bc367bc2cd4e9c3ee70404e71cf48c': init re-execs to set its security context now.
| * | | | | | | | am 38a82cac: Merge "init re-execs to set its security context now."Elliott Hughes2015-04-241-7/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38a82cace581a888c5bc475754a20d8e92992fb2': init re-execs to set its security context now.
| | * | | | | | | Merge "init re-execs to set its security context now."Elliott Hughes2015-04-241-7/+0
| | |\| | | | | |
| | | * | | | | | init re-execs to set its security context now.Elliott Hughes2015-04-241-7/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a014f8dddfe775159903b5d6fa632733fef692c
* | | | | | | | am 0391820c: am 0de2351e: Merge "Don\'t remove existing explicitly stashed blocks"Sami Tolvanen2015-04-171-10/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0391820cde1f27515e9fc8f556b72c3922af9d45': Don't remove existing explicitly stashed blocks
| * | | | | | | am 0de2351e: Merge "Don\'t remove existing explicitly stashed blocks"Sami Tolvanen2015-04-171-10/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0de2351e6a6be685e1d68661dcf5f4902898cacd': Don't remove existing explicitly stashed blocks
| | * | | | | | Merge "Don't remove existing explicitly stashed blocks"Sami Tolvanen2015-04-171-10/+28
| | |\ \ \ \ \ \
| | | * | | | | | Don't remove existing explicitly stashed blocksSami Tolvanen2015-04-171-10/+28
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When automatically stashing overlapping blocks, should the stash file already exist due to an explicit stash command, it's not safe to remove the stash file after the command has completed. Note that it is safe to assume that the stash file will remain in place during the execution of the next command, so we don't have take other measures to preserve overlapping blocks. The stash file itself will be removed by a free command when it's no longer needed. Bug: 20297065 Change-Id: I8ff1a798b94086adff183c5aac03260eb947ae2c
* | | | | | | | am 51f42b2d: am 4381767a: Merge "imgdiff: Avoid infinite loop if inflate fails"Tao Bao2015-04-161-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '51f42b2d20349490c62b9187bde317f25765e9b3': imgdiff: Avoid infinite loop if inflate fails
| * | | | | | | am 4381767a: Merge "imgdiff: Avoid infinite loop if inflate fails"Tao Bao2015-04-161-0/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4381767aa6410902e07376f62f66bbef83ebf2c4': imgdiff: Avoid infinite loop if inflate fails
| | * | | | | | Merge "imgdiff: Avoid infinite loop if inflate fails"Tao Bao2015-04-161-0/+9
| | |\ \ \ \ \ \
| | | * | | | | | imgdiff: Avoid infinite loop if inflate failsJohan Redestig2015-04-151-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Break out of the loop if inflate returns an error and print some details. Change-Id: Ie157cf943291b1a26f4523b17691dfcefbc881dc
* | | | | | | | | am 0a557b6b: am 7176a617: Merge "Don\'t use typedefs that hide *s."Elliott Hughes2015-04-158-59/+54
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a557b6bc2a26afd3cb3a2e3dd2fdaf175b09cce': Don't use typedefs that hide *s.
| * | | | | | | | am 7176a617: Merge "Don\'t use typedefs that hide *s."Elliott Hughes2015-04-158-59/+54
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7176a61718e7b45a8fde3a25eada0c9425d1dece': Don't use typedefs that hide *s.
| | * | | | | | | Merge "Don't use typedefs that hide *s."Elliott Hughes2015-04-158-59/+54
| | |\ \ \ \ \ \ \
| | | * | | | | | | Don't use typedefs that hide *s.Elliott Hughes2015-04-158-59/+54
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gr_surface was causing confusion for no good reason. Change-Id: If7120187f9a00dd16297877fc49352185a4d4ea6
* | | | | | | | | am 98bfb6f7: am 6e435abf: Merge "Move the menu header out of the menu."Elliott Hughes2015-04-158-66/+72
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '98bfb6f797220818a4018ef5f3aa65fc074c8fc4': Move the menu header out of the menu.
| * | | | | | | | am 6e435abf: Merge "Move the menu header out of the menu."Elliott Hughes2015-04-158-66/+72
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e435abfeb7256b5ea82ca37166acf36e3f98085': Move the menu header out of the menu.
| | * | | | | | | Merge "Move the menu header out of the menu."Elliott Hughes2015-04-158-66/+72
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Move the menu header out of the menu.Elliott Hughes2015-04-148-66/+72
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier for us to deal with arbitrary information at the top, and means that headers added by specific commands don't overwrite the default ones. Add the fingerprint back, but broken up so it fits even on sprout's display. Change-Id: Id71da79ab1aa455a611d72756a3100a97ceb4c1c
* | | | | | | | am cbdc7e84: am 17b032e1: Merge "Add missing \n after "Mounting /system." message."Elliott Hughes2015-04-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cbdc7e844a8dafbada50ca8bae9319b7bd7980f2': Add missing \n after "Mounting /system." message.
| * | | | | | | am 17b032e1: Merge "Add missing \n after "Mounting /system." message."Elliott Hughes2015-04-131-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '17b032e159779886f0151641a9aad5003debdce2': Add missing \n after "Mounting /system." message.
| | * | | | | | Merge "Add missing \n after "Mounting /system." message."Elliott Hughes2015-04-131-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Add missing \n after "Mounting /system." message.Elliott Hughes2015-04-131-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I280a478526f033f5c0041d7e8a818fce6177d732
* | | | | | | | am d7823c5d: am eab12de7: Merge "Remove unnecessary globals."Elliott Hughes2015-04-134-64/+55
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd7823c5dfed67b1e8b0e175e588fb2dc643ebc65': Remove unnecessary globals.
| * | | | | | | am eab12de7: Merge "Remove unnecessary globals."Elliott Hughes2015-04-134-64/+55
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eab12de70efb649ab33f7971e948251895d613fe': Remove unnecessary globals.
| | * | | | | | Merge "Remove unnecessary globals."Elliott Hughes2015-04-134-64/+55
| | |\ \ \ \ \ \
| | | * | | | | | Remove unnecessary globals.Elliott Hughes2015-04-134-64/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I76a042432aede08ceaf250319cf5eeb25d601150
* | | | | | | | | am 507630e9: am b68c4fc4: Merge "Treat KEY_ENTER the same as KEY_POWER in the pager."Elliott Hughes2015-04-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '507630e99cecddca3c22425a76634c8461faf46e': Treat KEY_ENTER the same as KEY_POWER in the pager.
| * | | | | | | | am b68c4fc4: Merge "Treat KEY_ENTER the same as KEY_POWER in the pager."Elliott Hughes2015-04-131-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b68c4fc42617acb97dde89f501caf8558a348b51': Treat KEY_ENTER the same as KEY_POWER in the pager.
| | * | | | | | | Merge "Treat KEY_ENTER the same as KEY_POWER in the pager."Elliott Hughes2015-04-131-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Treat KEY_ENTER the same as KEY_POWER in the pager.Elliott Hughes2015-04-131-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our long-press UI sends KEY_ENTER for long presses, which the long-press UI treats as equivalent to KEY_POWER in the regular UI. So anywhere we accept KEY_POWER we should accept KEY_ENTER too. Change-Id: I99d376c961887043cf02037c26d000c8ba4d66f9
* | | | | | | | am d56e0f37: am 0e3781ef: Merge "Rewritten file pager."Elliott Hughes2015-04-112-65/+88
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd56e0f377eab630b1fbedcf291954489fd4fa5e3': Rewritten file pager.
| * | | | | | | am 0e3781ef: Merge "Rewritten file pager."Elliott Hughes2015-04-112-65/+88
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e3781ef9af2df648f54eb2a7765bef7b6b5b22e': Rewritten file pager.
| | * | | | | | Merge "Rewritten file pager."Elliott Hughes2015-04-112-65/+88
| | |\ \ \ \ \ \
| | | * | | | | | Rewritten file pager.Elliott Hughes2015-04-112-65/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most importantly, this one no longer skips lines because of wrapping. Change-Id: Ic1c1944682ab8cbf3d542418ee86d29819173fc9
* | | | | | | | | am dd4d48be: am 558ba1ba: Merge "Revert "Append kernel logs to last_log file""Tao Bao2015-04-111-46/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd4d48be37c9899cad6ede0b13ee375ddc46e5f3': Revert "Append kernel logs to last_log file"
| * | | | | | | | am 558ba1ba: Merge "Revert "Append kernel logs to last_log file""Tao Bao2015-04-111-46/+42
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '558ba1bafa232935148b6483dc40277cdf4be292': Revert "Append kernel logs to last_log file"
| | * | | | | | | Merge "Revert "Append kernel logs to last_log file""Tao Bao2015-04-111-46/+42
| | |\ \ \ \ \ \ \
| | | * | | | | | | Revert "Append kernel logs to last_log file"Tao Bao2015-04-111-46/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2ec803f4350f7b72f5dd65c5f27656c6807e2966. Change-Id: I419025a772ef99db4c0a78bfa7ef66767f3fa062
* | | | | | | | | | am fa51b50a: am 464c3e71: Merge "Append kernel logs to last_log file"Tao Bao2015-04-111-42/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fa51b50ae75344addbf0671719f6cf4deaa57217': Append kernel logs to last_log file
| * | | | | | | | | am 464c3e71: Merge "Append kernel logs to last_log file"Tao Bao2015-04-111-42/+46
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '464c3e718f4c52444d17ab66ab6c9f71936cd4b8': Append kernel logs to last_log file
| | * | | | | | | | Merge "Append kernel logs to last_log file"Tao Bao2015-04-111-42/+46
| | |\| | | | | | |
| | | * | | | | | | Append kernel logs to last_log fileTao Bao2015-04-111-42/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we are keeping one copy of the kernel log (LAST_KMSG_FILE). This CL changes to append it to the recovery log. Bug: 18092237 Change-Id: I06ad5629016846927153064f1663753a90296f79
* | | | | | | | | | am 57ca725d: am 6d1bd3d3: Merge "Update the comments for package installer commands"Tao Bao2015-04-111-1/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '57ca725d874c8434284a4345ac24c55d207367ad': Update the comments for package installer commands
| * | | | | | | | | am 6d1bd3d3: Merge "Update the comments for package installer commands"Tao Bao2015-04-111-1/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d1bd3d3d4f7e715b2692696eb75e1927a4cd954': Update the comments for package installer commands
| | * | | | | | | | Merge "Update the comments for package installer commands"Tao Bao2015-04-111-1/+13
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Update the comments for package installer commandsTao Bao2015-04-111-1/+13
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These commands are for the communication between the installer and the update binary (edify interpreter). Update the comments in sync with the codes. Change-Id: I7390f022b1447049a974b0b45697ef1d2e71d4e0
* | | | | | | | | am 34bbc7d4: am f19007a5: Merge "Auto-detect whether to use the long-press UI."Elliott Hughes2015-04-116-41/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '34bbc7d49a4f0578798d039fc16369b1a6ea16bd': Auto-detect whether to use the long-press UI.
| * | | | | | | | am f19007a5: Merge "Auto-detect whether to use the long-press UI."Elliott Hughes2015-04-116-41/+56
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f19007a5252d62020c3ac8796908d9ee4653830d': Auto-detect whether to use the long-press UI.
| | * | | | | | | Merge "Auto-detect whether to use the long-press UI."Elliott Hughes2015-04-116-41/+56
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Auto-detect whether to use the long-press UI.Elliott Hughes2015-04-116-41/+56
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie77a5584e301467c6a5e164d2c62d6f036b2c0c0
* | | | | | | | am a90ba39b: am 51697d27: Merge "Switch minadb over to C++."Elliott Hughes2015-04-109-31/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a90ba39beb8762f5a1f21b03f2734acda4fb03b1': Switch minadb over to C++.
| * | | | | | | am 51697d27: Merge "Switch minadb over to C++."Elliott Hughes2015-04-109-31/+24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '51697d2781501c30d8db6d2a8e6c2becebcffad8': Switch minadb over to C++.
| | * | | | | | Merge "Switch minadb over to C++."Elliott Hughes2015-04-109-31/+24
| | |\ \ \ \ \ \
| | | * | | | | | Switch minadb over to C++.Elliott Hughes2015-04-109-31/+24
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5afaf70caa590525627c676c88b445d3162de33e
* | | | | | | | am 53b8ca4b: am 23017c5d: Merge "Switch minui over to C++."Elliott Hughes2015-04-108-102/+82
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '53b8ca4b7215389488862010751b956729e92733': Switch minui over to C++.
| * | | | | | | am 23017c5d: Merge "Switch minui over to C++."Elliott Hughes2015-04-108-102/+82
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '23017c5d5c145a1040ee49466d30489d6e11bb61': Switch minui over to C++.
| | * | | | | | Merge "Switch minui over to C++."Elliott Hughes2015-04-108-102/+82
| | |\ \ \ \ \ \
| | | * | | | | | Switch minui over to C++.Elliott Hughes2015-04-108-102/+82
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I59e08a304ae514a3fdb6fab58721f11670bc1b01
* | | | | | | | am 9b0ebf99: am 5d1630a9: Merge "Fix ScreenRecoveryUI to handle devices without power/up/down."Elliott Hughes2015-04-107-48/+96
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b0ebf992e01960db42ab7debf02bb25b372c734': Fix ScreenRecoveryUI to handle devices without power/up/down.
| * | | | | | | am 5d1630a9: Merge "Fix ScreenRecoveryUI to handle devices without power/up/down."Elliott Hughes2015-04-107-48/+96
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d1630a926a02ca13a66eb1e385eabba16b04cfc': Fix ScreenRecoveryUI to handle devices without power/up/down.
| | * | | | | | Merge "Fix ScreenRecoveryUI to handle devices without power/up/down."Elliott Hughes2015-04-107-48/+96
| | |\ \ \ \ \ \
| | | * | | | | | Fix ScreenRecoveryUI to handle devices without power/up/down.Elliott Hughes2015-04-107-48/+96
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently fugu has a custom subclass to handle this. The default code supports devices with trackballs but not all shipping Nexus devices? That's just silly. Change-Id: Id2779c91284899a26b4bb1af41e7033aa889df10
* | | | | | | | am c22f5774: am 6b0dd1d7: Merge "Move "Mount /system" to the main menu."Elliott Hughes2015-04-106-55/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c22f5774d04bed56c7c00874b5a0a0ec37f605aa': Move "Mount /system" to the main menu.
| * | | | | | | am 6b0dd1d7: Merge "Move "Mount /system" to the main menu."Elliott Hughes2015-04-106-55/+42
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6b0dd1d7e1e1f3645230f880db95cad1279a826b': Move "Mount /system" to the main menu.
| | * | | | | | Merge "Move "Mount /system" to the main menu."Elliott Hughes2015-04-106-55/+42
| | |\ \ \ \ \ \
| | | * | | | | | Move "Mount /system" to the main menu.Elliott Hughes2015-04-106-55/+42
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Everyone's adding secret key combinations for this anyway, and it's very useful when debugging. Change-Id: Iad549452b872a7af963dd649f283ebcd3ea24234
* | | | | | | | am 10dacbce: am 18eaa0cf: Merge "Add ev_iterate_available_keys to minui."Elliott Hughes2015-04-103-94/+126
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '10dacbce5ce330310ab630aa9199db620b171e76': Add ev_iterate_available_keys to minui.
| * | | | | | | am 18eaa0cf: Merge "Add ev_iterate_available_keys to minui."Elliott Hughes2015-04-103-94/+126
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18eaa0cfe7aa775546369de829a1ff3049cf82a5': Add ev_iterate_available_keys to minui.
| | * | | | | | Merge "Add ev_iterate_available_keys to minui."Elliott Hughes2015-04-103-94/+126
| | |\ \ \ \ \ \
| | | * | | | | | Add ev_iterate_available_keys to minui.Elliott Hughes2015-04-103-94/+126
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us recognize whether we have up/down/power, say, and tailor the UI accordingly. Change-Id: If94e454f14243b59d2f473ac9a436bd60591da01
* | | | | | | | am 5f3dee94: am f471861e: Merge "Move the recovery image version out of the menu header."Elliott Hughes2015-04-101-21/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5f3dee94480bff0b16dcbb58cc675785bf52ba75': Move the recovery image version out of the menu header.
| * | | | | | | am f471861e: Merge "Move the recovery image version out of the menu header."Elliott Hughes2015-04-101-21/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f471861e832e4be3a07359dfb72c1812de64b7ac': Move the recovery image version out of the menu header.
| | * | | | | | Merge "Move the recovery image version out of the menu header."Elliott Hughes2015-04-101-21/+7
| | |\ \ \ \ \ \
| | | * | | | | | Move the recovery image version out of the menu header.Elliott Hughes2015-04-101-21/+7
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than add code to wrap menu items, let's just put output the recovery version to the log. It'll be visible at the bottom of the screen and automatically wrap. Change-Id: I158fe2d85bc56b195e00619fba455321743923bd
* | | | | | | | am 7b66aaeb: am e001074f: Merge "Move default implementations into Device."Elliott Hughes2015-04-104-84/+99
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b66aaebefb64e75597b33dbfac90072a8e32e9b': Move default implementations into Device.
| * | | | | | | am e001074f: Merge "Move default implementations into Device."Elliott Hughes2015-04-104-84/+99
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e001074f227fb74f6ebf5b26c222d09fe69712c0': Move default implementations into Device.
| | * | | | | | Merge "Move default implementations into Device."Elliott Hughes2015-04-104-84/+99
| | |\ \ \ \ \ \
| | | * | | | | | Move default implementations into Device.Elliott Hughes2015-04-094-84/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current abstract class was a nice idea but has led to a lot of copy & paste in practice. Right now, no one we know of has any extra menu items, so let's make the default menu available to everyone. (If we assume that someone somewhere really does need custom device-specific menu options, a better API would let them add to our menu rather than replacing it.) Change-Id: I59f6a92f3ecd830c2ce78ce9da19eaaf472c5dfa
* | | | | | | | | am 0c23c97c: am 06522ef5: Merge "Remove some commented-out code."Elliott Hughes2015-04-091-10/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0c23c97c78211bc98c3dadd7f613e764e183a0ea': Remove some commented-out code.
| * | | | | | | | am 06522ef5: Merge "Remove some commented-out code."Elliott Hughes2015-04-091-10/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '06522ef517196062299852d59593eba0ea2be3c0': Remove some commented-out code.
| | * | | | | | | 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-095-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-094-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-092-32/+37
| | |\ \ \ \ \ \
| | | * | | | | | Remove the fixed screen size assumptions.Elliott Hughes2015-04-092-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 minzip/Zip.h."Elliott Hughes2015-04-091-10/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-091-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-091-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 operations"Tao Bao2015-04-084-9/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-084-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 mounting a partition"Tao Bao2015-04-011-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-04-011-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 wipe_data/wipe_cache functions"Tao Bao2015-04-011-22/+36
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-04-011-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 to be erased.""Tao Bao2015-03-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-311-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" too."Elliott Hughes2015-03-261-60/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-261-60/+35
| |\ \ \ \ \ \ \
| | * | | | | | | Factor out the "yes/no" menu and use it for "Wipe cache" too.Elliott Hughes2015-03-261-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-265-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-251-17/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e31f956597f758154a5f6ca7a5793230c8eff936': Remove support for Cupcake kernels.
| * | | | | | | Merge "Remove support for Cupcake kernels."Elliott Hughes2015-03-251-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
| |\ \ \ \ \ \ \
| | * | | | | | | Fix recovery image text rendering.Elliott Hughes2015-03-243-32/+25
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously most devices would lose the character before a line wrap. The log's text rendering was starting at offset 4 but none of the arithmetic was taking this into account. It just happened to work on the Nexus 9's 1536-pixel wide display (1536/18=85.3) but not on a device such as the Nexus 5 (1080/18=60). The only active part of this change is the change from 4 to 0 in the gr_text call. The rest is just a few bits of trivial cleanup while I was working out what was going on. Change-Id: I9279ae323c77bc8b6ea87dc0fe009aaaec6bfa0e
* | | | | | | | am 47733eaf: Merge "Fix wipe command when using sideload in recovery"Elliott Hughes2015-03-241-52/+47
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '47733eafdc37203d59a8a0a17ccfb936d2920e31': Fix wipe command when using sideload in recovery
| * | | | | | | Merge "Fix wipe command when using sideload in recovery"Elliott Hughes2015-03-241-52/+47
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix wipe command when using sideload in recoveryChristian Poetzsch2015-03-241-52/+47
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the wipe command when using sideload within the recovery. All the support for this command is in place, only the execution of the actual wipe command itself was missing. Change-Id: Ia9cdfc912bfb9f558fa89b9f0ed54e843ede41f2 Signed-off-by: Christian Poetzsch <christian.potzsch@imgtec.com>
* | | | | | | am 733deb26: Merge "Make the recovery menus wrap."Elliott Hughes2015-03-241-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '733deb267db3488be408cbe020769108ee6584b0': Make the recovery menus wrap.
| * | | | | | Merge "Make the recovery menus wrap."Elliott Hughes2015-03-241-2/+5
| |\ \ \ \ \ \
| | * | | | | | Make the recovery menus wrap.Elliott Hughes2015-03-231-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The real problem is that the recovery UI is sluggish. But being able to wrap off the top to the bottom halves the maximum distance you'll have to go. Change-Id: Ifebe5b818f9c9a1c4187d4ac609422da1f38537f
* | | | | | | | am 31e47876: Merge "Always use strerror to report errno in recovery."Elliott Hughes2015-03-233-26/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31e4787634a59d32ff80ccd684bc439cecc4d8c8': Always use strerror to report errno in recovery.
| * | | | | | | Merge "Always use strerror to report errno in recovery."Elliott Hughes2015-03-233-26/+27
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Always use strerror to report errno in recovery.Elliott Hughes2015-03-233-26/+27
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I7009959043150fabf5853a43ee2448c7fbea176e
* | | | | | | am e944944f: Merge "Add "Apply update from sdcard" to default recovery image."Elliott Hughes2015-03-233-20/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e944944fa58f66dad5483b6ee1ea9a2c0f9bedd2': Add "Apply update from sdcard" to default recovery image.
| * | | | | | Merge "Add "Apply update from sdcard" to default recovery image."Elliott Hughes2015-03-233-20/+44
| |\ \ \ \ \ \
| | * | | | | | Add "Apply update from sdcard" to default recovery image.Elliott Hughes2015-03-233-20/+44
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment, this is the only difference in the sprout recovery image. That's silly. Let's just improve the error handling slightly and always have this option present. Also make the obscure "<3e>" less unclear. Also use "power button" as the default text rather than "enter button", because it's been years since anyone had one of those. (Longer term we should let subclassers tell us the keycode and we translate it to the correct string.) Also move the two "Reboot" options together, put "Power off" at the bottom (and use that terminology, like the real UI, rather than "Power down"), and use capitals throughout. Finally, add a README.md with some useful instructions. Change-Id: I94fb19f73d79c54fed2dda30cefb884426641b5c
* | | | | | | am 8c637903: Merge "Remove unused libutils references."Dan Albert2015-03-142-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8c637903fedafd0acdc3906f42032f2e88cd1f7f': Remove unused libutils references.
| * | | | | | Merge "Remove unused libutils references."Dan Albert2015-03-142-2/+1
| |\ \ \ \ \ \
| | * | | | | | Remove unused libutils references.Dan Albert2015-03-142-2/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I22797643103ce1d4371198433ad9849cc83d3d7c
* | | | | | | git commit -m "resolved conflicts for merge of d29f641b to stage-aosp-master"Dan Albert2015-03-125-462/+1553
|\| | | | | |
| * | | | | | am d5369e5d: (-s ours) am 18f371d8: updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatchTao Bao2015-03-120-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd5369e5d91c9c7c55cbd8f1c306098182c209baf': updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch
| | * | | | | | am 18f371d8: updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatchTao Bao2015-03-112-14/+29
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18f371d814b26132aadf11de6cc305f02484535a': updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch
| | | * | | | | updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatchTao Bao2015-03-112-14/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return NULL to abort the update process. Note that returning "" won't stop the script. Change-Id: Ifd108c1356f7c92a905c8776247a8842c6445319
| * | | | | | | am cc368fde: am 8290aa50: Merge "Install the recovery binary directly to the recovery image."Ying Wang2015-03-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc368fdea6e5415be541dadfe04107b76a82c537': Install the recovery binary directly to the recovery image.
| | * | | | | | am 8290aa50: Merge "Install the recovery binary directly to the recovery image."Ying Wang2015-03-111-5/+1
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * commit '8290aa501f1b0354262c304962bc4da2e30457a8': Install the recovery binary directly to the recovery image.
* | | | | | | | Merge "Install the recovery binary directly to the recovery image."Ying Wang2015-03-111-5/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Install the recovery binary directly to the recovery image.Ying Wang2015-03-111-5/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eliminated the previous hack, that doesn't work reliably with the "LOCAL_REQUIRED_MODULES := mkfs.f2fs". Bug: 19666886 Change-Id: I1f0a2d41129f402c0165f3b86b6fda077291f282
| * | | | | | | Install the recovery binary directly to the recovery image.Ying Wang2015-03-101-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eliminated the previous hack, that doesn't work reliably with the "LOCAL_REQUIRED_MODULES := mkfs.f2fs". Bug: 19666886 Change-Id: I1f0a2d41129f402c0165f3b86b6fda077291f282
| * | | | | | | am fb7d8965: am 023e4374: am 579b9299: (-s ours) Merge "Remove more dead code from minzip."Narayan Kamath2015-02-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fb7d896595d1fefe0b73bbebb1e4a0c027e4fab7': Remove more dead code from minzip.
| | * | | | | | am 023e4374: am 579b9299: (-s ours) Merge "Remove more dead code from minzip."Narayan Kamath2015-02-270-0/+0
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * commit '023e4374469b8cae68783036b6977ea721c1e07a': Remove more dead code from minzip.
* | | | | | | | am 579b9299: (-s ours) Merge "Remove more dead code from minzip."Narayan Kamath2015-02-270-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '579b92991ccd626527c75042aca032d3ac4207a2': Remove more dead code from minzip.
| * \ \ \ \ \ \ \ Merge "Remove more dead code from minzip."Narayan Kamath2015-02-273-108/+59
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove more dead code from minzip.Narayan Kamath2015-02-273-108/+59
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've added explanatory comments to mzExtractRecursive because that function will live on as a utility even after we move the zip format related logic to libziparchive. bug: 19472796 Change-Id: Id69db859b9b90c13429134d40ba72c1d7c17aa8e
| | * | | | | | | am 66f94728: am 3deba524: am ecead276: Merge "Add tests for read_block_adb."Dan Albert2015-02-274-16/+124
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '66f94728ef2f4ac09c42c4623ec45d5eac6e9d53': Add tests for read_block_adb.
| | | * | | | | | am 3deba524: am ecead276: Merge "Add tests for read_block_adb."Dan Albert2015-02-274-16/+124
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3deba524f9d1e94b613d9c13f4c76595f0ec99ab': Add tests for read_block_adb.
* | | | | | | | | am ecead276: Merge "Add tests for read_block_adb."Dan Albert2015-02-274-16/+124
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecead276f068cb53bddb2458b200aa96473ddfb3': Add tests for read_block_adb.
| * | | | | | | | Merge "Add tests for read_block_adb."Dan Albert2015-02-274-16/+124
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add tests for read_block_adb.Dan Albert2015-02-274-16/+124
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests aren't completely representative in that they don't run in the recovery image. We might want to look in to adding a self-test option to the recovery UI. Until then, these can be run on a normal device (which is easier to do anyway). Bug: 19522788 Change-Id: Idb20feb55d10c62905c2480ab1b61a2e4b5f60d8
| | * | | | | | | Remove more dead code from minzip.Narayan Kamath2015-02-273-114/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've added explanatory comments to mzExtractRecursive because that function will live on as a utility even after we move the zip format related logic to libziparchive. bug: 19472796 (cherry-picked from commit c9ccdfd7a42de08c47ab771b94dc5b9d1f957b95) Change-Id: I8b7fb6fa3eafb2e7ac080ef7a7eceb691b252d8a
| | * | | | | | | am 0257d107: am 71c45429: am f66bf339: am 3e91f691: Bump up max_map_count value.Jesse Zhao2015-02-270-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0257d107f2039e24e4fbdd98d7536f402628bd78': Bump up max_map_count value.
| | | * | | | | | am 71c45429: am f66bf339: am 3e91f691: Bump up max_map_count value.Jesse Zhao2015-02-270-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '71c454293118c51487a62c5d7c4da6262eae691c': Bump up max_map_count value.
| | | | * | | | | am f66bf339: am 3e91f691: Bump up max_map_count value.Jesse Zhao2015-02-270-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f66bf33956eebba26bedc7f098dedc8a2c1cf942': Bump up max_map_count value.
| | | | | * | | | am 3e91f691: Bump up max_map_count value.Jesse Zhao2015-02-271-0/+1
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3e91f691a6bf6b154ea98982b073e84e86328baf': Bump up max_map_count value.
| | | | | | * | | Bump up max_map_count value.Jesse Zhao2015-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3e2c0795b817db9a85bc84cba2aa05d20179d39 Bug: 18503789 (cherry picked from commit 5bf74b238b402eaaf8c5bd1663fe4d592e59421f)
| | * | | | | | | am 9b14c4b0: am 735a0f0f: am cab0beb9: Merge "This read accidentally got turned in to a write."Dan Albert2015-02-271-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b14c4b0e8b8b102c699b554d701e461e7e562e7': This read accidentally got turned in to a write.
| | | * | | | | | am 735a0f0f: am cab0beb9: Merge "This read accidentally got turned in to a write."Dan Albert2015-02-271-1/+1
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '735a0f0fc3de936db3ce5a99dbcf02e970d47ba0': This read accidentally got turned in to a write.
* | | | | | | | | am cab0beb9: Merge "This read accidentally got turned in to a write."Dan Albert2015-02-271-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cab0beb95adce79b0c33488b5a503cac7dca6e77': This read accidentally got turned in to a write.
| * | | | | | | | Merge "This read accidentally got turned in to a write."Dan Albert2015-02-261-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | This read accidentally got turned in to a write.Dan Albert2015-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Too many mechanical changes in a row... Bug: 19522788 Change-Id: Ic451792aab2700cdbdbb64529b99ff5f567918ad
| | | * | | | | | | am d9bbeaec: am 83e5d1dc: am c9bc3cc9: Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk"Narayan Kamath2015-02-261-4/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd9bbeaec5a12074928f026af47de2b92f2a34336': Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk
| | | | * | | | | | am 83e5d1dc: am c9bc3cc9: Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk"Narayan Kamath2015-02-261-4/+1
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '83e5d1dc73116a154cd7387547c8dd858fd497aa': Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk
* | | | | | | | | | am c9bc3cc9: Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk"Narayan Kamath2015-02-261-4/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c9bc3cc92a2c2f584b28049238c4a583c80f149d': Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk
| * | | | | | | | | Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk"Narayan Kamath2015-02-261-4/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mkTrevor Drake2015-02-261-4/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The zlib include was not required. libpng is now handled by referencing the libpng static library Change-Id: Ie4e0abad3fff5b763eba363d3d0fa96128ff49bc
| | * | | | | | | am 381f6416: am eef962bf: am 9255ad4a: Merge "Fix readx/writex names."Dan Albert2015-02-261-4/+6
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '381f64165153bfd4747b99baf838fa280d402d5e': Fix readx/writex names.
| | | * | | | | | am eef962bf: am 9255ad4a: Merge "Fix readx/writex names."Dan Albert2015-02-261-4/+6
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eef962bfd90f11ef2f936e57270c85293af60e5f': Fix readx/writex names.
* | | | | | | | | am 9255ad4a: Merge "Fix readx/writex names."Dan Albert2015-02-261-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9255ad4a4f46dc7781b180d0cffce2d616adebcf': Fix readx/writex names.
| * | | | | | | | Merge "Fix readx/writex names."Dan Albert2015-02-261-4/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix readx/writex names.Dan Albert2015-02-261-4/+6
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9556960b8293ea0e81def8b73f88edadb68841e3
| | * | | | | | | am 94cb7fdc: am d795dcc5: am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."Dan Albert2015-02-251-2/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '94cb7fdc45db013c0ad6b8edc536717c6eb812a8': Remove _(GNU|XOPEN)_SORUCE makefile cruft.
| | | * | | | | | am d795dcc5: am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."Dan Albert2015-02-251-2/+0
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd795dcc5ead7328c1b3fcb14e279c4bec6a38b50': Remove _(GNU|XOPEN)_SORUCE makefile cruft.
* | | | | | | | | am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."Dan Albert2015-02-251-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '12fa5191e76d119f4f3998a4b8821f87aa4f9fad': Remove _(GNU|XOPEN)_SORUCE makefile cruft.
| * | | | | | | | Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."Dan Albert2015-02-251-2/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove _(GNU|XOPEN)_SORUCE makefile cruft.Dan Albert2015-02-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | None of the functions needing these are used. Change-Id: Ibe3ca24d993788bf2f1108bac8417a7094ef386b
| | | * | | | | | | am 07d2542d: am b3f4ed86: am 82eea3fd: Merge "Fix LP64 build for minadbd."Narayan Kamath2015-02-251-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07d2542d870d4bb92c9cfb85bd0ac8f9bf7ba4c4': Fix LP64 build for minadbd.
| | | | * | | | | | am b3f4ed86: am 82eea3fd: Merge "Fix LP64 build for minadbd."Narayan Kamath2015-02-251-2/+2
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3f4ed86e95a1270258b288cfb22c42c6f163efc': Fix LP64 build for minadbd.
* | | | | | | | | | am 82eea3fd: Merge "Fix LP64 build for minadbd."Narayan Kamath2015-02-251-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '82eea3fdd77f458e94d87ef0db0bd3b745d096ff': Fix LP64 build for minadbd.
| * | | | | | | | | Merge "Fix LP64 build for minadbd."Narayan Kamath2015-02-251-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix LP64 build for minadbd.Narayan Kamath2015-02-251-2/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | services.c:57:12: error: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'uint64_t' [-Werror=format=] Change-Id: Ieba691bf9e7a30c8bb38f4e1f36e86b6ea3f8c80
| | * | | | | | | am 8007a21e: am 6deb3d5c: am 35fbf787: Merge "Fix build from implicit declaration."Dan Albert2015-02-254-18/+23
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8007a21e799ec05a45435d4b688116e88de98221': Fix build from implicit declaration.
| | | * | | | | | am 6deb3d5c: am 35fbf787: Merge "Fix build from implicit declaration."Dan Albert2015-02-254-18/+23
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6deb3d5cf266ce18aefb819c5994f504e0df103b': Fix build from implicit declaration.
* | | | | | | | | am 35fbf787: Merge "Fix build from implicit declaration."Dan Albert2015-02-254-18/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '35fbf7876059b64d069d60fd9eab761718344271': Fix build from implicit declaration.
| * | | | | | | | Merge "Fix build from implicit declaration."Dan Albert2015-02-254-18/+23
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix build from implicit declaration.Dan Albert2015-02-254-18/+23
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn the warning on by default and turn on -Werror so this doesn't happen next time. Change-Id: Id65bf0cb63bbf0ff224655b425463ae2f55435df
| | * | | | | | | am 218dab7f: am 6f58e899: am 829d392a: Merge "Delete unused functions from minzip."Narayan Kamath2015-02-242-93/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '218dab7fdafbc613aa54d1fad0de0dcadd575186': Delete unused functions from minzip.
| | | * | | | | | am 6f58e899: am 829d392a: Merge "Delete unused functions from minzip."Narayan Kamath2015-02-242-93/+1
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f58e899be728fc2ab3cf3902e52937ebd58e02d': Delete unused functions from minzip.
* | | | | | | | | am 829d392a: Merge "Delete unused functions from minzip."Narayan Kamath2015-02-242-93/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '829d392a75f536861adfddefc21ec635f3460144': Delete unused functions from minzip.
| * | | | | | | | Merge "Delete unused functions from minzip."Narayan Kamath2015-02-242-93/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Delete unused functions from minzip.Narayan Kamath2015-02-232-93/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation of replacing it with libziparchive and providing shim wrappers. bug: 19472796 Change-Id: I1f2fb59ee7a41434e794e4ed15b754aa2b74a11d
| | | * | | | | | | am 37e68a1d: am f9ee77ab: am 9e95c515: Merge "Fix a printf format warning."Narayan Kamath2015-02-240-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '37e68a1d800cbe6eb28c3405fb3ecccb0119e03e': Fix a printf format warning.
| | | | * | | | | | am f9ee77ab: am 9e95c515: Merge "Fix a printf format warning."Narayan Kamath2015-02-240-0/+0
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f9ee77ab52941e6f3be8e97fb0a150480ea8760a': Fix a printf format warning.
* | | | | | | | | | am 9e95c515: Merge "Fix a printf format warning."Narayan Kamath2015-02-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9e95c515dc2e7afa91d4a4c5163ffd5b6eae3b31': Fix a printf format warning.
| * | | | | | | | | Merge "Fix a printf format warning."Narayan Kamath2015-02-241-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix a printf format warning.Narayan Kamath2015-02-231-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat] sizeof(RangeSet) + num * sizeof(int)); Change-Id: I4a3c6fc8d40c08ea84f8f5ee13f39350e4264027
| | * | | | | | | am dda456b5: am 552fceb8: am 2d102225: Merge "Kill of most of the remainder of minadbd."Dan Albert2015-02-208-1576/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dda456b5da3d59a71b486aa85912dec65b3089b2': Kill of most of the remainder of minadbd.
| | | * | | | | | am 552fceb8: am 2d102225: Merge "Kill of most of the remainder of minadbd."Dan Albert2015-02-208-1576/+9
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '552fceb85cde45581ef04a23a2e76e6298ed15a5': Kill of most of the remainder of minadbd.
* | | | | | | | | am 2d102225: Merge "Kill of most of the remainder of minadbd."Dan Albert2015-02-208-1576/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d1022250941873f8748e6a159d4e5bf976e511f': Kill of most of the remainder of minadbd.
| * | | | | | | | Merge "Kill of most of the remainder of minadbd."Dan Albert2015-02-208-1576/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Kill of most of the remainder of minadbd.Dan Albert2015-02-208-1576/+9
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think everything left now is here to stay (services.c might get massaged in to libadbd if it gets refactored). Bug: 17626262 Change-Id: I01faf8b277a601a40e3a0f4c3b8206c97f1d2ce6
| | * | | | | | | am a1df1a77: am c2b60b98: Merge commit \'f8dd04e1a5f94e7accf65a5375114ac7fa73f828\' into HEADBill Yi2015-02-200-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a1df1a778826742eeef11ed449bcffb95e119c80':
| | | * | | | | | am c2b60b98: Merge commit \'f8dd04e1a5f94e7accf65a5375114ac7fa73f828\' into HEADBill Yi2015-02-200-0/+0
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | * commit 'c2b60b9870955c14ec8434353d617ebca6f44368':
* | | | | | | | | Merge commit 'f8dd04e1a5f94e7accf65a5375114ac7fa73f828' into HEADBill Yi2015-02-1911-118/+584
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| | * | | | | | | am 9613bd32: am 4eb6c71e: Merge "Move adb_main to its own file."Dan Albert2015-02-193-30/+42
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9613bd32f5d19476063e4c546ad806385eed203c': Move adb_main to its own file.
| | | * | | | | | am 4eb6c71e: Merge "Move adb_main to its own file."Dan Albert2015-02-193-30/+42
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4eb6c71e7f013e684828ae6216f61b83be552282': Move adb_main to its own file.
* | | | | | | | | Merge "Move adb_main to its own file."Dan Albert2015-02-193-30/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move adb_main to its own file.Dan Albert2015-02-193-30/+42
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia5150e1ef8be5a8f2d2da0fdca9383e22218f4ac
| | * | | | | | | am 91f68a47: am 5d22a5b5: Merge "Remove dead code."Dan Albert2015-02-191-38/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '91f68a4735e7ca9facaf0bad45a97e7ea25213c4': Remove dead code.
| | | * | | | | | am 5d22a5b5: Merge "Remove dead code."Dan Albert2015-02-191-38/+0
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d22a5b5ecfd9fce5084915e65e114c8541c084c': Remove dead code.
* | | | | | | | | Merge "Remove dead code."Dan Albert2015-02-191-38/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove dead code.Dan Albert2015-02-191-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code doesn't exist in the normal adb, so it just makes it harder to diff the two. Change-Id: Ibb21b49bb9944c4245199536cbe88e8a107cf00d
| | | * | | | | | | am 43162fe5: am 076f5479: Merge "Use headers from adb."Dan Albert2015-02-197-663/+7
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43162fe50cb2e2e7861df97380fad815a54dac2e': Use headers from adb.
| | | | * | | | | | am 076f5479: Merge "Use headers from adb."Dan Albert2015-02-197-663/+7
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '076f5479b592fc02f2f3e5436cad06b0a35d0521': Use headers from adb.
* | | | | | | | | | Merge "Use headers from adb."Dan Albert2015-02-197-663/+7
|\| | | | | | | | |
| * | | | | | | | | Use headers from adb.Dan Albert2015-02-197-663/+7
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adb.h has diverged a bit, so that one will be more involved, but these three are all trivial, unimportant changes. Change-Id: Ief8474c1c2927d7e955adf04f887c76ab37077a6
| | * | | | | | | am 61398da2: am bbf627a6: Merge "Remove unused code."Dan Albert2015-02-193-183/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '61398da24b7abe657fad0a0db2a47cf940f4e58b': Remove unused code.
| | | * | | | | | am bbf627a6: Merge "Remove unused code."Dan Albert2015-02-193-183/+0
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bbf627a68e47319b1fcacb1487ab1d1618c3a82d': Remove unused code.
* | | | | | | | | Merge "Remove unused code."Dan Albert2015-02-193-183/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused code.Dan Albert2015-02-193-183/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie37734e75bc4d1e284dcb5dee4c0512021663dbd
| | | * | | | | | | am bf1476de: am 4db055d6: Merge "Lose USB transport code to libadb."Dan Albert2015-02-196-1470/+3
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bf1476defee29ebb3f2b794ce82f2614ba59ce4f': Lose USB transport code to libadb.
| | | | * | | | | | am 4db055d6: Merge "Lose USB transport code to libadb."Dan Albert2015-02-196-1470/+3
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4db055d66a3d4d8be9f61beb5ee4d25f6346191a': Lose USB transport code to libadb.
* | | | | | | | | | Merge "Lose USB transport code to libadb."Dan Albert2015-02-196-1470/+3
|\| | | | | | | | |
| * | | | | | | | | Lose USB transport code to libadb.Dan Albert2015-02-196-1470/+3
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17626262 Change-Id: If41031ba20a3a75fa510f155c654a482b47e409d
| | * | | | | | | am ecb0ad25: am 37e933a7: Merge "Add extern "C" to all the headers."Dan Albert2015-02-196-0/+52
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecb0ad25c6be87570f31b652c24ff7f17a93813f': Add extern "C" to all the headers.
| | | * | | | | | am 37e933a7: Merge "Add extern "C" to all the headers."Dan Albert2015-02-186-0/+52
| | |/| | | | | | | |/|/ / / / / / | |/| | | | | | |/| | | | | | | | | | | | | | | * commit '37e933a7cef7f2df1693ff02d34042bc2f039301': Add extern "C" to all the headers.
* | | | | | | | Merge "Add extern "C" to all the headers."Dan Albert2015-02-186-0/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | Add extern "C" to all the headers.Dan Albert2015-02-186-0/+52
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idc249ff1b199b7c455f90092ff2c8a48b539faf4
| | * | | | | | Initialize stashbase even stash_max_blocks = 0Jesse Zhao2015-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I480c02ffedd811f4dda9940ef979a05ff54f1435 Bug: 19410117
| | * | | | | | am f8dd04e1: am ff934d02: Merge "Fix Droid and animation color in recovery mode"Elliott Hughes2015-02-125-14/+25
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'f8dd04e1a5f94e7accf65a5375114ac7fa73f828': Fix Droid and animation color in recovery mode
| * | | | | | | am ff934d02: Merge "Fix Droid and animation color in recovery mode"Elliott Hughes2015-02-125-14/+25
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * commit 'ff934d0257909e9c5420815547a6e2ff89455314': Fix Droid and animation color in recovery mode
* | | | | | | | Merge "Fix Droid and animation color in recovery mode"Elliott Hughes2015-02-125-14/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix Droid and animation color in recovery modeTony Kuo2015-02-125-14/+25
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Problem] Droid and animation color in recovery mode are incorrect [Modify] - Add support for flipping (zero copy) with RECOVERY_ABGR. - Decodes PNG files to BGRA directly, and other fills, text and alpha blending are also done directly in BGRA (i.e. blits can still bypass conversion) - Remove the BGRA workaround added previous for single buffer mode (f766396) Bug:19216535 Change-Id: Ie864419fc6da776ff58b2d02e130f203c194500f Signed-off-by: Tony Kuo <tony.kuo@mediatek.com>
| | * | | | | | am adf71bf7: am 5db3f978: Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined"Elliott Hughes2015-02-111-1/+3
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'adf71bf71d0c3ecb68375c44fc8646860217024c': Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined
| * | | | | | | am 5db3f978: Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined"Elliott Hughes2015-02-111-1/+3
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * commit '5db3f97877c0aafd4513c3ed846c48b0fc148b0e': Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined
* | | | | | | | Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined"Elliott Hughes2015-02-111-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix build when TARGET_USERIMAGES_USE_EXT4 is not definedAdrien Grassein2014-11-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cryptfs.h files is always included, but its path is only included when TARGET_USERIMAGES_USE_EXT4 is defined. Change-Id: Iec6aa4601a56a1feac456a21a53a08557dc1d00d
| | | * | | | | | am 98e2c509: am 78aa50d3: Merge "recovery: Handle EV_SW events"Elliott Hughes2015-02-111-2/+2
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '98e2c509a636db7c4d9a89c086e8d4ac03a6970b': recovery: Handle EV_SW events
| | * | | | | | | am 78aa50d3: Merge "recovery: Handle EV_SW events"Elliott Hughes2015-02-111-2/+2
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '78aa50d3499e105d04e37ae3d3d92dad0d2c711c': recovery: Handle EV_SW events
* | | | | | | | | Merge "recovery: Handle EV_SW events"Elliott Hughes2015-02-111-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | recovery: Handle EV_SW eventsAjay Dudani2015-02-111-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29c13a941067cd1bbdced3bd67fd93293347d7b6
| | | * | | | | | am ee7127cc: am bf0be350: Merge "recovery: Generate libminui dynamic library"Elliott Hughes2015-02-111-0/+7
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'ee7127cca575967a90f3ede92cd05552000ccb14': recovery: Generate libminui dynamic library
| | * | | | | | | am bf0be350: Merge "recovery: Generate libminui dynamic library"Elliott Hughes2015-02-111-0/+7
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bf0be350ddf4fb75178f33ee64706cb795ceade0': recovery: Generate libminui dynamic library
* | | | | | | | | Merge "recovery: Generate libminui dynamic library"Elliott Hughes2015-02-111-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | recovery: Generate libminui dynamic libraryAjay Dudani2015-02-111-0/+7
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow factory test images to use minui functionaltiy by making use of libminui dynamic library. Change-Id: I63e77420d5addbcc6eebeedc213f629085766b4c
| | | * | | | | | am dcbf4fc5: resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aospElliott Hughes2015-02-113-6/+10
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'dcbf4fc571236bf5aa5286294b3c727be725db70': recovery: Properly detect userdebug or eng builds
| | * | | | | | | resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aospElliott Hughes2015-02-113-6/+10
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | Change-Id: I6f2ea07df2ab80a44301d9c3a2a8841c40a46002
* | | | | | | | | Merge "recovery: Properly detect userdebug or eng builds"Elliott Hughes2015-02-113-6/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | recovery: Properly detect userdebug or eng buildsElliott Hughes2015-02-103-6/+10
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recovery system behaves a little bit differently on userdebug or eng builds by presenting error reports to the user in the ui. This is controlled by checking the build fingerprint for the string :userdebug/ or :eng/. But with AOSP version numbers most AOSP builds blows the 92 char limit of ro.build.fingerprint and therefore the property is not set, so this condition will always be evaluated to false, for most builds. Instead of depending on the flaky ro.build.fingerprint this change uses ro.debuggable. Change-Id: I74bc00c655ac596aaf4b488ecea58f0a8de9c26b
| | | * | | | | | am ec5c1c1e: am 99e084ca: Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read"Nick Kralevich2015-02-093-23/+8
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec5c1c1e291062576925b80b532d36df118103f5': Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read
| | * | | | | | | am 99e084ca: Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read"Nick Kralevich2015-02-083-23/+8
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '99e084ca8012bc7af52ae2fb9e72ab7180177daf': Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read
* | | | | | | | | Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read"Nick Kralevich2015-02-083-23/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove dead/unused code and realign some of the commentsNanik Tolaram2015-02-083-23/+8
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to make it more cleaner and easier to read Change-Id: If536d482c0ed645368084e76d8ec060f05d89137 Signed-off-by: Nanik Tolaram <nanikjava@gmail.com>
| | | * | | | | | am 42b09d25: am 6a0d2fbc: Merge "There\'s no GPL code in \'updater\'."Elliott Hughes2015-02-092-339/+0
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '42b09d255afdb47bc0546183cbc68e86147baaab': There's no GPL code in 'updater'.
| | * | | | | | | am 6a0d2fbc: Merge "There\'s no GPL code in \'updater\'."Elliott Hughes2015-02-072-339/+0
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a0d2fbcaa1740da7bb0e7a0ef8280e8b7b9bb05': There's no GPL code in 'updater'.
* | | | | | | | | Merge "There's no GPL code in 'updater'."Elliott Hughes2015-02-072-339/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | There's no GPL code in 'updater'.Elliott Hughes2015-02-052-339/+0
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This notice was added for libsyspatch and libxdelta3, but that code has been removed since. Change-Id: I4008878ded56ca1d5094a8208728f8c02fe1fe03
| | | * | | | | | Merge "Support resuming block based OTAs"Sami Tolvanen2015-02-061-346/+1460
| | | |\ \ \ \ \ \
| | | | * | | | | | Support resuming block based OTAsSami Tolvanen2015-01-301-346/+1460
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for transfer list version 3, which allows us to verify the status of each command and resume an interrupted block based OTA update. Notes on the changes: - Move the previous BlockImageUpdateFn to a shorter and reusable PerformBlockImageUpdate, which can be used also in BlockImageVerifyFn for verification. - Split individual transfer list commands into separate functions with unified parameters for clarity, and use a hash table to locate them during execution. - Move common block reading and writing to ReadBlocks and WriteBlocks to reduce code duplication, and rename the readblock and writeblock to less confusing read_all and write_all. The coding style of the new functions follows the existing style in the updater/edify code. Needs matching changes from Ia5c56379f570047f10f0aa7373a1025439495c98 Bug: 18262110 Change-Id: I1e752464134aeb2d396946348e6041acabe13942
| | | * | | | | | | am 40862ab5: am aeecac54: Merge "Add missing includes."Elliott Hughes2015-01-3011-0/+12
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| / / / / / / | | | |/ / / / / / | | | | | | | | | * commit '40862ab59e376d50036fa56a9f3f08c42530c96a': Add missing includes.
| | * | | | | | | am aeecac54: Merge "Add missing includes."Elliott Hughes2015-01-3011-0/+12
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aeecac5444ce55d2e82ee1b2aa35ff61a038c14e': Add missing includes.
* | | | | | | | | Merge "Add missing includes."Elliott Hughes2015-01-3011-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing includes.Elliott Hughes2015-01-3011-0/+12
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I06ea08400efa511e627be37a4fd70fbdfadea2e6
| | | * | | | | | am 22b8fe96: am dab56cac: Merge "Add missing includes."Elliott Hughes2015-01-284-2/+6
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '22b8fe96663de518bf77049a1e449430b66e7d11': Add missing includes.
| | * | | | | | | am dab56cac: Merge "Add missing includes."Elliott Hughes2015-01-284-2/+6
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dab56cac959ce9c78e3a0a22e9ee2ff917d61bd3': Add missing includes.
* | | | | | | | | Merge "Add missing includes."Elliott Hughes2015-01-284-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing includes.Elliott Hughes2015-01-284-2/+6
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0737456e0221ebe9cc854d65c95a7d37d0869d56
| | | * | | | | | am 88c30fb6: am eaeb55f7: Merge "Start losing code to libadb."Dan Albert2015-01-273-698/+1
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '88c30fb652ad40835f1d1045e2c851ff8813e873': Start losing code to libadb.
| | * | | | | | | am eaeb55f7: Merge "Start losing code to libadb."Dan Albert2015-01-273-698/+1
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eaeb55f745c86487b4ad57da008d501fa1ebc37d': Start losing code to libadb.
* | | | | | | | | Merge "Start losing code to libadb."Dan Albert2015-01-273-698/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Start losing code to libadb.Dan Albert2014-11-253-698/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17626262 Change-Id: I8ce7cff2b7789f39f35a4211d7120d072c05a863
| | | | * | | | | | am 2d67a483: am cdc38d04: Merge "Fix the v2 descriptor handling."Christopher Ferris2015-01-261-11/+6
| | | | |\ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d67a483ede93f1d3906e1d03f46af34887764ac': Fix the v2 descriptor handling.
| | | * | | | | | | am cdc38d04: Merge "Fix the v2 descriptor handling."Christopher Ferris2015-01-261-11/+6
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cdc38d0401f2798bb13e73d6ca290abab60fc2bf': Fix the v2 descriptor handling.
* | | | | | | | | | Merge "Fix the v2 descriptor handling."Christopher Ferris2015-01-261-11/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix the v2 descriptor handling.Christopher Ferris2015-01-261-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a misinterpretation of how the v2 header works. The flags in the header indicate what is in the rest of the structure. Bug: 19127803 Change-Id: I83fd93df1df196300a80ddeb3b49ca7851ffcfb8
| | | | | * | | | | | am efa16af5: am cad5ce81: Merge "adbd: Support for new f_fs descriptor format"Christopher Ferris2015-01-260-0/+0
| | | | | |\ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'efa16af53ebc3ef4974ff791d0f03ec66b20a5e8': adbd: Support for new f_fs descriptor format
| | | | * | | | | | | am cad5ce81: Merge "adbd: Support for new f_fs descriptor format"Christopher Ferris2015-01-261-54/+107
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cad5ce81adb28e131f2521fa5e553e222e0a19f4': adbd: Support for new f_fs descriptor format
* | | | | | | | | | | Merge "adbd: Support for new f_fs descriptor format"Christopher Ferris2015-01-261-54/+107
|\| | | | | | | | | |
| * | | | | | | | | | adbd: Support for new f_fs descriptor formatBadhri Jagan Sridharan2015-01-261-54/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch "[RFC] usb: gadget: f_fs: Add flags to descriptors block" marks the current usb_functionfs_descs_head format deprecated and introduces support for sending SuperSpeed descriptors. This CL makes adbd to send Descriptors in the new format. Adbd would fall back to the old format, if kernel is not able to recognize the new format. This is done to prevent adbd from breaking in the older versions of the kernel. Bug: 17394972 (cherry picked from commit b5b43043fa71f9cb620ddd02ec2bc98eced5a6ce) Change-Id: I5af9dc9d4f41ad47d678279054a648f69497b24e
| | | | | * | | | | | am 4db9c893: am d4069928: Merge "Add missing <string.h> include."Elliott Hughes2015-01-251-0/+1
| | | | | |\ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4db9c8935df6347e54aa9581f019a802d2ec7dad': Add missing <string.h> include.
| | | | * | | | | | | am d4069928: Merge "Add missing <string.h> include."Elliott Hughes2015-01-251-0/+1
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd40699287fb659eca92b93dd325f82babcef77e6': Add missing <string.h> include.
* | | | | | | | | | | Merge "Add missing <string.h> include."Elliott Hughes2015-01-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add missing <string.h> include.Elliott Hughes2015-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I79a9a58904b2992c306d8de0c7b3a4aacd4b67e0
| | | | | * | | | | | am e84e9310: am eade3a80: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-231-1/+0
| | | | | |\ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e84e931040a4f77aea14aca4c756940f3891d977': Remove superfluous OpenSSL include paths.
| | | | * | | | | | | am eade3a80: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-231-1/+0
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eade3a800effe8f8fb89c8a2da12831bc5ba3239': Remove superfluous OpenSSL include paths.
* | | | | | | | | | | Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-231-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove superfluous OpenSSL include paths.Adam Langley2015-01-231-1/+0
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This include path was needed because system/vold/cryptfs.h included an OpenSSL header just to get the length of a SHA-256 hash. This has been fixed in https://android-review.googlesource.com/#/c/124477/1. Change-Id: I06a8ba0ee5b9efcc3260598f07d9819f065711de
| | | | * | | | | | am 465e8702: am 5bf74b23: Bump up max_map_count value.Jesse Zhao2015-01-151-0/+1
| | | | |\ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '465e8702912d06b7207878eb38b0df6f56f8bbb6': Bump up max_map_count value.
| | | * | | | | | | am 5bf74b23: Bump up max_map_count value.Jesse Zhao2015-01-151-0/+1
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5bf74b238b402eaaf8c5bd1663fe4d592e59421f': Bump up max_map_count value.
| | | | * | | | | | Bump up max_map_count value.Jesse Zhao2015-01-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3e2c0795b817db9a85bc84cba2aa05d20179d39 Bug: 18503789
| | | | | * | | | | am 479e5108: am dd719dfe: Merge "Use getmntent when accessing /proc/mounts."Yabin Cui2015-01-061-75/+14
| | | | | |\ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '479e510811b8a81c47449faa8db6ed5d1d7a31b4': Use getmntent when accessing /proc/mounts.
| | | * | | | | | | am dd719dfe: Merge "Use getmntent when accessing /proc/mounts."Yabin Cui2015-01-061-75/+14
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd719dfe4eb1d8c15342ce05d2a0ab975c390d67': Use getmntent when accessing /proc/mounts.
* | | | | | | | | | Merge "Use getmntent when accessing /proc/mounts."Yabin Cui2015-01-061-75/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use getmntent when accessing /proc/mounts.Yabin Cui2015-01-021-75/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18887435 Change-Id: Ice44c14fc8ee79eab259caf486e123b6af21ceb0
| | | | | | * | | | | am 6bec0e51: am a5d63956: Merge "Remove an uninitialized value."Dan Albert2015-01-051-2/+1
| | | | | | |\ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6bec0e51b0974d5646bab925299ea37c221b47e3': Remove an uninitialized value.
| | | | * | | | | | | am a5d63956: Merge "Remove an uninitialized value."Dan Albert2015-01-051-2/+1
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5d63956c419f01a9e57414c23d3ded3a16e0f8a': Remove an uninitialized value.
* | | | | | | | | | | Merge "Remove an uninitialized value."Dan Albert2015-01-051-2/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove an uninitialized value.Dan Albert2014-12-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assignment of this value was removed in 0d32f25, but the declaration was still there and still tested. Clang issues a warning for this. Change-Id: I748bfb8b4f78ceed1c1b5b1bb80cb4e873e4facc
| | | | | | * | | | | am 6bb8f476: am 538d7d83: Merge "Fix missing #includes in bootable/recovery."Elliott Hughes2014-12-302-2/+4
| | | | | | |\ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6bb8f476862db17adb6f69b441af9059b01c9108': Fix missing #includes in bootable/recovery.
| | | | * | | | | | | am 538d7d83: Merge "Fix missing #includes in bootable/recovery."Elliott Hughes2014-12-302-2/+4
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '538d7d838d82e29c738145431aa64c587dc84943': Fix missing #includes in bootable/recovery.
* | | | | | | | | | | Merge "Fix missing #includes in bootable/recovery."Elliott Hughes2014-12-292-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix missing #includes in bootable/recovery.Elliott Hughes2014-12-292-2/+4
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I58dfbac6ca1aa80d3659f53a8fad1bbbbdc9b941
| | | | | * | | | | am 8af7c5df: am a72512cd: Add O_CREAT option for openSungmin Choi2014-12-111-2/+10
| | | | | |\ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8af7c5df575b1aef496694effea19700f6c71d65': Add O_CREAT option for open
| | | * | | | | | | am a72512cd: Add O_CREAT option for openSungmin Choi2014-12-111-2/+10
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a72512cd058da7de4cdb667776ed47fad873f12c': Add O_CREAT option for open
| | | | * | | | | | Add O_CREAT option for openSungmin Choi2014-12-111-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factory reset fails if there is no file, for example, RECOVERY_COMMAND_FILE_TMP. So create file as adding O_CREAT option if it does not exist. error log: --------- beginning of crash 12-10 02:35:17.190 3059 3059 F libc : Fatal signal 11 (SIGSEGV), code 1, fault addr 0x30 in tid 3059 (uncrypt) 12-10 02:35:17.296 766 1528 W NativeCrashListener: Couldn't find ProcessRecord for pid 3059 12-10 02:35:17.296 191 191 I DEBUG : *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** 12-10 02:35:17.296 191 191 E DEBUG : AM write failure (32 / Broken pipe) 12-10 02:35:17.296 191 191 I DEBUG : Build fingerprint: 'Android/aosp_hammerhead/hammerhead:5.1/LMP/hopemini12052127:userdebug/test-keys' 12-10 02:35:17.296 191 191 I DEBUG : Revision: '10' 12-10 02:35:17.297 191 191 I DEBUG : ABI: 'arm' 12-10 02:35:17.297 191 191 I DEBUG : pid: 3059, tid: 3059, name: uncrypt >>> /system/bin/uncrypt <<< 12-10 02:35:17.297 191 191 I DEBUG : signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0x30 12-10 02:35:17.302 191 191 I DEBUG : r0 00000001 r1 be94b690 r2 fffffe90 r3 b6fdbf7c 12-10 02:35:17.302 191 191 I DEBUG : r4 00000000 r5 00000000 r6 b6fd8ca4 r7 be94b67c 12-10 02:35:17.302 191 191 I DEBUG : r8 00000000 r9 ffffffff sl b6ff582b fp be94b68d 12-10 02:35:17.302 191 191 I DEBUG : ip b6fcfd08 sp be94b648 lr b6f98fe5 pc b6f98fe4 cpsr 20070030 12-10 02:35:17.303 191 191 I DEBUG : 12-10 02:35:17.303 191 191 I DEBUG : backtrace: 12-10 02:35:17.303 191 191 I DEBUG : #00 pc 00032fe4 /system/lib/libc.so (fputs+29) 12-10 02:35:17.303 191 191 I DEBUG : #01 pc 000016a1 /system/bin/uncrypt 12-10 02:35:17.303 191 191 I DEBUG : #02 pc 0000114b /system/bin/uncrypt 12-10 02:35:17.303 191 191 I DEBUG : #03 pc 00012df5 /system/lib/libc.so (__libc_init+44) 12-10 02:35:17.303 191 191 I DEBUG : #04 pc 000013cc /system/bin/uncrypt 12-10 02:35:17.325 191 191 I DEBUG : 12-10 02:35:17.325 191 191 I DEBUG : Tombstone written to: /data/tombstones/tombstone_00 Bug: 18709330 Change-Id: Ib5dccdd366e829049938a188ea5f98d9e4e282db
| | | | | * | | | | am cb1a7502: am f59b9942: Add basic navigation controls to log viewer.Patrick Tjin2014-12-101-2/+36
| | | | | |\ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb1a750214555ec1554bccfc7257b205e87459cb': Add basic navigation controls to log viewer.
| | | * | | | | | | am f59b9942: Add basic navigation controls to log viewer.Patrick Tjin2014-12-101-2/+36
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f59b994264b2e8ffe179e2405cda81811f8a9db1': Add basic navigation controls to log viewer.
| | | | * | | | | | Add basic navigation controls to log viewer.Patrick Tjin2014-12-101-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18642766 Change-Id: I95a6c8edf83513d421a041e79c15111b5c991dde Signed-off-by: Patrick Tjin <pattjin@google.com>
| | | | | * | | | | am 8e8d5de4: am cd055ee7: Save kernel logs to /cache/recoveryPatrick Tjin2014-12-101-6/+60
| | | | | |\ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8e8d5de4779e0f8f70cd39bf267026fff35f0a88': Save kernel logs to /cache/recovery
| | | * | | | | | | am cd055ee7: Save kernel logs to /cache/recoveryPatrick Tjin2014-12-101-6/+60
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd055ee72a5efaf4bcbc0f81692410d3ffcda5e0': Save kernel logs to /cache/recovery
| | | | * | | | | | Save kernel logs to /cache/recoveryPatrick Tjin2014-12-101-6/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18642766 Change-Id: I6c8b7d8f9ffb688d3afdfe0d47c4142e711e421d Signed-off-by: Patrick Tjin <pattjin@google.com>
| | | | | * | | | | am 4f9fcffc: am 37ad1f12: Merge "Force write to disk while doing uncrypt" into lmp-mr1-devMichael Runge2014-12-101-5/+10
| | | | | |\ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4f9fcffce7328b8f3f9a8384c51220f4a2cda8ba': Force write to disk while doing uncrypt
| | | * | | | | | | am 37ad1f12: Merge "Force write to disk while doing uncrypt" into lmp-mr1-devMichael Runge2014-12-101-5/+10
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '37ad1f1273dd579b84317be6d1a9a27ad32af88c': Force write to disk while doing uncrypt
| | | | * | | | | | Merge "Force write to disk while doing uncrypt" into lmp-mr1-devMichael Runge2014-12-101-5/+10
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Force write to disk while doing uncryptMichael Runge2014-11-221-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should reduce errors if the device reboots before the blocks are commited to disk. Bug: 18481902 Change-Id: I13cda1c78955e4c83522fbcf87ddb16cc9f97683
| | | | | | * | | | | am cdce7f7e: am c43b17f0: Merge "Fix recovery image build for 32p"Ying Wang2014-12-021-1/+1
| | | | | | |\ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cdce7f7e552c036ec6fb406e9dabef615b11c1a9': Fix recovery image build for 32p
| | | * | | | | | | | am c43b17f0: Merge "Fix recovery image build for 32p"Ying Wang2014-12-021-1/+1
| | | |\ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c43b17f0adac1092e221ce6166ca8bc464090525': Fix recovery image build for 32p
* | | | | | | | | | | Merge "Fix recovery image build for 32p"Ying Wang2014-12-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix recovery image build for 32pBruce Beare2014-12-011-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building for 32p, we need to be explicit that we wish to build the 32bit version of the binaries that will be placed in the recovery image. The recovery image doesn't actually care... but if we are not explicit in this, the makefiles will ask for the 64bit binaries but the Android.mk for the binaries will supply the 32bit images (causing the build to fail). Change-Id: Iea2d5f412740c082795da4358765751138a4b167
| | | | | * | | | | am 0fe938c0: am 5b9c4ce5: am b278c252: Add support for tune2fs file operationsMichael Runge2014-11-240-0/+0
| | | | | |\ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0fe938c0fbebfdd3f6dedb0761588a20e741c870': Add support for tune2fs file operations
| | * | | | | | | | am 5b9c4ce5: am b278c252: Add support for tune2fs file operationsMichael Runge2014-11-242-0/+43
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b9c4ce5a15bb76919e1556ae59993e9c310c0bc': Add support for tune2fs file operations
| | | * | | | | | | am b278c252: Add support for tune2fs file operationsMichael Runge2014-11-242-0/+43
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | / / / / | | | | | |/ / / / | | | | |/| | | | * commit 'b278c252e148798346f85fc92eeea6afeb33fbf0': Add support for tune2fs file operations
| | | | * | | | | Add support for tune2fs file operationsMichael Runge2014-11-212-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows tune2fs to be executed from within OTA scripts, allowing for file system modifications without formatting the partition Bug: 18430740 Change-Id: I0c2e05b5ef4a81ecea043e9b7b99b545d18fe5e6
| | | | | * | | | Add support for tune2fs file operationsMichael Runge2014-11-222-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows tune2fs to be executed from within OTA scripts, allowing for file system modifications without formatting the partition Bug: 18430740 Change-Id: I0c2e05b5ef4a81ecea043e9b7b99b545d18fe5e6
| | | | | * | | | am 39be2f64: am d34b6378: Merge "Global C++11 compatibility."Dan Albert2014-11-211-3/+4
| | | | | |\ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '39be2f64fdcfe4aded40fa83a4b212bb8a5de1e3': Global C++11 compatibility.
| | * | | | | | | am d34b6378: Merge "Global C++11 compatibility."Dan Albert2014-11-211-3/+4
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd34b63780eaf80ba71279360dc1e2fdbdc488eec': Global C++11 compatibility.
* | | | | | | | | Merge "Global C++11 compatibility."Dan Albert2014-11-201-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Global C++11 compatibility.Dan Albert2014-11-201-3/+4
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our build system compiles flex/bison as C++ rather than C, but a few projects add `-x c` to their flags, forcing the compiler to compile them as C. This causes the compiler to reject the global C++ standard flag, so we need to explicitly provide a C standard flag to override it. Bug: 18466763 Change-Id: Id68ad9317261ed4d857a949b07288bd137ff6303
| | | | | * | | | am 71fa5392: am de27d4cb: am e5879c36: Byte swap to support BGRA in recovery modeHeather Lee Wilson2014-11-151-0/+12
| | | | | |\ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '71fa5392439bf7ec55bda58924d3180539f80972': Byte swap to support BGRA in recovery mode
| | * | | | | | | am de27d4cb: am e5879c36: Byte swap to support BGRA in recovery modeHeather Lee Wilson2014-11-151-0/+12
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'de27d4cbb75a9c2f5ad0fc24edf5295d0f3d9fe0': Byte swap to support BGRA in recovery mode
| | | * | | | | | am e5879c36: Byte swap to support BGRA in recovery modeHeather Lee Wilson2014-11-141-0/+12
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e5879c3639789d61803605c12371a4f291e0b3cc': Byte swap to support BGRA in recovery mode
| | | | * | | | | Byte swap to support BGRA in recovery modeHeather Lee Wilson2014-11-141-0/+12
| | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes color palate of recovery mode when double buffer enabled. Bug: 18169447 Change-Id: Ia50b0fb9afd8001dfd740c09ce109fa421e691f7
| | | | | * | | am 82ca0ba8: am 92242c70: Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-141-1/+1
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '82ca0ba805307f2c8bf4a3abb03fd7e1b5213ccb': kill HAVE_FORKEXEC
| | * | | | | | am 92242c70: Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-131-1/+1
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * commit '92242c704846f28932e555dba800f4a701063896': kill HAVE_FORKEXEC
* | | | | | | | Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-131-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | kill HAVE_FORKEXECYabin Cui2014-11-131-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18317407 Change-Id: Idd4e0effa96752e2c0ca959728f80df4d2d34187
| | | | * | | am 8bebe58e: am 2020564f: am be81e51c: Use more aggressive sync writing to applypatch.Michael Runge2014-10-311-8/+36
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '8bebe58e540b34078aecd155e7b58a7a02985483': Use more aggressive sync writing to applypatch.
| * | | | | | am 2020564f: am be81e51c: Use more aggressive sync writing to applypatch.Michael Runge2014-10-311-8/+36
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2020564f21bb0216965f0f5c43c5c1c995785bab': Use more aggressive sync writing to applypatch.
| | * | | | | am be81e51c: Use more aggressive sync writing to applypatch.Michael Runge2014-10-291-8/+36
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'be81e51c171a0cf9b9b5045ee949282b7f36d779': Use more aggressive sync writing to applypatch.
| | | * | | | Use more aggressive sync writing to applypatch.Michael Runge2014-10-291-8/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have seen cases where the boot partition is patched, but upon recovery the partition appears to be corrupted. Open up all patched files/partitions with O_SYNC, and do not ignore the errors from fsync/close operations. Bug: 18170529 Change-Id: I392ad0a321d937c4ad02eaeea9170be384a4744b
| | | | * | | am c2e7d903: am e908a454: am 042c3cd0: Force sync files written by minzip.Michael Runge2014-10-311-2/+8
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit 'c2e7d903adca4195588be085011c2a6a9c80426a': Force sync files written by minzip.
| * | | | | | am e908a454: am 042c3cd0: Force sync files written by minzip.Michael Runge2014-10-311-2/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e908a45420fc4194c6007193d21d5b690e04583f': Force sync files written by minzip.
| | * | | | | am 042c3cd0: Force sync files written by minzip.Michael Runge2014-10-291-2/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '042c3cd04ec3ef416019fa382cd5b1a942bd79e1': Force sync files written by minzip.
| | | * | | | Force sync files written by minzip.Michael Runge2014-10-291-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some files appear to be missing their sync to disk. Bug: 18145574 Change-Id: Ic858624a4dd65bbfc54d30f3a13c607078270345
| | | | * | | adbd: Support for new f_fs descriptor formatBadhri Jagan Sridharan2014-10-281-54/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch "[RFC] usb: gadget: f_fs: Add flags to descriptors block" marks the current usb_functionfs_descs_head format deprecated and introduces support for sending SuperSpeed descriptors. This CL makes adbd to send Descriptors in the new format. Adbd would fall back to the old format, if kernel is not able to recognize the new format. This is done to prevent adbd from breaking in the older versions of the kernel. Bug: 17394972 Change-Id: I1acf684ef8a4dcc612ac20b5abe1e27b43901031 Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
| | | | * | | am 8a9ee089: am fe8563f4: am 5ddf4293: Log mount/unmount errors to UIMichael Runge2014-10-251-5/+9
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '8a9ee089d380bcbd2f4447770b944a552001fd28': Log mount/unmount errors to UI
| * | | | | | am fe8563f4: am 5ddf4293: Log mount/unmount errors to UIMichael Runge2014-10-251-5/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe8563f4f2a6efe1eb00bb41a5037c88917becfc': Log mount/unmount errors to UI
| | * | | | | am 5ddf4293: Log mount/unmount errors to UIMichael Runge2014-10-251-5/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5ddf4293df45a051c7900eeb62fb5ec4950b6cb6': Log mount/unmount errors to UI
| | | * | | | Log mount/unmount errors to UIMichael Runge2014-10-241-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18092022 Change-Id: I6c42038ebeb1cfc1e7ca0d3e12310fdce1b990b0
| | | | * | | am 944fc5e6: am 915d661c: am 68802416: unconditionally apply SELinux labels to symlinksNick Kralevich2014-10-241-10/+9
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '944fc5e616b6f70da3447fc6987fb2f92dfdc01f': unconditionally apply SELinux labels to symlinks
| * | | | | | am 915d661c: am 68802416: unconditionally apply SELinux labels to symlinksNick Kralevich2014-10-241-10/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '915d661ccc64f25a533919054f487a8e5943574d': unconditionally apply SELinux labels to symlinks
| | * | | | | am 68802416: unconditionally apply SELinux labels to symlinksNick Kralevich2014-10-241-10/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '688024169df70336cc128ea8cc929174c53a501e': unconditionally apply SELinux labels to symlinks
| | | * | | | unconditionally apply SELinux labels to symlinksNick Kralevich2014-10-241-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the end of the OTA script, we walk through /system, updating all the permissions on the filesystem, including the UID, GID, standard UNIX permissions, capabilities, and SELinux labels. In the case of a symbolic link, however, we want to skip most of those operations. The UID, GID, UNIX permissions, and capabilities don't meaningfully apply to symbolic links. However, that's not true with SELinux labels. The SELinux label on a symbolic link is important. We need to make sure the label on the symbolic link is always updated, even if none of the other attributes are updated. This change unconditionally updates the SELinux label on the symbolic link itself. lsetfilecon() is used, so that the link itself is updated, not what it's pointing to. In addition, drop the ENOTSUP special case. SELinux has been a requirement since Android 4.4. Running without filesystem extended attributes is no longer supported, and we shouldn't even try to handle non-SELinux updates anymore. (Note: this could be problematic if these scripts are ever used to produce OTA images for 4.2 devices) Bug: 18079773 Change-Id: I87f99a1c88fe02bb2914f1884cac23ce1b385f91
| | | | * | | am 45322f93: am da500cec: am 168f7778: Allow passing of mount args to mountFnMichael Runge2014-10-241-5/+18
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '45322f939a5bf66d378aab57e1fee1aa29ff9469': Allow passing of mount args to mountFn
| * | | | | | am da500cec: am 168f7778: Allow passing of mount args to mountFnMichael Runge2014-10-241-5/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'da500cecf5b004498c0dd17bc27a30eb4b0b9a2d': Allow passing of mount args to mountFn
| | * | | | | am 168f7778: Allow passing of mount args to mountFnMichael Runge2014-10-231-5/+18
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '168f77787700f0e9f66675beef33c593a777e64e': Allow passing of mount args to mountFn
| | | * | | | Allow passing of mount args to mountFnMichael Runge2014-10-231-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18079773 Bug: 18092222 Change-Id: Ifc3f3e123de729dfbb2f49414b3207afa96268d5
| | | | * | | am d1e909e7: am 4da9cdea: am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-devBrian Carlstrom2014-10-241-34/+50
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit 'd1e909e77d6c20aa88630a86d7a93de54d5cf2af': Log to UI any metadata setting errors
| * | | | | | am 4da9cdea: am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-devBrian Carlstrom2014-10-241-34/+50
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4da9cdeab97297e69075dd9b6cad9921cfae30b9': Log to UI any metadata setting errors
| | * | | | | am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-devBrian Carlstrom2014-10-231-34/+50
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '473967d87ff9fc7a541c16ebdc56364c285d2862': Log to UI any metadata setting errors
| | | * | | | Merge "Log to UI any metadata setting errors" into lmp-devBrian Carlstrom2014-10-231-34/+50
| | | |\ \ \ \
| | | | * | | | Log to UI any metadata setting errorsMichael Runge2014-10-231-34/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18079773 Change-Id: Ic6fddbcbcb6ddb9e1cbd1698df98387c0033ae15
| | | | | * | | am 3e62e9d9: am d0602fbb: am 9b2db80d: Merge "Make /cache/recovery/last_log available in recovery" into lmp-devNick Kralevich2014-10-233-5/+76
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '3e62e9d93e97e39c260b62ac230002ae21ed4d96': Make /cache/recovery/last_log available in recovery
| * | | | | | | am d0602fbb: am 9b2db80d: Merge "Make /cache/recovery/last_log available in recovery" into lmp-devNick Kralevich2014-10-233-5/+76
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd0602fbb88c095520d0fc88e821eb5557298e32b': Make /cache/recovery/last_log available in recovery
| | * | | | | | am 9b2db80d: Merge "Make /cache/recovery/last_log available in recovery" into lmp-devNick Kralevich2014-10-233-5/+76
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b2db80d407752fd524e799e4c7051162e63f91c': Make /cache/recovery/last_log available in recovery
| | | * | | | | Merge "Make /cache/recovery/last_log available in recovery" into lmp-devNick Kralevich2014-10-233-5/+76
| | | |\ \ \ \ \
| | | | * | | | | Make /cache/recovery/last_log available in recoveryNick Kralevich2014-10-233-5/+76
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new recovery UI option to allow the user to view /cache/recovery/last_log for their device. This gives enhanced debugging information which may be necessary when a failed OTA occurs. Bug: 18094012 Change-Id: Ic3228de96e9bfc2a0141c7aab4ce392a38140cf3
| | | | | * | | am c224ac28: am 3b5c6dca: am 2f0ef730: Treat already-renamed files as having no problems.Michael Runge2014-10-231-0/+3
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'c224ac28adf1248dcd5716a0c6ed77825418fe0d': Treat already-renamed files as having no problems.
| * | | | | | | am 3b5c6dca: am 2f0ef730: Treat already-renamed files as having no problems.Michael Runge2014-10-231-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b5c6dca0a448d1a09bf9adb905bc5a86230c7fc': Treat already-renamed files as having no problems.
| | * | | | | | am 2f0ef730: Treat already-renamed files as having no problems.Michael Runge2014-10-231-0/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f0ef73029fc51c6404121f338b034c8b516652c': Treat already-renamed files as having no problems.
| | | * | | | | Treat already-renamed files as having no problems.Michael Runge2014-10-231-0/+3
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should help with reentrant OTAs. Bug: 18079773 Change-Id: I102fd738e3b450483ecd4471384c12e89fc586e2
| | | | * | | am 0745fbfa: am c7249660: am 4f66469b: Merge "More test makefile cleanup."Dan Albert2014-10-230-0/+0
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | * commit '0745fbfad9cadafc0f911ec7c6d06d470839b85a':
| * | | | | | am c7249660: am 4f66469b: Merge "More test makefile cleanup."Dan Albert2014-10-230-0/+0
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | * commit 'c7249660f908c74687b5fdadc1296eb9d4903cc7':
* | | | | | | am 4f66469b: Merge "More test makefile cleanup."Dan Albert2014-10-171-24/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4f66469b29a34811b69518a266be31fe42cc111b': More test makefile cleanup.
| | | | | * \ \ am 440185cd: am ea5828a2: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""Dan Albert2014-10-230-0/+0
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | * commit '440185cdd383289fbf8afec353aa64fe0ed30773':
| | * | | | | | am ea5828a2: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""Dan Albert2014-10-230-0/+0
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | * commit 'ea5828a24f3a8f6a44e2f15e76cacdb5bc524db0':
* | | | | | | | am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""Dan Albert2014-09-261-4/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28ffde5ebd33d5b693906a93087e6eea627cd8d0': Revert "Copy epoll(2) changes to minadb."
| | | | | | * \ \ am 39705685: am e95ed95f: am a6e13ae0: Include reason when wiping data.Jeff Sharkey2014-10-230-0/+0
| | | | | | |\ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | * commit '3970568560f62c87d9ef7a1c0617c16b23271b6e':
| | | * | | | | | am e95ed95f: am a6e13ae0: Include reason when wiping data.Jeff Sharkey2014-10-230-0/+0
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | * commit 'e95ed95f05d22929e0bb8610a83c4e6a01fb3a33':
* | | | | | | | | am a6e13ae0: Include reason when wiping data.Jeff Sharkey2014-09-251-0/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a6e13ae01bff5109361868f565187f16d045c82d': Include reason when wiping data.
| | | | | | * | | am e5ce559f: am 78a30278: am 530b61e0: Merge "Copy epoll(2) changes to minadb."Elliott Hughes2014-10-230-0/+0
| | | | | | |\ \ \ | | | | | |_|/ / / | | | | |/| | | | | | | | | | | | | * commit 'e5ce559fb620ddea535b428d4cc21da701a5e4e7':
| | | | * | | | | am 78a30278: am 530b61e0: Merge "Copy epoll(2) changes to minadb."Elliott Hughes2014-10-230-0/+0
| | | | |\ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | * commit '78a30278607f0e57ace53eb5df7e5f7f196387a4':
* | | | | | | | | am 530b61e0: Merge "Copy epoll(2) changes to minadb."Elliott Hughes2014-09-231-21/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '530b61e0b5f154e5f38853c10a28e0ea6f41c2ca': Copy epoll(2) changes to minadb.
| | | | | | | * \ \ am dd57886c: am 9eb8c8bd: init.rc: Inidicate that booting is complete wrt firwmare requestsJP Abgrall2014-10-211-1/+6
| | | | | | | |\ \ \ | | | | | | |_|/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd57886ce6ec100ce212b7d8d1f6991a4b77e004': init.rc: Inidicate that booting is complete wrt firwmare requests
| | | | | * | | | | am 9eb8c8bd: init.rc: Inidicate that booting is complete wrt firwmare requestsJP Abgrall2014-10-211-1/+6
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9eb8c8bdbe4965e9a92d83882e97cf67aee20821': init.rc: Inidicate that booting is complete wrt firwmare requests
| | | | | | * | | | init.rc: Inidicate that booting is complete wrt firwmare requestsJP Abgrall2014-10-211-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ueventd will wait for /dev/.booting to go away before giving up on loading firmware. The issue was introduced in Ifdd5dd1e95d7e064dde5c80b70198882d949a710 which forgot to update recovery's init.rc Bug: 17993625 Change-Id: I91205fe6eea50aaef9b401d650ec8d6843a92a57
| | | | | | | * | | am 5b7f5b15: am 4f66469b: Merge "More test makefile cleanup."Dan Albert2014-10-171-24/+23
| | | | | | | |\ \ \ | | | | | | |_|/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '5b7f5b15af016299e10d18979ec65720ab447786': More test makefile cleanup.
| | | | | * | | | | am 4f66469b: Merge "More test makefile cleanup."Dan Albert2014-10-171-24/+23
| | | | | |\ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '4f66469b29a34811b69518a266be31fe42cc111b': More test makefile cleanup.
| | | | * | | | | | Merge "More test makefile cleanup."Dan Albert2014-10-171-24/+23
| | | |/| | | | | |
| | | | * | | | | | More test makefile cleanup.Dan Albert2014-10-171-24/+23
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Global variables kill. No need to manually link gtest, and that causes problems with libc++. Change-Id: If804cdd436cf1addfa9a777708efbc37c27770b6
| | | | | | * | | am 93ecb938: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""Dan Albert2014-09-261-4/+21
| | | | | | |\ \ \ | | | | | |_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | * commit '93ecb9383a22c6828c9b332b7d1089ff97319999': Revert "Copy epoll(2) changes to minadb."
| | | | * | | | | am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""Dan Albert2014-09-261-4/+21
| | | | |\ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '28ffde5ebd33d5b693906a93087e6eea627cd8d0': Revert "Copy epoll(2) changes to minadb."
| | | * | | | | | Merge "Revert "Copy epoll(2) changes to minadb.""Dan Albert2014-09-261-4/+21
| | |/| | | | | | | |/| | | | | | |
| | | * | | | | | Revert "Copy epoll(2) changes to minadb."Dan Albert2014-09-261-4/+21
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | This reverts commit db8c959049d21fe63e48c270f1fc12b32a0cf0ec.
| | | | | * | | am 91c27888: am d83e4f15: support for version 2 of block image diffsDoug Zongker2014-09-260-0/+0
| | | | | |\ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '91c27888517c514d1da8cbcd76fdc4b437d193f8': support for version 2 of block image diffs
| | | * | | | | am d83e4f15: support for version 2 of block image diffsDoug Zongker2014-09-261-45/+209
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd83e4f15890ac6ebe0d61924bd224eb1ae8565ad': support for version 2 of block image diffs
| | | | * | | | support for version 2 of block image diffsDoug Zongker2014-09-261-45/+209
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In version 2 of block image diffs, we support a new command to load data from the image and store it in the "stash table" and then subsequently use entries in the stash table to fill in missing bits of source data we're not allowed to read when doing move/bsdiff/imgdiff commands. This leads to smaller update packages because we can break cycles in the ordering of how pieces are updated by storing data away and using it later, rather than not using the data as input to the patch system at all. This comes at the cost of the RAM or scratch disk needed to store the data. The implementation is backwards compatible; it can still handle the existing version 1 of the transfer file format. Change-Id: I4559bfd76d5403859637aeac832f3a5e9e13b63a
| | | | * | | am 62656652: am a6e13ae0: Include reason when wiping data.Jeff Sharkey2014-09-251-0/+4
| | | | |\ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '6265665282a913a545606f4e8a20de8c57c3ae84': Include reason when wiping data.
| | | * | | | am a6e13ae0: Include reason when wiping data.Jeff Sharkey2014-09-251-0/+4
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit 'a6e13ae01bff5109361868f565187f16d045c82d': Include reason when wiping data.
| | * | | | | Include reason when wiping data.Jeff Sharkey2014-09-241-0/+4
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help us track down who requested a data wipe. Bug: 17412160 Change-Id: I1c439fbd29f96b9851810baca9101f683a0f18d8
| | | * | | am 970c3947: am 530b61e0: Merge "Copy epoll(2) changes to minadb."Elliott Hughes2014-09-231-21/+4
| | | |\ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '970c3947f39e8c880dd9f32002f9c7a9cdc96d54': Copy epoll(2) changes to minadb.
| | * | | | am 530b61e0: Merge "Copy epoll(2) changes to minadb."Elliott Hughes2014-09-231-21/+4
| |/| | | | |/|/ / / / | | | | | | | | | | | | | | | * commit '530b61e0b5f154e5f38853c10a28e0ea6f41c2ca': Copy epoll(2) changes to minadb.
| * | | | Merge "Copy epoll(2) changes to minadb."Elliott Hughes2014-09-231-21/+4
| |\ \ \ \
| | * | | | Copy epoll(2) changes to minadb.Elliott Hughes2014-09-231-21/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 17588403 Change-Id: Ib3525824ff09330bd9d6f9e96d662e5a55a20ec2
| | * | | Use the correct fuse_init_out structure size.Christopher Ferris2014-09-181-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kernel 2.6.16 is the first stable kernel with struct fuse_init_out defined (fuse version 7.6). The structure is the same from 7.6 through 7.22. Beginning with 7.23, the structure increased in size and added new parameters. If the kernel only works on minor revs older than or equal to 22, then use the older structure size since this code only uses the 7.22 version of the structure. Change-Id: I00d7530e01e6b4718dcd04ad2484959d12ef4a65
| | * | | support for version 2 of block image diffsDoug Zongker2014-09-081-45/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In version 2 of block image diffs, we support a new command to load data from the image and store it in the "stash table" and then subsequently use entries in the stash table to fill in missing bits of source data we're not allowed to read when doing move/bsdiff/imgdiff commands. This leads to smaller update packages because we can break cycles in the ordering of how pieces are updated by storing data away and using it later, rather than not using the data as input to the patch system at all. This comes at the cost of the RAM or scratch disk needed to store the data. The implementation is backwards compatible; it can still handle the existing version 1 of the transfer file format. Change-Id: I7fafe741d86b92d82d46feb2939ecf5a3890dc64
| | * | | am 574443d8: create block map for all update packages on /dataDoug Zongker2014-09-051-12/+9
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * commit '574443d8956802f35347cac7fae7eb16240e3c16': create block map for all update packages on /data
* | | | | create block map for all update packages on /dataDoug Zongker2014-09-051-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always create the block map for packages on /data; don't only look at the encryptable/encrypted flags. Bug: 17395453 Change-Id: Iaa7643a32898328277841e324305b9419a9e071c
| | * | | am 40482ea2: Merge "fix comment in blockimg updater code" into lmp-devDoug Zongker2014-09-041-3/+3
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * commit '40482ea2ae5ca8cbcf46125f601c0bc766f99943': fix comment in blockimg updater code
* | | | | Merge "fix comment in blockimg updater code" into lmp-devDoug Zongker2014-09-041-3/+3
|\ \ \ \ \
| * | | | | fix comment in blockimg updater codeDoug Zongker2014-09-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment for the DEBUG_ERASE setting is exactly backwards. Change-Id: I98ab5828365894217fc78976817a131e7d22d5c1
| | | * | | am 8328922f: use lseek64 instead of lseekAndrew Boie2014-09-041-11/+11
| | | |\ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | * commit '8328922ff040280007da0aaaf8b567581231d5ed': use lseek64 instead of lseek
* | | | | | use lseek64 instead of lseekAndrew Boie2014-09-041-11/+11
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, overflow problems can occur with images larger than 2G since the offsets will overflow a 32-bit off_t. Change-Id: I05951a38ebeae83ad2cb938594e8d8adb323e2aa Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
| | * | | am 5f875bf5: remove code for original block OTA mechanismDoug Zongker2014-08-270-0/+0
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * commit '5f875bf57739bf0b5c2d182173513233bdb71ab8': remove code for original block OTA mechanism
* | | | | remove code for original block OTA mechanismDoug Zongker2014-08-262-209/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Superseded by newer code. Bug: 16984795 Change-Id: I842299f6a02af7ccf51ef2ca174d813ca53deef1
| | * | | Merge "remove code for original block OTA mechanism"Doug Zongker2014-08-262-209/+6
| | |\ \ \
| | | * | | remove code for original block OTA mechanismDoug Zongker2014-08-252-209/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Superseded by newer code. Bug: 16984795 Change-Id: I70c1d29dc03287b06ea909d17f729ec51ccb0344
| | * | | | am f449db2f: open misc device in write-only modeDoug Zongker2014-08-262-19/+27
| | |\ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | | | | | * commit 'f449db2f30235a0c2fef4bc7bc41776e271a60a0': open misc device in write-only mode
* | | | | open misc device in write-only modeDoug Zongker2014-08-262-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Opening the misc block device in read-write mode runs afoul of SELinux, which keeps the wipe code from working. Fix. Also change various things to log to logcat so we can see them happening, for future debugging. Bug: 16715412 Change-Id: Ia14066f0a371cd605fcb544547b58a41acca70b9
| | * | | am 1d5d6098: fix two bugs in block image updaterDoug Zongker2014-08-211-18/+32
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * commit '1d5d6098f4a470bc8e56ae8914180041815e6e22': fix two bugs in block image updater
* | | | | fix two bugs in block image updaterDoug Zongker2014-08-211-18/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The computation of file offsets was overflowing for partitions larger than 2 GB. The parsing of the transfer file could fail at the end if the data happened to not be properly null-terminated. Bug: 16984795 Change-Id: I3ce6eb3e54ab7b55aa9bbed252da5a7eacd3317a
| | * | | am bc7ffeda: installer for new block OTA systemDoug Zongker2014-08-200-0/+0
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * commit 'bc7ffeda98a861e346c30c771d3258030f7fcf21': installer for new block OTA system
* | | | | installer for new block OTA systemDoug Zongker2014-08-2010-10/+669
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Cherry-pick back from master.) Bug: 16984795 Change-Id: Ifa3d8345c5e2a0be86fb28faa080ca82592a96b4
| | * | | Merge "installer for new block OTA system"Doug Zongker2014-08-1910-10/+669
| | |\ \ \
| | | * | | installer for new block OTA systemDoug Zongker2014-08-1910-10/+669
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16984795 Change-Id: I90f958446baed83dec658de2430c8fc5e9c3047e
| | * | | | am 2efc9d99: clear BCB in misc partition before rebootingDoug Zongker2014-08-191-3/+43
| | |\ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | | | | | * commit '2efc9d994ce59f9ebfc2290c2adc5d760e8939c2': clear BCB in misc partition before rebooting
* | | | | clear BCB in misc partition before rebootingDoug Zongker2014-08-191-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Something is leaving behind wipe commands in the BCB area of the /misc partition. We don't know what is doing that. It should always be safe to zero out that area from uncrypt, though (because if uncrypt is running then it's got the command we want in the recovery command file rather than the BCB). Bug: 16715412 Change-Id: Iad01124287f13b80ff71d6371db6371f43c43211
| | * | | am 1a35a586: revert uncrypt back to dynamic linking, fix libsDoug Zongker2014-08-151-6/+1
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * commit '1a35a586904cd429fd3a6a6c2de64a16ccdf693d': revert uncrypt back to dynamic linking, fix libs
* | | | | revert uncrypt back to dynamic linking, fix libsDoug Zongker2014-08-141-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17029174, 17015157 Change-Id: I1d24f3402875dfb972daa6daef0f385baeff84e9
| | * | | am 537d34f9: change uncrypt to static linkingDoug Zongker2014-08-151-0/+2
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * commit '537d34f907a5e984ccad1c88825adc8ae9814834': change uncrypt to static linking
* | | | | change uncrypt to static linkingDoug Zongker2014-08-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17015157 Change-Id: I3c4bdcf4f11d44b617bb731a48413e3707044d1c
| | * | | am 9dc71cfa: Merge "Erase PST partition if its marked to be erased." into lmp-devAndres Morales2014-08-063-0/+44
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * commit '9dc71cfa5233789a50d8a9d2c9af87d0f106d4ad': Erase PST partition if its marked to be erased.
* | | | | Merge "Erase PST partition if its marked to be erased." into lmp-devAndres Morales2014-08-053-0/+44
|\ \ \ \ \
| * | | | | Erase PST partition if its marked to be erased.Andres Morales2014-08-063-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to wipe the challenges on this partition if OEM unlock is enabled, as this is a signal that the user has opted out of factory reset protection. go/factory-reset Bug: 16633064 Change-Id: Icb8f1433bf99ca57813f5b72d5a3dd15fa94a263
| | | * | | am 2b5f0e0f: remove spurious parens from error messageDoug Zongker2014-08-061-4/+3
| | | |\ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | * commit '2b5f0e0f767ce51d9605809052ad04fe83d1df83': remove spurious parens from error message
* | | | | | remove spurious parens from error messageDoug Zongker2014-08-061-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These error messages include empty parens after each string substition. Ill-advised cut and paste, probably. Bug: 16467401 Change-Id: Ib623172d6228354afdcc2e33442cc53a07f0ecbc
| | | * | | am 78d458c3: Fix length printing + formatsJP Abgrall2014-08-051-3/+3
| | | |\ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | * commit '78d458c3d279a24a60fda013026b7a5454d01a9b': Fix length printing + formats
* | | | | | Fix length printing + formatsJP Abgrall2014-08-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong argument order. Fix for 32 vs 64 bit. (reported by htc) Change-Id: Ie37a280bed2848199bcc075500e1326e371cd326
| | | * | | am eaf33654: only do uncryption on packages in /dataDoug Zongker2014-08-011-1/+1
| | | |\ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | * commit 'eaf33654c1817bd665831a13c5bd0c04daabee02': only do uncryption on packages in /data
* | | | | | only do uncryption on packages in /dataDoug Zongker2014-08-011-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If recovery is invoked with a package somewhere other than /data, leave it alone. Change-Id: Ief358b53df467ae24a65e30e7a631da59bf13683
| | * | | am a91ecc59: Auto create parent directories for rename supportMichael Runge2014-07-220-0/+0
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * commit 'a91ecc59b2753a3dcc93b2619559a980074e77bd': Auto create parent directories for rename support
* | | | | Auto create parent directories for rename supportMichael Runge2014-07-222-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes renames will move a file into a directory that does not yet exist. This will create the parent directories, using the same symlink logic, to ensure that there is a valid destination. Change-Id: Iaa005a12ce800c39f4db20f7c25a2a68cb40a52d
| | * | | Auto create parent directories for rename supportMichael Runge2014-07-222-3/+7
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes renames will move a file into a directory that does not yet exist. This will create the parent directories, using the same symlink logic, to ensure that there is a valid destination. Bug: 16458395 Change-Id: Iaa005a12ce800c39f4db20f7c25a2a68cb40a52d
* | | | do sdcard sideloading through the fuse filesystemDoug Zongker2014-07-104-102/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make a fuse filesystem that sits on top of the selected package file on the sdcard, so we can verify that the file contents don't change while being read and avoid copying the file to /tmp (that is, RAM) before verifying and installing it. Change-Id: Ifd982aa68bfe469eda5f839042648654bf7386a1
* | | | refactor fuse sideloading codeDoug Zongker2014-07-109-43/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the adb-specific portions (fetching a block from the adb host and closing the connections) out from the rest of the FUSE filesystem code, so that we can reuse the fuse stuff for installing off sdcards as well. Change-Id: I0ba385fd35999c5f5cad27842bc82024a264dd14
* | | | drop APPLY_CACHE and refactor APPLY_EXTDoug Zongker2014-07-082-64/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop support for sideloading OTA packages of the cache partition (a half-solution that's long since been deprecated by "adb sideload"). Refactor the code to sideload OTA packages from SD cards: remove the installation code from the file browser. Change-Id: Id0dff6b27c4a5837546f174f50e2e1d0379c43db
* | | | sideload without holding the whole package in RAMDoug Zongker2014-07-0211-71/+618
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement a new method of sideloading over ADB that does not require the entire package to be held in RAM (useful for low-RAM devices and devices using block OTA where we'd rather have more RAM available for binary patching). We communicate with the host using a new adb service called "sideload-host", which makes the host act as a server, sending us different parts of the package file on request. We create a FUSE filesystem that creates a virtual file "/sideload/package.zip" that is backed by the ADB connection -- users see a normal file, but when they read from the file we're actually fetching the data from the adb host. This file is then passed to the verification and installation systems like any other. To prevent a malicious adb host implementation from serving different data to the verification and installation phases of sideloading, the FUSE filesystem verifies that the contents of the file don't change between reads -- every time we fetch a block from the host we compare its hash to the previous hash for that block (if it was read before) and cause the read to fail if it changes. One necessary change is that the minadbd started by recovery in sideload mode no longer drops its root privileges (they're needed to mount the FUSE filesystem). We rely on SELinux enforcement to restrict the set of things that can be accessed. Change-Id: Ida7dbd3b04c1d4e27a2779d88c1da0c7c81fb114
* | | | am 3e0fc39e: am 974fe112: Merge "Fix recovery mode."Riley Andrews2014-06-251-1/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6': Fix recovery mode.
| * | | | am 974fe112: Merge "Fix recovery mode."Riley Andrews2014-06-251-1/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '974fe112ae6df95ca6d49688d6e3e459d87e16de': Fix recovery mode.
| | * | | Merge "Fix recovery mode."Riley Andrews2014-06-241-1/+19
| | |\ \ \
| | | * | | Fix recovery mode.Riley Andrews2014-06-251-1/+19
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Duplicate changes made to init.rc for https://android-review.googlesource.com/98852 in the init.rc used for recovery mode. Bug 15849856 Change-Id: Ia376ddf6373a28718653f7fb1435bf7ecb33d813
* | | | | recovery: enable panic_on_oopsColin Cross2014-06-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set panic_on_oops=1 to reboot if the kernel panics. Change-Id: Id9e8689a570229db2ea2a3d72b52784f8a1ed107
* | | | | Use LOCAL_REQUIRED_MODULES for mkfs.f2fsJi-Hwan Lee2014-06-181-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of LOCAL_ADDITIONAL_DEPENDENCIES. Bug: 15702524 Change-Id: Ic152ae60354bf09eccdb9a85dcd04f0f076a6422
* | | | | Support F2FS for the data partitionJP Abgrall2014-06-173-15/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds F2FS support - for wiping a device - for the install "format" command. Note: crypto data in "footer" with a default/negative length is not supported, unlike with "ext4". Change-Id: I8d141a0d4d14df9fe84d3b131484e9696fcd8870 Signed-off-by: JP Abgrall <jpa@google.com>
* | | | | minui: avoid random screen frame at startupJoey Pan2014-06-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear framebuffer at init. [toddpoynor@google.com: forward port] Change-Id: Ie98c7724cd974dcacef3e3559a6fe492864a5e72
* | | | | advance progress bar during block OTA installationsDoug Zongker2014-06-091-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While executing syspatch and package_extract_file() calls with don't care maps (both of which are used to rewrite the system image in incremental and full block OTAs, respectively), pass a progress callback in and use it to update the visible progress bar. Change-Id: I1d3742d167c1bb2130571eb5103b7795c65ff371
* | | | | am dff8afe1: (-s ours) restore holo UI in recovery -- DO NOT MERGEDoug Zongker2014-06-060-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dff8afe1b21c6ffe09269434f9f8f0d166e1a848': restore holo UI in recovery -- DO NOT MERGE
| * | | | | restore holo UI in recovery -- DO NOT MERGEDoug Zongker2014-06-0312-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we don't have quantum assets for recovery yet, go back to the holo appearance (dark background, blue glowing progress bar) for lmp-preview. Change-Id: Id4d3f23e0a6251a12aa42f3793cff347f38b4243
* | | | | | Merge "restore holo UI in recovery"Doug Zongker2014-06-0612-16/+16
|\ \ \ \ \ \
| * | | | | | restore holo UI in recoveryDoug Zongker2014-06-0612-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return to the recovery to the holo appearance. Bug: 15424396 Change-Id: Id4d3f23e0a6251a12aa42f3793cff347f38b4243
* | | | | | | am 54a61179: am cfd4b286: Merge "recovery: initialize keys press tracking status"Doug Zongker2014-06-061-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | * commit '54a6117935fe7470d23f7a538aeec9d6b139791b': recovery: initialize keys press tracking status
| * | | | | am cfd4b286: Merge "recovery: initialize keys press tracking status"Doug Zongker2014-06-061-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'cfd4b2864534f062a01730d81b2cd7e054087e8f': recovery: initialize keys press tracking status
| | * | | | Merge "recovery: initialize keys press tracking status"Doug Zongker2014-06-061-0/+1
| | |\ \ \ \
| | | * | | | recovery: initialize keys press tracking statusMihai Serban2014-06-061-0/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks for keys pressed return random results because of an uninitialized data structure. Change-Id: Ic8b3d453d62347921aa893403079b374c16a092e Signed-off-by: Mihai Serban <mihai.serban@intel.com>
* | | / / / disable async reboot during package installationDoug Zongker2014-05-234-4/+47
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default recovery UI will reboot the device when the power key is pressed 7 times in a row, regardless of what recovery is doing. Disable this feature during package installation, to minimize the chance of corrupting the device due to a mid-install reboot. (Debug packages can explicitly request that the feature be reenabled.) Change-Id: I20f3ec240ecd344615d452005ff26d8dd7775acf
* | | | | am 502e4595: am d1c64060: am 5fbb729f: Merge "exit instead of return if sideload file creation fails"Doug Zongker2014-05-161-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '502e45957420484eec2367e7580e9bec96605c5d': exit instead of return if sideload file creation fails
| * | | | am d1c64060: am 5fbb729f: Merge "exit instead of return if sideload file creation fails"Doug Zongker2014-05-161-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd1c64060abf8a56a259c0913244448fdba245f6c': exit instead of return if sideload file creation fails
| | * | | am 5fbb729f: Merge "exit instead of return if sideload file creation fails"Doug Zongker2014-05-161-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '5fbb729f3eb67c9bb59580f692a31e5c50e24e6d': exit instead of return if sideload file creation fails
| | | * \ \ Merge "exit instead of return if sideload file creation fails"Doug Zongker2014-05-161-1/+1
| | | |\ \ \
| | | | * | | exit instead of return if sideload file creation failsEthan Yonker2013-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A return here leaves adb sideload in a permanent loop. An exit is more appropriate for this error. Change-Id: I80fb8abae4f6378833aa75f9eaf7ec1acd44b274 Signed-off-by: Ethan Yonker <ethanayonker@gmail.com>
* | | | | | | am c4804e9b: am d4592694: am 3ca99f6c: Merge "fix vulnerability in bspatch"Doug Zongker2014-05-161-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c4804e9b9c143652d17441b4b672b920b11cc94a': fix vulnerability in bspatch
| * | | | | | am d4592694: am 3ca99f6c: Merge "fix vulnerability in bspatch"Doug Zongker2014-05-161-0/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4592694b41d5f8309d98cd3312b5486216cc685': fix vulnerability in bspatch
| | * | | | | am 3ca99f6c: Merge "fix vulnerability in bspatch"Doug Zongker2014-05-161-0/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3ca99f6cb8ffbe19c7ef5409f3dac18ea0c254bd': fix vulnerability in bspatch
| | | * | | | Merge "fix vulnerability in bspatch"Doug Zongker2014-05-161-0/+5
| | | |\ \ \ \
| | | | * | | | fix vulnerability in bspatchDoug Zongker2014-05-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patches with control data tuples with negative numbers in the first and/or second can cause bspatch to write to arbitrary locations in the heap. Change-Id: I8c5d81948be773e6483241131d3d166b6da27cb8
* | | | | | | | am 0766cdf4: am d2fb4ed5: am d27aa76a: Merge "Support BGRA framebuffer"Doug Zongker2014-05-141-0/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0766cdf49acb77677864995e931eec391243505d': Support BGRA framebuffer
| * | | | | | | am d2fb4ed5: am d27aa76a: Merge "Support BGRA framebuffer"Doug Zongker2014-05-141-0/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd2fb4ed58997afd18bd2b5274bf1835644d454fb': Support BGRA framebuffer
| | * | | | | | am d27aa76a: Merge "Support BGRA framebuffer"Doug Zongker2014-05-141-0/+13
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd27aa76a6ff6436cfb8340bf3d04aba186cc4de1': Support BGRA framebuffer
| | | * | | | | Merge "Support BGRA framebuffer"Doug Zongker2014-05-141-0/+13
| | | |\ \ \ \ \
| | | | * | | | | Support BGRA framebufferDaniel Leung2014-05-141-0/+13
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The re-designed recovery graphics code only supports RGB{_,X,A} framebuffer, and this patch adds support for BGRA framebuffer. Change-Id: I3780c8288088f497fa248f3492c54f43834a8598 Signed-off-by: Daniel Leung <daniel.leung@intel.com> Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com> Reviewed-by: Parkinson, TimothyX L <timothyx.l.parkinson@intel.com> Tested-by: Parkinson, TimothyX L <timothyx.l.parkinson@intel.com> Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com> Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
* | | | | | | | am 48abd574: am 34ff5fe3: am 74b90b30: Merge "screen_ui: Initialize text buffer"Doug Zongker2014-05-131-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '48abd574cb1b7b0adbe1de36224fb974182aaa2d': screen_ui: Initialize text buffer
| * | | | | | | am 34ff5fe3: am 74b90b30: Merge "screen_ui: Initialize text buffer"Doug Zongker2014-05-131-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '34ff5fe3f59abfb1984189ade32059cc47bf97e5': screen_ui: Initialize text buffer
| | * | | | | | am 74b90b30: Merge "screen_ui: Initialize text buffer"Doug Zongker2014-05-131-0/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '74b90b309f67dc3b8bb74e47c4eddf7ce511bc35': screen_ui: Initialize text buffer
| | | * | | | | Merge "screen_ui: Initialize text buffer"Doug Zongker2014-05-131-0/+2
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | screen_ui: Initialize text bufferBjorn Andersson2013-09-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Zero initialize the text buffer to make recovery not render garbage when showing the menu or messages. Change-Id: I0dd0d357757f6b0fd52ad3b3617d42bb1b835245
* | | | | | | | Allow 0-byte files in full OTAs.Michael Runge2014-05-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the writeProcessFunction fails when there are zero bytes to write, potentially returning errno from a previous operation, or hanging indefinitely while it waits for a >0 result on a write of size 0. This happens when the output file is intended to be zero bytes in size. Change-Id: Ib3cfcaf66d82942bc89e5f5c64697862403b38da
* | | | | | | | am e9f9238a: am 1cd52423: am 1c2cf1db: Merge "recovery: minui: add adf backend"Greg Hackmann2014-05-035-5/+267
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e9f9238af83f949dc000667356eba025e1241a2f': recovery: minui: add adf backend
| * | | | | | | am 1cd52423: am 1c2cf1db: Merge "recovery: minui: add adf backend"Greg Hackmann2014-05-035-5/+267
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1cd5242349bb1ef10eca76ff2c3e17415aecdf9d': recovery: minui: add adf backend
| | * | | | | | am 1c2cf1db: Merge "recovery: minui: add adf backend"Greg Hackmann2014-05-035-5/+267
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1c2cf1db0db2c9e9310d27bdc19c605f5537b72f': recovery: minui: add adf backend
| | | * | | | | Merge "recovery: minui: add adf backend"Greg Hackmann2014-05-035-5/+267
| | | |\ \ \ \ \
| | | | * | | | | recovery: minui: add adf backendGreg Hackmann2014-04-265-5/+267
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ad97b5b62bddbcb1104fa0b4e54415b793a4194 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | | | Allow lines without = signs.Michael Runge2014-05-021-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new build.prop for Sprout includes lines of the format: import xxx.prop These can be safely ignored when reading the property file. Change-Id: Ia84a138e71461ffe8e591e88143b9787873def29
* | | | | | | | am ddaaccb3: am 29759e9d: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEADBill Yi2014-04-301-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ddaaccb3db623ff6f19b7dadf51d41cc46bb05c3':
| * | | | | | | am 29759e9d: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEADBill Yi2014-04-301-1/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '29759e9d518880adba366c502cf79d53c48a31bb':
| | * | | | | | Merge commit '25c2b2f670a3b11f7ce78eccde10c1a79188c9a8' into HEADBill Yi2014-04-299-29/+180
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | am aa4545b5: Merge "restore minui support for paletted images with < 8 bits"Doug Zongker2014-03-201-1/+1
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa4545b5aedae165c8d2db0009dcdfa18e4f7923': restore minui support for paletted images with < 8 bits
| | | * \ \ \ \ \ resolved conflicts for merge of 708aa238 to klp-dev-plus-aospDoug Zongker2014-03-181-4/+10
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1d15be84cec58e23472ef2014d322f3f55c6bb8
| | | * \ \ \ \ \ \ am 130a7985: Merge "fix error log statement"Doug Zongker2014-03-181-1/+1
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '130a7985386f7f7741179fc38b1a15da7ec9f358': fix error log statement
| | | * \ \ \ \ \ \ \ resolved conflicts for merge of d90da130 to klp-dev-plus-aospDoug Zongker2014-03-186-244/+253
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I19f9f460145fdcf5cdc58ee4fa25ff3c9ba398f0
| | | * \ \ \ \ \ \ \ \ am 026ebe02: Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-1411-30/+33
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc': Recovery 64-bit compile issues
| | | * \ \ \ \ \ \ \ \ \ am a7266ef0: Merge "separate fbdev-specific code out from minui"Doug Zongker2014-03-135-152/+268
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7266ef0b1804e3ddeea58bda9a416e807a55f88': separate fbdev-specific code out from minui
| | | * \ \ \ \ \ \ \ \ \ \ am c91612d4: Merge "remove pixelflinger from recovery"Doug Zongker2014-03-136-274/+358
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c91612d4668688c5d7bf76c258c11010697a03d2': remove pixelflinger from recovery
| | | * \ \ \ \ \ \ \ \ \ \ \ am 8f087d02: Merge "update tools for making recovery images"Doug Zongker2014-03-132-102/+53
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8f087d024619467de8609656e8a14370f24b817c': update tools for making recovery images
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am 59508993: Merge "allow CheckKey to request mounting /system"Doug Zongker2014-03-133-3/+52
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5950899369b712f66aa56c857c66ed1b6741f0e0': allow CheckKey to request mounting /system
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'ea868b38' into manualmergeDoug Zongker2014-03-1318-103/+204
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: screen_ui.cpp screen_ui.h Change-Id: Iefe7dde04cc76639f56730a19238436073f18ffb
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2f173bde: Merge "ADB sideload command not work"Doug Zongker2014-03-113-11/+358
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f173bde6584f4c560ecc3f13f6e890f52815050': ADB sideload command not work
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ac189bf6: Merge "recovery: Fix adb with linux 3.10"Benoit Goby2014-03-081-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac189bf645123b4dc79cd2053f5eb07917774d66': recovery: Fix adb with linux 3.10
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"Colin Cross2014-03-073-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5d105e2397d81537facd93fd8a9d3e263d57dc9': recovery: fix building with pointer-to-int errors turned on
* | | | | | | | | | | | | | | | | | | | | am 9e8d81ba: am 0e22af65: recovery: Fix adb with linux 3.10Benoit Goby2014-04-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9e8d81ba96b299cc084723797d9f492d4441d57a': recovery: Fix adb with linux 3.10
| * | | | | | | | | | | | | | | | | | | | am 0e22af65: recovery: Fix adb with linux 3.10Benoit Goby2014-04-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e22af658c89fb53ab1215a3538bbaf10d733ad9': recovery: Fix adb with linux 3.10
| | * | | | | | | | | | | | | | | | | | | recovery: Fix adb with linux 3.10Benoit Goby2014-04-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In kernel 3.10, f_adb has been removed and adbd can use functionfs instead. Mount functionfs on boot for adbd. On older kernels, mount will fail silently and adbd will revert to f_adb. Bug: 14160609 Change-Id: I5db57aaf35b35859ea88c7d0e0661d8c553e5811
* | | | | | | | | | | | | | | | | | | | | am ecf1f6c9: am 558f2700: Merge "Change filesystem add entry API call."Sasha Levitskiy2014-04-121-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecf1f6c9299c0cae2f2bf1647f5d7d3a2690f819': Change filesystem add entry API call.
| * | | | | | | | | | | | | | | | | | | | am 558f2700: Merge "Change filesystem add entry API call."Sasha Levitskiy2014-04-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '558f2700e18d50cf8e798254200ef37f7a09678d': Change filesystem add entry API call.
| | * | | | | | | | | | | | | | | | | | | Merge "Change filesystem add entry API call."Sasha Levitskiy2014-04-121-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Change filesystem add entry API call.Sasha Levitskiy2014-04-111-1/+1
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needs fs_mgr matching change from: Icf23e659265d71d5226d527c2b40cfbc132320ee Change-Id: I9adb470b04e4301989d128c9c3097b21b4dea431 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | | | | | | | | | | | | | | | | | | | make density-specific recovery assetsDoug Zongker2014-04-0458-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide different recovery UI resources for different display densities. Right now only the text images and the progress bars are rescaled; the main icon will get scaled when it's updated for QP. Lightly quantum-ify the rest of the recovery interface. (Light background, progress bars, etc.) Change-Id: Ia639c4ce8534b01bc843524efbc4b040c1cf38b3
* | | | | | | | | | | | | | | | | | | | add reboot-to-bootloader and power down options to recovery menuDoug Zongker2014-04-013-18/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful when debugging or developing for recovery. Change-Id: Ic3ab42d5e848ad3488f1c575339b55e45c8a024b
* | | | | | | | | | | | | | | | | | | | remove DefaultDevice's UI subclassDoug Zongker2014-04-012-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RecoveryUI (which is the superclass of ScreenRecoveryUI), provides a basic CheckKey method that is useful for devices that have KEY_POWER, KEY_VOLUMEUP, and KEY_VOLUMEDOWN. Stop overriding it with a less featureful method; with this no recovery UI customization is needed for most handheld devices (phones, tablets, etc.). Change-Id: I7d57cfaaef79afea8af4fc3dbc570afc61aeb5bc
* | | | | | | | | | | | | | | | | | | | Merge "Fix build break caused by vold change"Paul Lawrence2014-03-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix build break caused by vold changePaul Lawrence2014-03-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cryptfs.h now includes sha header from libcrypto folder Change-Id: Icd02c88971aedf96040c3bd9ca759e531546023b
* | | | | | | | | | | | | | | | | | | | | am 03008bc1: am aa4545b5: Merge "restore minui support for paletted images with < 8 bits"Doug Zongker2014-03-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '03008bc1e89a780e382abe0567e709daecce92ff': restore minui support for paletted images with < 8 bits
| * | | | | | | | | | | | | | | | | | | | am aa4545b5: Merge "restore minui support for paletted images with < 8 bits"Doug Zongker2014-03-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa4545b5aedae165c8d2db0009dcdfa18e4f7923': restore minui support for paletted images with < 8 bits
| | * | | | | | | | | | | | | | | | | | | Merge "restore minui support for paletted images with < 8 bits"Doug Zongker2014-03-201-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | restore minui support for paletted images with < 8 bitsDoug Zongker2014-03-201-1/+1
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PNG image loaders should support images that use palettes requiring fewer than 8 bits. Change-Id: Ibcb0ff6f04aea8de54b03c0efa7a79e9b3635146
* | | | | | | | | | | | | | | | | | | | recovery: 64 bit build issuesMark Salyzyn2014-03-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie88c49dea13cce5f4eb428e97f5a0956f2656a30
* | | | | | | | | | | | | | | | | | | | am 03002477: am bacf9b45: add --shutdown_after option to recoveryDoug Zongker2014-03-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0300247758cf1965867128c79d94e0b2c38a69aa': add --shutdown_after option to recovery
| * | | | | | | | | | | | | | | | | | | am bacf9b45: add --shutdown_after option to recoveryDoug Zongker2014-03-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bacf9b4558c69e918d9c05b6f111bbb223829829': add --shutdown_after option to recovery
| | * | | | | | | | | | | | | | | | | | add --shutdown_after option to recoveryDoug Zongker2014-03-181-4/+10
| | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "--shutdown_after" option causes recovery to power down the device on completion rather than rebooting. Removes the last vestiges of the "--previous_runs" argument, which doesn't seem to be used for anything. Change-Id: I465eda2ef59d367e2b1c79a8dc69831263c69a4d Conflicts: recovery.cpp
* | | | | | | | | | | | | | | | | | | am b4bbf887: resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aospDoug Zongker2014-03-181-4/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b4bbf8878c3a6b2a17a3a96f1a23300748dbd81a': add --shutdown_after option to recovery
| * | | | | | | | | | | | | | | | | | resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aospDoug Zongker2014-03-181-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d00437d519f93652ccae6b361e89e853ccae9b3
| | * | | | | | | | | | | | | | | | | Merge "add --shutdown_after option to recovery"Doug Zongker2014-03-181-4/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | add --shutdown_after option to recoveryDoug Zongker2014-03-181-4/+10
| | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "--shutdown_after" option causes recovery to power down the device on completion rather than rebooting. Removes the last vestiges of the "--previous_runs" argument, which doesn't seem to be used for anything. Change-Id: I465eda2ef59d367e2b1c79a8dc69831263c69a4d
* | | | | | | | | | | | | | | | | | am 47c7e365: am 130a7985: Merge "fix error log statement"Doug Zongker2014-03-181-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '47c7e365071f75489604b2d0ba3109fe39bac1ef': fix error log statement
| * | | | | | | | | | | | | | | | | am 130a7985: Merge "fix error log statement"Doug Zongker2014-03-181-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '130a7985386f7f7741179fc38b1a15da7ec9f358': fix error log statement
| | * | | | | | | | | | | | | | | | Merge "fix error log statement"Doug Zongker2014-03-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | fix error log statementDoug Zongker2014-03-181-1/+1
| | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were printing the address of channels instead of the value there. Change-Id: I652340c7c1a0abaf01af555e54d2c0366d21ad78
* | | | | | | | | | | | | | | | | am 80c1a386: resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aospDoug Zongker2014-03-186-244/+253
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80c1a386d3f614919708b37986919ecaf74ee738': refactor image resource loading code in minui
| * | | | | | | | | | | | | | | | resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aospDoug Zongker2014-03-186-244/+253
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib95b5bcd8d24014e1f2a956d2f31c99a471d3e30
| | * | | | | | | | | | | | | | | Merge "refactor image resource loading code in minui"Doug Zongker2014-03-176-244/+253
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | refactor image resource loading code in minuiDoug Zongker2014-03-176-244/+253
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the number of copies of libpng boilerplate. Rename res_create_* functions to be more clear. Make explicit the use of the framebuffer pixel format for images, and handle more combinations of input and output (eg, loading a grayscale image for display rather than use as a text alpha channel). Change-Id: I3d41c800a8f4c22b2f0167967ce6ee4d6b2b8846
* | | | | | | | | | | | | | | | minzip: 64 bit build issueMark Salyzyn2014-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression - verification and extraction on memory, not files Bug: 12188746 Change-Id: Ib6facc4aff6be3a31a7d184ef1c493fdd4012c21
* | | | | | | | | | | | | | | | am 4b6de1ba: am 026ebe02: Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-1411-30/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49': Recovery 64-bit compile issues
| * | | | | | | | | | | | | | | am 026ebe02: Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-1411-30/+33
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc': Recovery 64-bit compile issues
| | * | | | | | | | | | | | | | Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-1411-30/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Recovery 64-bit compile issuesMark Salyzyn2014-03-1411-30/+33
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I92d5abd1a628feab3b0246924fab7f97ba3b9d34
* | | | | | | | | | | | | | | am 239fb930: am a7266ef0: Merge "separate fbdev-specific code out from minui"Doug Zongker2014-03-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '239fb930e4d91de5d3a66997d32d43414055d40e': separate fbdev-specific code out from minui
| * | | | | | | | | | | | | | am a7266ef0: Merge "separate fbdev-specific code out from minui"Doug Zongker2014-03-125-152/+268
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7266ef0b1804e3ddeea58bda9a416e807a55f88': separate fbdev-specific code out from minui
| | * | | | | | | | | | | | | Merge "separate fbdev-specific code out from minui"Doug Zongker2014-03-125-152/+268
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | separate fbdev-specific code out from minuiDoug Zongker2014-03-115-152/+268
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Isolate the code that interacts with fbdev, in preparation for adding a new backend. Change-Id: I19105e9da1ca6408cebc110f7e2bb5abfb481ee9
* | | | | | | | | | | | | | am cb1bdc9e: (-s ours) am c91612d4: Merge "remove pixelflinger from recovery"Doug Zongker2014-03-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb1bdc9e427b8b7262d1e56fef47d2bb6d76139f': remove pixelflinger from recovery
| * | | | | | | | | | | | | am c91612d4: Merge "remove pixelflinger from recovery"Doug Zongker2014-03-126-274/+358
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c91612d4668688c5d7bf76c258c11010697a03d2': remove pixelflinger from recovery
| | * | | | | | | | | | | | Merge "remove pixelflinger from recovery"Doug Zongker2014-03-116-274/+358
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | remove pixelflinger from recoveryDoug Zongker2014-03-116-274/+358
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recovery now draws directly to the framebuffer by rolling its own graphics code, rather than depending on libpixelflinger. The recovery UI is modified slightly to eliminate operations that are slow with the software implementation: when the text display / menu is turned on, it now appears on a black background instead of a dimmed version of the recovery icon. There's probably substantial room for optimization of the graphics operations. Bug: 12131110 Change-Id: Iab6520e0a7aaec39e2ce39377c10aef82ae0c595 Conflicts: minui/resources.c
* | | | | | | | | | | | | am 7003ff3b: am 8f087d02: Merge "update tools for making recovery images"Doug Zongker2014-03-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7003ff3b54e9081dba92ecfea0594355af40e6dd': update tools for making recovery images
| * | | | | | | | | | | | am 8f087d02: Merge "update tools for making recovery images"Doug Zongker2014-03-122-102/+53
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8f087d024619467de8609656e8a14370f24b817c': update tools for making recovery images
| | * | | | | | | | | | | Merge "update tools for making recovery images"Doug Zongker2014-03-112-102/+53
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | update tools for making recovery imagesDoug Zongker2014-03-112-102/+53
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer render animations as a base image with a possibly-partially-transparent overlay drawn over it, so delete the make-overlay.py tool. Now we represent them as series of images that are interlaced by row (with a special text chunk in the PNG file specifying the number of frames) so add the interlace-frames.py tool to make those. Change-Id: I866db269107a21351c3df3b4683f233f72234334
* | | | | | | | | | | | am aa6b8026: (-s ours) am 59508993: Merge "allow CheckKey to request mounting /system"Doug Zongker2014-03-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa6b8026ed5ae32f10b948edd26e3f489ba20751': allow CheckKey to request mounting /system
| * | | | | | | | | | | am 59508993: Merge "allow CheckKey to request mounting /system"Doug Zongker2014-03-123-3/+52
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5950899369b712f66aa56c857c66ed1b6741f0e0': allow CheckKey to request mounting /system
| | * | | | | | | | | | Merge "allow CheckKey to request mounting /system"Doug Zongker2014-03-113-3/+52
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | | * | | | | | | | | allow CheckKey to request mounting /systemDoug Zongker2014-03-113-3/+52
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also provide a default implementation of CheckKey that's reasonable for many devices (those that have power and volume keys). Change-Id: Icf6c7746ebd866152d402059dbd27fd16bd51ff8
* | | | | | | | | | | am c15b7865: (-s ours) resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aospDoug Zongker2014-03-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c15b7865badc3ac406a7ce978baa65151a50bb55': change how recovery animation is implemented
| * | | | | | | | | | resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aospDoug Zongker2014-03-1218-102/+204
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8cc3b8101bccf7fd697f9a7b73732d1000dc27a1
| | * | | | | | | | | Merge "change how recovery animation is implemented"Doug Zongker2014-03-1118-95/+203
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | | * | | | | | | | change how recovery animation is implementedDoug Zongker2014-03-1118-95/+203
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of one 'base' installing image and a number of overlay images that are drawn on top of it, we represent the installing animation with one PNG that contains all the animation frames, interlaced by row. The PNG is expected to have a text chunk with the keyword 'Frames' and a value that's the number of frames (as an ascii string). This representation provides better compression, removes the need to subclass ScreenRecoveryUI just to change the position of the overlay or number of frames, and doesn't require gr_blit() to support an alpha channel. We also remove the 'indeterminate' progress bar used when wiping data and/or cache. The main animation serves the same purpose (showing that the device is still alive); the spinning progress bar has been redundant for a while. This changes the default recovery animation to include the antenna-wiggling and gear-turning that's used in the Nexus 5 recovery animation. Change-Id: I51930a76035ac09969a25472f4e572b289418729 Conflicts: screen_ui.cpp screen_ui.h
* | | | | | | | | | Merge "separate fbdev-specific code out from minui"Doug Zongker2014-03-115-152/+268
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | separate fbdev-specific code out from minuiDoug Zongker2014-03-115-152/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Isolate the code that interacts with fbdev, in preparation for adding a new backend. Change-Id: I19105e9da1ca6408cebc110f7e2bb5abfb481ee9
* | | | | | | | | | | update tools for making recovery imagesDoug Zongker2014-03-112-102/+53
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer render animations as a base image with a possibly-partially-transparent overlay drawn over it, so delete the make-overlay.py tool. Now we represent them as series of images that are interlaced by row (with a special text chunk in the PNG file specifying the number of frames) so add the interlace-frames.py tool to make those. Change-Id: I79443f125f9c7d8d61cd09e3434745e0ef38893f
* | | | | | | | | | remove pixelflinger from recoveryDoug Zongker2014-03-116-281/+357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recovery now draws directly to the framebuffer by rolling its own graphics code, rather than depending on libpixelflinger. The recovery UI is modified slightly to eliminate operations that are slow with the software implementation: when the text display / menu is turned on, it now appears on a black background instead of a dimmed version of the recovery icon. There's probably substantial room for optimization of the graphics operations. Bug: 12131110 Change-Id: Iab6520e0a7aaec39e2ce39377c10aef82ae0c595
* | | | | | | | | | change how recovery animation is implementedDoug Zongker2014-03-0718-99/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of one 'base' installing image and a number of overlay images that are drawn on top of it, we represent the installing animation with one PNG that contains all the animation frames, interlaced by row. The PNG is expected to have a text chunk with the keyword 'Frames' and a value that's the number of frames (as an ascii string). This representation provides better compression, removes the need to subclass ScreenRecoveryUI just to change the position of the overlay or number of frames, and doesn't require gr_blit() to support an alpha channel. We also remove the 'indeterminate' progress bar used when wiping data and/or cache. The main animation serves the same purpose (showing that the device is still alive); the spinning progress bar has been redundant for a while. This changes the default recovery animation to include the antenna-wiggling and gear-turning that's used in the Nexus 5 recovery animation. Change-Id: I51930a76035ac09969a25472f4e572b289418729
* | | | | | | | | | Merge "support don't-care maps when writing the system image"Doug Zongker2014-03-041-62/+172
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | support don't-care maps when writing the system imageDoug Zongker2014-02-251-62/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make package_extract_file() take an optional third argument which is the pathname (in the package zip) of a map of don't-care regions to skip over when writing the file. Modify syspatch() to take source and target don't-care maps and use them when patching the system partition. Add the wipe_block_device() function to do a discard of all data on the partition. Change-Id: I8c856054edfb6aab2f3e5177f16d9d78add20be4
* | | | | | | | | | am 49968f09: am 2f173bde: Merge "ADB sideload command not work"Doug Zongker2014-02-263-11/+358
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '49968f0903eb69b1505bc99926344aacee4e81b6': ADB sideload command not work
| * | | | | | | | | am 2f173bde: Merge "ADB sideload command not work"Doug Zongker2014-02-263-11/+358
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f173bde6584f4c560ecc3f13f6e890f52815050': ADB sideload command not work
| | * | | | | | | | Merge "ADB sideload command not work"Doug Zongker2014-02-263-11/+358
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | ADB sideload command not workDa Zhou2014-01-173-11/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In kernel(3.10) USB ADB gadget driver is removed. Using Functionfs for USB adb gadget. Android recovery uses a stripped down version of adb command for sideload only. It's missing the ffs function support, so add the ffs support to allow sideload command to work b/12608946 Change-Id: I4ad024723dfc5bdb544548391f99637c390b171e Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
* | | | | | | | | | am ed75be6d: am ac189bf6: Merge "recovery: Fix adb with linux 3.10"Benoit Goby2014-02-211-0/+6
|\| | | | | | | | | | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ed75be6de9d883a2524065940d732593fa26ac19': recovery: Fix adb with linux 3.10
| * | | | | | | | am ac189bf6: Merge "recovery: Fix adb with linux 3.10"Benoit Goby2014-02-201-0/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac189bf645123b4dc79cd2053f5eb07917774d66': recovery: Fix adb with linux 3.10
| | * | | | | | | Merge "recovery: Fix adb with linux 3.10"Benoit Goby2014-02-201-0/+6
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | recovery: Fix adb with linux 3.10Benoit Goby2014-02-201-0/+6
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In kernel 3.10, f_adb has been removed and adbd can use functionfs instead. Mount functionfs on boot for adbd. On older kernels, mount will fail silently and adbd will revert to f_adb. Change-Id: I5db57aaf35b35859ea88c7d0e0661d8c553e5811
* | | | | | | | add flag for GPL licenseDoug Zongker2014-02-202-0/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater now depends on the GPL'd libraries libsyspatch and libxdelta3, so be careful when taking code from this directory. Change-Id: Ib6f8c50ce7052912b9d81ff96d095f778bf9a3d0
* | | | | | | | Merge "clean up some warnings when building recovery"Doug Zongker2014-02-1810-13/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | clean up some warnings when building recoveryDoug Zongker2014-02-1410-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1541534ee6978ddf8d548433986679ce9507d508
* | | | | | | | | Merge "Fix a crash when going into recovery mode."Maxim Siniavine2014-02-141-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix a crash when going into recovery mode.Maxim Siniavine2014-02-141-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When going into recovery mode withoug recovery command file present, uncrypt crashes and the device gets stuck and eventually shuts down. Check that the command file is present before trying to read from it. Change-Id: If0192d597032be0067738e437188d92993ce56f7
* | | | | | | | | | remove remaining libminelf referencesDoug Zongker2014-02-142-3/+2
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id38b08607829bccc031693cc03e60e849903b6f8
* | | | | | | | | remove 'retouch' ASLR supportDoug Zongker2014-02-148-302/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older versions of android supported an ASLR system where binaries were randomly twiddled at OTA install time. Remove support for this; we now use the ASLR support in the linux kernel. Change-Id: I8348eb0d6424692668dc1a00e2416fbef6c158a2
* | | | | | | | | add syspatch support to updaterDoug Zongker2014-02-132-14/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the syspatch() function, which can apply xdelta3+xz patches using the libsyspatch library. Change-Id: Idc1921e449020923bcaf425a1983bec0833e47ed
* | | | | | | | | add mzGetStoredEntry functionDoug Zongker2014-02-132-2/+30
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mzGetStoredEntry gives you a pointer and address to the data of a zip entry, assuming that entry is stored rather than deflated. Change-Id: Ifb39777c98d1d50475ef7de419cf28935f5f9965
* | | | | | | | am 2739ed96: am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"Colin Cross2014-02-063-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2739ed9628f72813d213b7a429c4c1b8dcebe5fc': recovery: fix building with pointer-to-int errors turned on
| * | | | | | | am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"Colin Cross2014-02-063-5/+5
| |\| | | | | | | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'a5d105e2397d81537facd93fd8a9d3e263d57dc9': recovery: fix building with pointer-to-int errors turned on
| | * | | | | Merge "recovery: fix building with pointer-to-int errors turned on"Colin Cross2014-02-063-5/+5
| | |\ \ \ \ \
| | | * | | | | recovery: fix building with pointer-to-int errors turned onColin Cross2014-02-063-5/+5
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use intptr_t/uintptr_t to cast between pointer and int to allow building with -Werror=pointer-to-int-cast and Werror=int-to-pointer-cast turned on. Cast to char* instead of unsigned int for pointer arithmetic. Change-Id: Ia862306fdcca53866b330e8cf726f3d62f2248a0
* | | | | | | am fd84f65d: am f3532072: Merge "minadbd: remove dead code"Colin Cross2014-01-272-25/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fd84f65dcda3c7e4b42c71a7df85efebdbf7ea7a': minadbd: remove dead code
| * | | | | | am f3532072: Merge "minadbd: remove dead code"Colin Cross2014-01-272-25/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f353207298ed14d0e6943353dd9788421a7537b8': minadbd: remove dead code
| | * | | | | Merge "minadbd: remove dead code"Colin Cross2014-01-272-25/+0
| | |\ \ \ \ \
| | | * | | | | minadbd: remove dead codeColin Cross2014-01-242-25/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia1f34a17ae582575f8cd3514ed7bc015b0a5006e
* | | | | | | am f4641299: am 295e74aa: Merge "adbd: switch to su domain when running as root"Nick Kralevich2014-01-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f464129950eaea49b1234fdcfd04ec8723e3c672': adbd: switch to su domain when running as root
| * | | | | | am 295e74aa: Merge "adbd: switch to su domain when running as root"Nick Kralevich2014-01-241-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '295e74aa20c9f32e1e46fc1b0bf0975642a8c95b': adbd: switch to su domain when running as root
| | * | | | | Merge "adbd: switch to su domain when running as root"Nick Kralevich2014-01-241-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | adbd: switch to su domain when running as rootNick Kralevich2014-01-181-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adbd runs as root, it should transition into the su domain. This is needed to run the adbd and shell domains in enforcing on userdebug / eng devices without breaking developer workflows. Use the new device_banner command line option. Change-Id: Ib33c0dd2dd6172035230514ac84fcaed2ecf44d6
* | | | | | log extra info for debuggingDoug Zongker2014-01-212-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make recovery log its PID, and when we use a block map file, log how many ranges it contains. Change-Id: I1b4299f8163af68a770b48c029ae25e6cb45d26b
* | | | | | program to store unencrypted files in an encrypted filesystemDoug Zongker2014-01-163-0/+406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uncrypt can read a file on an encrypted filesystem and rewrite it to the same blocks on the underlying (unencrypted) block device. This destroys the contents of the file as far as the encrypted filesystem is concerned, but allows the data to be read without the encryption key if you know which blocks of the raw device to access. uncrypt produces a "block map" file which lists the blocks that contain the file. For unencrypted filesystem, uncrypt will produce the block map without touching the data. Bug: 12188746 Change-Id: Ib7259b9e14dac8af406796b429d58378a00c7c63
* | | | | | do verification and extraction on memory, not filesDoug Zongker2014-01-1611-209/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes minzip and recovery's file signature verification to work on memory regions, rather than files. For packages which are regular files, install.cpp now mmap()s them into memory and then passes the mapped memory to the verifier and to the minzip library. Support for files which are raw block maps (which will be used when we have packages written to encrypted data partitions) is present but largely untested so far. Bug: 12188746 Change-Id: I12cc3e809834745a489dd9d4ceb558cbccdc3f71
* | | | | | am a01b6467: am 772f6e2a: Merge "correctly mount tmpfs as /tmp in recovery"Doug Zongker2014-01-141-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a01b646794fc207da657d7b8ef779c9d842acfde': correctly mount tmpfs as /tmp in recovery
| * | | | | am 772f6e2a: Merge "correctly mount tmpfs as /tmp in recovery"Doug Zongker2014-01-141-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '772f6e2a8865934bb57aaeea8354a75a47ee753f': correctly mount tmpfs as /tmp in recovery
| | * | | | Merge "correctly mount tmpfs as /tmp in recovery"Doug Zongker2014-01-141-2/+2
| | |\ \ \ \
| | | * | | | correctly mount tmpfs as /tmp in recoveryDoug Zongker2014-01-141-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The syntax of init's mount command changed in April 2008 but recovery's init.rc was never updated, so recovery's /tmp has been on the root fs all this time. Fix. Also add /system/bin to the PATH in recovery, which is handy for debugging. Change-Id: I39f7ae435a8ce3bad691e4b7c307db0bd8de1302
* | | | | | am 7e0d3066: am fc729512: Merge "Set SELinux security contexts correctly for init and services."Nick Kralevich2014-01-131-0/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e0d30667cf53a182525f87dd0c8cb0e2628a1ed': Set SELinux security contexts correctly for init and services.
| * | | | | am fc729512: Merge "Set SELinux security contexts correctly for init and services."Nick Kralevich2014-01-131-0/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc729512375c4f0d351f6f67f0d7f500ea1b9233': Set SELinux security contexts correctly for init and services.
| | * | | | Merge "Set SELinux security contexts correctly for init and services."Nick Kralevich2014-01-131-0/+11
| | |\ \ \ \
| | | * | | | Set SELinux security contexts correctly for init and services.Stephen Smalley2014-01-131-0/+11
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise everything is left running in the kernel domain when booting recovery. Change-Id: Ie3d86547d5be0b68dd1875a97afe1e00fc3e4da1 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | | remove dead code from minzipDoug Zongker2014-01-132-134/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minzip had some features that were used when reading APKs, but APK handling now uses libziparchive instead of minzip. Remove these unused functions. Change-Id: Iead89209a716bfe9e3d339bf85b3e97e33a41f35
* | | | | | am 27efc8f9: am 617d1cad: Merge "minui: do not use flexible array initialization"Nick Kralevich2014-01-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '27efc8f9d1711134051b45d28b2fc38bfb4c7dc6': minui: do not use flexible array initialization
| * | | | | am 617d1cad: Merge "minui: do not use flexible array initialization"Nick Kralevich2014-01-041-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '617d1cadc6e0e1e9fd46e0e6a8505f6f7f56a5f7': minui: do not use flexible array initialization
| | * | | | Merge "minui: do not use flexible array initialization"Nick Kralevich2014-01-041-1/+1
| | |\ \ \ \
| | | * | | | minui: do not use flexible array initializationsynergy dev2013-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoiding the use of gnu extensions improves code portability Change-Id: I441a49ce08b6ecb1d735ca453552fa92026c5016
* | | | | | | am 15f5fe1b: am f9dd42de: Merge "Don\'t abort on read_file if the file is missing." into klp-devMichael Runge2013-12-271-5/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15f5fe1bcd2bf18b07f89d0cc58dcffb5bc1f932': Don't abort on read_file if the file is missing.
| * | | | | | am f9dd42de: Merge "Don\'t abort on read_file if the file is missing." into klp-devMichael Runge2013-12-271-5/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | * commit 'f9dd42de6034ab09f9fa649ed1fbea25bc05e598': Don't abort on read_file if the file is missing.
| | * | | | | Merge "Don't abort on read_file if the file is missing." into klp-devMichael Runge2013-12-201-5/+3
| | |\ \ \ \ \
| | | * | | | | Don't abort on read_file if the file is missing.Michael Runge2013-12-141-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I85726bf736203d602428114145c3b98692580656
* | | | | | | | am e1bb2733: am 168724c3: fix unnecessarily slow writing of EMMC partitionsDoug Zongker2013-12-201-15/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e1bb2733f9261336f38a94dc9d93ed010a7cbc57': fix unnecessarily slow writing of EMMC partitions
| * | | | | | | am 168724c3: fix unnecessarily slow writing of EMMC partitionsDoug Zongker2013-12-201-15/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '168724c31ad5241e157ebb35135a734fa075d53b': fix unnecessarily slow writing of EMMC partitions
| | * | | | | | fix unnecessarily slow writing of EMMC partitionsDoug Zongker2013-12-201-15/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were attempts to write partitions "conservatively" in hopes of fixing the problems with writing the radio partition on Nexus 4. They didn't work (a kernel patch was needed), but got left in. They make writing of partitions unnecessarily slow (ie, we really shouldn't need to sync() after every 4kb). Roll back most of them, but leave the verification read-back in. Change-Id: I94badc0979e88816c5aa0485f6316c02be69173c
* | | | | | | recovery: wipe encryption metadata along with data partitionDoug Zongker2013-12-132-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This assumes that the metadata is correctly defined in fstab. Which apparently some devices don't do. Bug: 8766487 Bug: 12112624 Change-Id: I1b14b9d4c888e9348527984be3dce04bdd9f4de0
* | | | | | | am d327c63a: am c87bab10: add the functions for multi-stage packages to updaterDoug Zongker2013-12-038-9/+181
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd327c63af691a36fbf53866a3ae7ad27a43ebe3b': add the functions for multi-stage packages to updater
| * | | | | | am c87bab10: add the functions for multi-stage packages to updaterDoug Zongker2013-11-278-9/+181
| |\| | | | | | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit 'c87bab101893e8322b49d7c8600e3367b20ab50a': add the functions for multi-stage packages to updater
| | * | | | add the functions for multi-stage packages to updaterDoug Zongker2013-11-278-9/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to support multi-stage recovery packages, we add the set_stage() and get_stage() functions, which store a short string somewhere it can be accessed across invocations of recovery. We also add reboot_now() which updater can invoke to immediately reboot the device, without doing normal recovery cleanup. (It can also choose whether to boot off the boot or recovery partition.) If the stage string is of the form "#/#", recovery's UI will be augmented with a simple indicator of what stage you're in, so it doesn't look like a reboot loop. Change-Id: I62f7ff0bc802b549c9bcf3cc154a6bad99f94603
* | | | | | Merge "Fix rare crash seen when dereferencing backgroundIcon[NONE]."Doug Zongker2013-11-181-0/+1
|\ \ \ \ \ \
| * | | | | | Fix rare crash seen when dereferencing backgroundIcon[NONE].Alistair Strachan2013-11-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because backgroundIcon[] is not initialized by the ScreenRecoveryUI constructor, it should be initialized explicitly to NULL in Init(). If it is not initialized, ScreenRecoveryUI::SetBackground() can fail for the NONE icon because the NULL test can fail and junk will be dereferenced. Change-Id: I4e3738d2e241ed90df43c984fb41e0072933f50a
* | | | | | | Restore default umask after forking for update-binary.Alistair Strachan2013-11-181-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A system/core change made in Mar 26 2012 6ebf12f "init: Change umask of forked processes to 077" changed the default umask of services forked from init. Because recovery is forked from init, it has a umask of 077. Therefore when update-binary is forked from recovery, it too has a umask of 077. This umask is overly restrictive and can cause problems for scripts relying on minzip to extract binaries directly into the target filesystem. Any directories updated by minzip will have their permissions reset to r-x------ and created files will have similarly restrictive permissions. As it seems unlikely this security measure was intended to have this side effect on legacy sideloads that do not have chmods to repair the damage done by minzip, this change reverts the umask to 022 in the fork made for update-binary. Change-Id: Ib1a3fc83aa4ecc7480b5d0c00f3c7d0d040d4887
* | | | | | am 40dfc474: am c64e76c7: Merge "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add." into klp-devMichael Runge2013-11-081-0/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40dfc474c457f5be24e204e6a0c657c97acb8f3c': Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
| * | | | | am c64e76c7: Merge "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add." into klp-devMichael Runge2013-11-081-0/+35
| |\| | | | | | |/ / / | |/| | | | | | | | | | | | | * commit 'c64e76c75088b951f61a7f7bacf8af6eccd2ccfa': Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
| | * | | Merge "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add." into klp-devMichael Runge2013-11-071-0/+35
| | |\ \ \
| | | * | | Enable incremental builder to find files that moved, andMichael Runge2013-11-071-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | try to process them via patch + rename, instead of delete + add. b/11437930 Change-Id: I984349fbc9a8dac4379e00c0d66fc7d22c4eb834
* | | | | | am a370c0f7: am 3966c571: merge in klp-release (no-op)Ed Heyl2013-10-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a370c0f7fe65d6f012902342249d3a84b474f277':
| * | | | | am 3966c571: merge in klp-release (no-op)Ed Heyl2013-10-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | * commit '3966c571a0c36a40a8142e70b1aa6de547ea6ec3':
| | * | | | merge in klp-release (no-op)Ed Heyl2013-10-170-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-030-0/+0
| | | |\ \ \
* | | | | | | am fc7eab96: am f4a6ab27: Merge "Add support for ECDSA signatures"Kenny Root2013-10-1412-60/+822
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc7eab961f9dc85ee88e8c37ca1dc31a7f7b8331': Add support for ECDSA signatures
| * | | | | | am f4a6ab27: Merge "Add support for ECDSA signatures"Kenny Root2013-10-1412-60/+822
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f4a6ab27b335b69fbc419a9c1ef263004b561265': Add support for ECDSA signatures
| | * \ \ \ \ \ Merge "Add support for ECDSA signatures"Kenny Root2013-10-1412-60/+822
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Add support for ECDSA signaturesKenny Root2013-10-1012-60/+822
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for key version 5 which is an EC key using the NIST P-256 curve parameters. OTAs may be signed with these keys using the ECDSA signature algorithm with SHA-256. Change-Id: Id88672a3deb70681c78d5ea0d739e10f839e4567
* | | | | | | am 053c1c5e: am 7fdeb1f9: merge in KQS81MEd Heyl2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '053c1c5e89136bd78c39c9e4a300d95f1cb3772d': Don't apply permission changes to symlink. recovery: fix use of init reboot method
| * | | | | | am 7fdeb1f9: merge in KQS81MEd Heyl2013-10-090-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '7fdeb1f9d7c1e979ebf78725bbf000bcb8c6ffc3': Don't apply permission changes to symlink. recovery: fix use of init reboot method
| | * | | | | merge in KQS81MEd Heyl2013-10-090-0/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-120-0/+0
| | | |\ \ \
| | | | * | | Don't apply permission changes to symlink.Nick Kralevich2013-09-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10183961 Bug: 10186213 Bug: 8985290 Change-Id: I57cb14af59682c5f25f1e091564548bdbf20f74e
| | | | * | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-100-0/+0
| | | | |\ \ \
| | | | | * | | recovery: fix use of init reboot methodDoug Zongker2013-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to set the system property to "reboot,", not an empty string. Bug: 10605007 Change-Id: I776e0d273764cf254651ab2b25c2743395b990e0
* | | | | | | | am efef45ed: am a2a1ce82: Allow child classes to override the overlay location for the update image.Michael Runge2013-10-031-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'efef45ede6f7588bd3f584d7746ca9822ade58ac': Allow child classes to override the overlay location for the update image.
| * | | | | | | am a2a1ce82: Allow child classes to override the overlay location for the update image.Michael Runge2013-10-031-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a2a1ce823b8c76451ee2b38155b347b0c2ced714': Allow child classes to override the overlay location for the update image.
| | * | | | | | Allow child classes to override the overlay location for theMichael Runge2013-10-031-1/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update image. b/10952479 Change-Id: I59bb834f271f702fb529054dab7926b816fa35cc
* | | | | | | fix use of RGBA images in minuiDoug Zongker2013-09-261-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10934401 Change-Id: I471b30e5b2e877c620e4a0a524e950cddbc6d2c0
* | | | | | | am dd92a4d6: am 58c60900: Merge "verifier: update to support certificates using SHA-256"Kenny Root2013-09-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd92a4d625a6735651efeb12a5707620bc5c6339': verifier: update to support certificates using SHA-256
| * | | | | | am 58c60900: Merge "verifier: update to support certificates using SHA-256"Kenny Root2013-09-250-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit '58c60900ac3682fab08f64373bdd1020713b48f7': verifier: update to support certificates using SHA-256
| | * | | | | Merge "verifier: update to support certificates using SHA-256"Kenny Root2013-09-2513-109/+254
| | |\ \ \ \ \
| | | * | | | | verifier: update to support certificates using SHA-256Doug Zongker2013-09-2513-109/+254
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit bac7fba02763ae5e78e8e4ba0bea727330ad953e) Change-Id: I01c38d7fea088622a8b0bbf2c833fa2d969417af
* | | | | | | am 46ab1b61: updater: Delete dead codeNick Kralevich2013-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46ab1b6138bf911120280f1095ff9479dceee3df': updater: Delete dead code
| * | | | | | updater: Delete dead codeNick Kralevich2013-09-173-153/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set_perm and set_perm_recursive are no longer used. Delete. (cherry picked from commit 08ef9a957027183dcf55e432441e8fb0d5299aba) Change-Id: I1bcc90ae19af9df4f0705496c5876987159f75ac
* | | | | | | recovery: fix epoll events type to uint32_tTodd Poynor2013-09-174-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5db9987102201c18821acb45d1f824e9865a1451
* | | | | | | start healthd in recovery modeTodd Poynor2013-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I431ece69b6856fd1ea6079c38cdeb593c15d7385
* | | | | | | minui: add ev_get_epollfd() to retrieve epoll file descriptorTodd Poynor2013-09-122-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow use of ev_* functions with an external main loop. Change-Id: If73717b64d7c455ca726b90a815a31c1edf52544
* | | | | | | recovery: ui changes for ev_*() switch to epollTodd Poynor2013-09-122-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert callback events parameter to unsigned int. Change-Id: Ife0e983f307c07bf4aca807d70574aeb20c460cd
* | | | | | | minui: convert ev_*() event interface to epollTodd Poynor2013-09-122-27/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Help enable external main loop combined with ev_*() key event processing. Specify EPOLLWAKEUP to hold a wakelock on any event, assuming this is needed (may need to make this optional). Convert callback events parameter to unsigned int. Change-Id: Ib5e09abbd7724ffd830e2cf8e25e7eb59d3aa072
* | | | | | | am 1306a7ef: am cc2958fd: fix secure adb in recoveryDoug Zongker2013-09-121-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1306a7effafab77cf2769091619518c2ab263ee8': fix secure adb in recovery
| * | | | | | am cc2958fd: fix secure adb in recoveryDoug Zongker2013-09-111-0/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit 'cc2958fd7f32f79d1a034eee005e04afeb310a87': fix secure adb in recovery
| | * | | | | fix secure adb in recoveryDoug Zongker2013-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recovery's init.rc was missing a line (added to the main system's init.rc in change Ic97fd464440ff4a29fc9da7ad15949ac5215ade3) is required for secure adb to work. Change-Id: Id79b94d2abb4cbe3cca7cabeb4bc5faf7205e56b
* | | | | | | updater: Delete dead codeNick Kralevich2013-09-113-153/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set_perm and set_perm_recursive are no longer used. Delete. Change-Id: I3bb40b934b6c093b24b88aa4ed6f3c7de2bb52f0
* | | | | | | am af677d78: am e461251e: Don\'t apply permission changes to symlink.Nick Kralevich2013-09-111-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'af677d786e6333187ccbd4f7fe6f371a09b71645': Don't apply permission changes to symlink.
| * | | | | | am e461251e: Don\'t apply permission changes to symlink.Nick Kralevich2013-09-111-0/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e461251e2caa5561cf6a315bffaebfd4eb896b1d': Don't apply permission changes to symlink.
| | * | | | | Don't apply permission changes to symlink.Nick Kralevich2013-09-111-0/+5
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10183961 Bug: 10186213 Bug: 8985290 Change-Id: I57cb14af59682c5f25f1e091564548bdbf20f74e
* | | | | | am cc421662: am 5dbdef0e: updater: introduce and set_metadata and set_metadata_recursiveNick Kralevich2013-09-101-0/+274
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc421662d7f9b68627204b8c8bfb4a5cada74125': updater: introduce and set_metadata and set_metadata_recursive
| * | | | | am 5dbdef0e: updater: introduce and set_metadata and set_metadata_recursiveNick Kralevich2013-09-101-0/+274
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5dbdef0e5b8a841fadc64d016d10ce81a962b284': updater: introduce and set_metadata and set_metadata_recursive
| | * | | | updater: introduce and set_metadata and set_metadata_recursiveNick Kralevich2013-09-101-0/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce two new updater functions: * set_metadata * set_metadata_recursive Long term, these functions are intended to be more flexible replacements for the following methods: * set_perm * set_perm_recursive Usage: set_metadata("filename", "key1", "value1", "key2", "value2", ...) set_metadata_recursive("dirname", "key1", "value1", "key2", "value2", ...) Description: set_metadata() and set_metadata_recursive() set the attributes on a file/directory according to the key/value pairs provided. Today, the following keys are supported: * uid * gid * mode (set_perm_extd only) * fmode (set_perm_extd_recursive only) * dmode (set_perm_extd_recursive only) * selabel * capabilities Unknown keys are logged as warnings, but are not fatal errors. Examples: * set_metadata("/system/bin/netcfg", "selabel", "u:object_r:system_file:s0"); This sets the SELinux label of /system/bin/netcfg to u:object_r:system_file:s0. No other changes occur. * set_metadata("/system/bin/netcfg", "uid", 0, "gid", 3003, "mode", 02750, "selabel", "u:object_r:system_file:s0", "capabilities", 0x0); This sets /system/bin/netcfg to uid=0, gid=3003, mode=02750, selinux label=u:object_r:system_file:s0, and clears the capabilities associated with the file. * set_metadata_recursive("/system", "uid", 0, "gid", 0, "fmode", 0644, "dmode", 0755, "selabel", "u:object_r:system_file:s0", "capabilities", 0x0); All files and directories under /system are set to uid=0, gid=0, and selinux label=u:object_r:system_file:s0. Directories are set to mode=0755. Files are set to mode=0644 and all capabilities are cleared. Bug: 10183961 Bug: 10186213 Bug: 8985290 Change-Id: Ifdcf186a7ed45265511dc493c4036e1ac5e3d0af
* | | | | | am 5ae88e89: am 3328e3bc: Revert "Update OTA installer to understand SELinux filesystem labels"Nick Kralevich2013-09-103-32/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5ae88e899836e7e3350db55ac47aee6f219cf126': Revert "Update OTA installer to understand SELinux filesystem labels"
| * | | | | am 3328e3bc: Revert "Update OTA installer to understand SELinux filesystem labels"Nick Kralevich2013-09-103-32/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3328e3bc81161c2a57ea94d304162276facdd826': Revert "Update OTA installer to understand SELinux filesystem labels"
| | * | | | Revert "Update OTA installer to understand SELinux filesystem labels"Nick Kralevich2013-09-093-32/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 627eb30f73c29257acaeb6568f3da38880784f7c. Bug: 10183961 Bug: 10186213
* | | | | | allow CheckKey to request mounting /systemDoug Zongker2013-09-053-3/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also provide a default implementation of CheckKey that's reasonable for many devices (those that have power and volume keys). Change-Id: Icf6c7746ebd866152d402059dbd27fd16bd51ff8
* | | | | | am f187a543: am 3b5a987c: recovery: fix use of init reboot methodDoug Zongker2013-09-031-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f187a5438d5a0651c344038f2203469e193704f9': recovery: fix use of init reboot method
| * | | | | am 3b5a987c: recovery: fix use of init reboot methodDoug Zongker2013-09-031-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b5a987cd7fd76c038e9875b430028216d21ace3': recovery: fix use of init reboot method
| | * | | | recovery: fix use of init reboot methodDoug Zongker2013-09-031-1/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | We need to set the system property to "reboot,", not an empty string. Bug: 10605007 Change-Id: I776e0d273764cf254651ab2b25c2743395b990e0
* | | | | am 366f78a9: am 77ea71d6: recovery: fix rebootingDoug Zongker2013-08-302-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '366f78a9df45d6648746de8454655224b22c31fd': recovery: fix rebooting
| * | | | am 77ea71d6: recovery: fix rebootingDoug Zongker2013-08-302-1/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '77ea71d6a85a93c9bf423466e87661b1bf67c512': recovery: fix rebooting
| | * | | recovery: fix rebootingDoug Zongker2013-08-302-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change I84c0513acb549720cb0e8c9fcbda0050f5c396f5 moved reboot functionality into init but did not update the recovery partition; so "adb reboot" and /system/bin/reboot in recovery are both broken. Change-Id: Ie2d14627a686ffb5064256b6c399723636dff116
* | | | | am 19877de5: am 5c4e1dac: Merge "Update libpng API usage"John Reck2013-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '19877de513a9493dad77488144089b4f30103b74': Update libpng API usage
| * | | | am 5c4e1dac: Merge "Update libpng API usage"John Reck2013-08-271-12/+12
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | * commit '5c4e1dac0bd8f31559bd50eec4343b7a17b7a976': Update libpng API usage
| | * | Merge "Update libpng API usage"John Reck2013-08-271-12/+12
| | |\ \
| | | * | Update libpng API usageJohn Reck2013-08-271-12/+12
| | |/ / | | | | | | | | | | | | | | | | | | | | Remove usage of deprecated methods Change-Id: I747568a2c8c0c65ecbc9a3da4bac7b9cac7708ab
* | | | am 239ac6ab: recovery: install packages in a known mount environmentDoug Zongker2013-08-225-11/+35
|\| | | | | | | | | | | | | | | | | | | * commit '239ac6abac4524be93fce710360c0512c6cc2ab3': recovery: install packages in a known mount environment
| * | | recovery: install packages in a known mount environmentDoug Zongker2013-08-215-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When installing a package, we should have /tmp and /cache mounted and nothing else. Ensure this is true by explicitly mounting them and unmounting everything else as the first step of every install. Also fix an error in the progress bar that crops up when you do multiple package installs in one instance of recovery. Change-Id: I4837ed707cb419ddd3d9f6188b6355ba1bcfe2b2
* | | | Fix libpng API usageJohn Reck2013-08-131-12/+12
|/ / / | | | | | | | | | | | | | | | Remove usage of deprecated methods that were removed in 1.6 Change-Id: I2a669bf5201197f60adfdbe512fd729bebb74f9c
* | | notify about pending long pressDoug Zongker2013-07-315-27/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recovery changes: - add a method to the UI class that is called when a key is held down long enough to be a "long press" (but before it is released). Device-specific subclasses can override this to indicate a long press. - do color selection for ScreenRecoveryUI's menu-and-log drawing function. Subclasses can override this to customize the colors they use for various elements. - Include the value of ro.build.display.id in the menu headers, so you can see on the screen what version of recovery you are running. Change-Id: I426a6daf892b9011638e2035aebfa2831d4f596d
* | | Merge "start healthd in recovery"Todd Poynor2013-07-271-0/+4
|\ \ \
| * | | start healthd in recoveryTodd Poynor2013-06-191-0/+4
| | | | | | | | | | | | | | | | Change-Id: I16e3e0ddb8ca062431deb4be83c5be5eb786d76f
* | | | Update OTA installer to understand SELinux filesystem labelsNick Kralevich2013-07-193-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify the OTA installer to understand SELinux filesystem labels. We do this by introducing new set_perm2 / set_perm2_recursive calls, which understand SELinux filesystem labels. These filesystem labels are applied at the same time that we apply the UID / GID / permission changes. For compatibility, we preserve the behavior of the existing set_perm / set_perm_recursive calls. If the destination kernel doesn't support security labels, don't fail. SELinux isn't enabled on all kernels. Bug: 8985290 Change-Id: I99800499f01784199e4918a82e3e2db1089cf25b
* | | | am a69b50c5: am 901b898d: recovery: remove O_DIRECT, use O_SYNC onlyDoug Zongker2013-07-111-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'a69b50c567d46afad73c4d6ab9e57f078ee73327': recovery: remove O_DIRECT, use O_SYNC only
| * | | am 901b898d: recovery: remove O_DIRECT, use O_SYNC onlyDoug Zongker2013-07-111-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '901b898d5e4d7cc555974b8132f83f948f8fbaee': recovery: remove O_DIRECT, use O_SYNC only
| | * | | recovery: remove O_DIRECT, use O_SYNC onlyDoug Zongker2013-07-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | O_DIRECT writes fail with EINVAL due to alignment issues. Change-Id: If8cf38a636313e4f4b4e61e66287dc903c473e5b
* | | | | am 660637f3: am e8d953aa: recovery: more cargo-cult programmingDoug Zongker2013-07-111-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '660637f3fc6fe20e8b7f47b98152138c2c92b7ec': recovery: more cargo-cult programming
| * | | | am e8d953aa: recovery: more cargo-cult programmingDoug Zongker2013-07-111-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e8d953aa7ed0c16beb1b03a05d16cb23dd85e198': recovery: more cargo-cult programming
| | * | | recovery: more cargo-cult programmingDoug Zongker2013-07-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add O_DIRECT|O_SYNC when opening partitions for write. Change-Id: I9825ad8e60fba87e482f8abc5593d6f54a1e3a1c
* | | | | am 51ffaf54: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-07-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '51ffaf54a56441bba053d37a00122761c3a18f16': recovery: sleep after writing partition and closing it
| * | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-07-110-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Id35004f465f5152c1de0796eb66989f234185208
| | * | | | recovery: sleep after writing partition and closing itDoug Zongker2013-07-111-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another speculative attempt to get everything we write actually stored to the device. Change-Id: Icf40b0741b4c535e55ea34848073a97d90dc0e70
* | | | | | am fbcfad33: am bf4a69ac: recovery: sleep after writing partition and closing itDoug Zongker2013-07-111-2/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fbcfad33face5d3b9e6b8cb04379168bceb517df': recovery: sleep after writing partition and closing it
| * | | | | am bf4a69ac: recovery: sleep after writing partition and closing itDoug Zongker2013-07-101-2/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'bf4a69ac41696fe78f6cc67b10cf1816186f1c5d': recovery: sleep after writing partition and closing it
| | * | | | recovery: sleep after writing partition and closing itDoug Zongker2013-07-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another speculative attempt to get everything we write actually stored to the device. Change-Id: Icf40b0741b4c535e55ea34848073a97d90dc0e70
* | | | | | am e352c88f: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-07-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e352c88fbcfd917f6614597364d2e550aa691e79': recovery: write partitions more conservatively recovery: try to write EMMC partitions more reliably
| * | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-07-100-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Change-Id: Ib99b7cd6aede63006c91be2635112e16dd0f2b24
| | * | | | recovery: write partitions more conservativelyDoug Zongker2013-07-101-24/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write and verify partitions using write(2) and read(2) rather than the stdio functions. Read and write in 4kb blocks. When writing, fsync() every 1MB. Bug: 9602014 Change-Id: Ie98ce38e857786fc0f4ebf36bb5ffc93b41bc96f
| | * | | | recovery: try to write EMMC partitions more reliablyDoug Zongker2013-07-102-7/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nexus 4 has flash errors that manifest during large writes (eg, of the radio partition). Writes of some blocks seem to be dropped silently, without any errors being returned to the user level. Make two changes to the partition-writing code: - break it up into 1MB writes instead of writing partitions with a single fwrite() call. Pause for 50ms in between every chunk. - read the partition back after writing and verify that we read what we wrote. Drop caches before reading so we (hopefully) are reading off the actual flash and not some cache. Neither of these should be necessary. Bug: 9602014 Change-Id: Ice2e24dd4c11f1a57968277b5eb1468c772f6f63
* | | | | | am 2148133d: am c870a99c: recovery: write partitions more conservativelyDoug Zongker2013-07-111-24/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2148133d46cb875316b01947dd5719ed995f7d67': recovery: write partitions more conservatively
| * | | | | am c870a99c: recovery: write partitions more conservativelyDoug Zongker2013-07-091-24/+46
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'c870a99c4aeb9e232ee68951e666b5fa670d1680': recovery: write partitions more conservatively
| | * | | | recovery: write partitions more conservativelyDoug Zongker2013-07-091-24/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write and verify partitions using write(2) and read(2) rather than the stdio functions. Read and write in 4kb blocks. When writing, fsync() every 1MB. Bug: 9602014 Change-Id: Ie98ce38e857786fc0f4ebf36bb5ffc93b41bc96f
* | | | | | Merge "recovery: preserve recovery logs across cache wipes"Doug Zongker2013-07-091-2/+76
|\ \ \ \ \ \
| * | | | | | recovery: preserve recovery logs across cache wipesDoug Zongker2013-07-091-2/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing a cache wipe or a factory reset (which includes a cache wipe), save any last* log files in the /cache/recovery directory and write them back after reformatting the partition, so that wiping data doesn't lose useful log information. Change-Id: I1f52ae9131760b5e752e136645c19f71b7b166ee
* | | | | | | recovery: move log output to stdoutDoug Zongker2013-07-098-72/+72
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recovery currently has a random mix of messages printed to stdout and messages printed to stderr, which can make logs hard to read. Move everything to stdout. Change-Id: Ie33bd4a9e1272e731302569cdec918e0534c48a6
* | | | | | am 0ccaccf7: am 044a0b4d: recovery: try to write EMMC partitions more reliablyDoug Zongker2013-07-082-7/+73
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ccaccf7d0f50bb9555ee13a841c246a1fea80f2': recovery: try to write EMMC partitions more reliably
| * | | | | am 044a0b4d: recovery: try to write EMMC partitions more reliablyDoug Zongker2013-07-082-7/+73
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '044a0b4d49a11edfa13471ce20914b0514eb7e0e': recovery: try to write EMMC partitions more reliably
| | * | | | recovery: try to write EMMC partitions more reliablyDoug Zongker2013-07-082-7/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nexus 4 has flash errors that manifest during large writes (eg, of the radio partition). Writes of some blocks seem to be dropped silently, without any errors being returned to the user level. Make two changes to the partition-writing code: - break it up into 1MB writes instead of writing partitions with a single fwrite() call. Pause for 50ms in between every chunk. - read the partition back after writing and verify that we read what we wrote. Drop caches before reading so we (hopefully) are reading off the actual flash and not some cache. Neither of these should be necessary. Bug: 9602014 Change-Id: Ice2e24dd4c11f1a57968277b5eb1468c772f6f63
* | | | | | am 4d4b233e: am 2f6877a0: recovery: init backgroundIcon properly to avoid recovery mode crashyetta_wu2013-07-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4d4b233eae51d5580b58cb00d3aa45ecbb1b255e': recovery: init backgroundIcon properly to avoid recovery mode crash
| * | | | | am 2f6877a0: recovery: init backgroundIcon properly to avoid recovery mode crashyetta_wu2013-06-251-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f6877a0220475303907203308c018d789ea1a53': recovery: init backgroundIcon properly to avoid recovery mode crash
| | * | | | recovery: init backgroundIcon properly to avoid recovery mode crashyetta_wu2013-06-251-0/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We met factory issue that some devices would crash in recovery mode because the backgroundIcon array did not reset to NULL when initializing. Bug: 9568624 Change-Id: I13c7a7cc1053a7ffdbadd71740c1a2b4a2af6bba Signed-off-by: yetta_wu <yetta_wu@asus.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | | | recovery: init backgroundIcon properly to avoid recovery mode crashyetta_wu2013-07-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We met factory issue that some devices would crash in recovery mode because the backgroundIcon array did not reset to NULL when initializing. Bug: 9568624 Change-Id: I13c7a7cc1053a7ffdbadd71740c1a2b4a2af6bba Signed-off-by: yetta_wu <yetta_wu@asus.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | | | recovery: copy logs to cache more aggressivelyDoug Zongker2013-07-021-9/+17
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Copy logs to /cache immediately upon a package installation failure; don't wait for recovery to finish. (If the user reboots without exiting recovery the "right" way, the logs never get copied at all.) Change-Id: Iee342944e7ded63da5a4af33d11ebc876f6c0835
* | | | am 8cd12112: am d51bfc9b: Merge "Fix the potential segmentation fault"Doug Zongker2013-06-041-1/+7
|\| | | | | | | | | | | | | | | | | | | * commit '8cd12112e444e01163526fe6ab237f6164b0018b': Fix the potential segmentation fault
| * | | am d51bfc9b: Merge "Fix the potential segmentation fault"Doug Zongker2013-06-041-1/+7
| |\ \ \ | | |/ / | |/| | | | | | | | | | * commit 'd51bfc9b1fe89321af3c629e7b23a747050332e1': Fix the potential segmentation fault
| | * | Merge "Fix the potential segmentation fault"Doug Zongker2013-06-041-1/+7
| | |\ \
| | | * | Fix the potential segmentation faultJin Feng2013-06-041-1/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extral newline can trigger recovery segmentation fault Test case: host$ adb shell 'echo -en "--update_package=ota_update.zip\n--show_text\n\n" > /cache/recovery/command' host$ adb reboot recovery Change-Id: If1781c1f5ad94a273f1cb122b67cedd9fb562433 Signed-off-by: Jin Feng <jin88.feng@gmail.com>
* | | | am da1ebaef: recovery: save logs from the last few invocations of recoveryDoug Zongker2013-05-210-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'da1ebaef0aa8e38db6edf8bfc3d96290461a424f': recovery: save logs from the last few invocations of recovery
| * | | recovery: save logs from the last few invocations of recoveryDoug Zongker2013-05-211-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends the last_log mechanism to save logs from the last six invocations of recovery, so that we're more likely to have useful logs even if the device has repeatedly booted into recovery. Change-Id: I08ae7a09553ada45f9e0733fe1e55e5a22efd9f9
* | | | am 7c3ae45e: recovery: turn on text display for install errors in debug buildsDoug Zongker2013-05-210-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '7c3ae45ef9306d2ff4b491e0488c8849bf15ce90': recovery: turn on text display for install errors in debug builds
| * | | recovery: turn on text display for install errors in debug buildsDoug Zongker2013-05-213-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully this will reduce the number of OTA "bugs" reported that are really just someone having changed their system partition, invalidating future incremental OTAs. Also fixes a longstanding TODO about putting LOGE() output in the on-screen display. Change-Id: I44e5be65b2dee7ebce2cce28ccd920dc3d6e522e
* | | | recovery: save logs from the last few invocations of recoveryDoug Zongker2013-05-161-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends the last_log mechanism to save logs from the last six invocations of recovery, so that we're more likely to have useful logs even if the device has repeatedly booted into recovery. Change-Id: I08ae7a09553ada45f9e0733fe1e55e5a22efd9f9
* | | | recovery: turn on text display for install errors in debug buildsDoug Zongker2013-05-163-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully this will reduce the number of OTA "bugs" reported that are really just someone having changed their system partition, invalidating future incremental OTAs. Also fixes a longstanding TODO about putting LOGE() output in the on-screen display. Change-Id: I44e5be65b2dee7ebce2cce28ccd920dc3d6e522e
* | | | Merge "verifier: update to support certificates using SHA-256"Doug Zongker2013-04-1213-109/+254
|\ \ \ \
| * | | | verifier: update to support certificates using SHA-256Doug Zongker2013-04-1013-109/+254
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifd5a29d459acf101311fa1c220f728c3d0ac2e4e
* | | | | am 4e21482d: Add liblogYing Wang2013-04-103-2/+3
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit '4e21482d979f6f81b34f92e664adf137555d4504': Add liblog
| * | | Add liblogYing Wang2013-04-103-2/+3
| | | | | | | | | | | | | | | | | | | | Bug: 8580410 Change-Id: Ie60dade81c06589cb0daee431611ded34adef8e6
* | | | am b5bd4fb7: (-s ours) am 2f50df00: am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
|\| | | | | | | | | | | | | | | * commit 'b5bd4fb79544b1939e9f977a88a707bdc90cf66c':
| * | | am 2f50df00: am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
|/| | | | | | | | | | | | | | | * commit '2f50df0058dff23fbdfc6b123bb92aaa90aea09b':
| * | | am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| |\ \ \ | | |/ / | |/| | | | | | * commit 'c09444eb5b66a5702db99d9b7de23cb73bf11aa4':
| | * | am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | |\ \ | | | | | | | | | | | | | | | * commit 'f91bd41c46ec8bd085c361ea0bdf53efe13c87ca':
| | | * \ am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | * commit '1c302cafdd793ae250f767b88da718b916751feb':
| | | | * | am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | |/| | | | | | | | | | | | | | | | | | | | * commit 'c14a7fbd895aed1ce34c0682ece5ef361f21dd1c':
| | | | * | Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | |\ \
* | | | | | | more font improvements and cleanupDoug Zongker2013-03-0711-33/+378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the notion of a font's "ascent"; the reference point for drawing is the top-left corner of the character box rather than the baseline. Add some more space between the menu entries and make the highlight bar around the text. Replace the default font.png with two images; the build system will include one or the other based on the resolutions of the device. Restore the original compiled-in bitmap font, to fall back on when font.png can't be found (eg, in the charger binary). Add support for bold text (when a font.png image is used). Change-Id: I6d211a486a3636f20208502b1cd2aeae8b9f5b02
* | | | | | | recovery: change font for menus to be an imageDoug Zongker2013-03-055-255/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of representing the font used for menus and log messages in the recovery binary, load it from a resource PNG image. This allows different devices to substitute their own font images. Change-Id: Ib36b86db3d01298aa7ae2b62a26ca29e6ef18014
* | | | | | | am ec838b88: Merge "minadbd: remove unnecessary header files."Nick Kralevich2013-03-011-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec838b885dd8b74b8682dd2498c7da8f7afca291': minadbd: remove unnecessary header files.
| * | | | | | Merge "minadbd: remove unnecessary header files."Nick Kralevich2013-03-011-2/+0
| |\ \ \ \ \ \
| | * | | | | | minadbd: remove unnecessary header files.Nick Kralevich2013-03-011-2/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff2b53d9e63b279d0262cd2e9cfb11e0ca4d6b42
* | | | | | | Add a CleanSpec for bootable/recoveryBen Murdoch2013-02-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifa7a3aa5e2e3fd5d13266115d592bbfd0aa309c5
* | | | | | | Move to using the new unified fstab in recovery.Ken Sumrall2013-02-204-149/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of reading it's own fstab, have recovery invoke fs_mgr to read the unified fstab. Change-Id: I80c75d2c53b809ac60a4a69f0ef7ebfa707c39e9
* | | | | | | am f7d42340: am c560a67b: add optional overscan compensation to recovery graphicsDoug Zongker2013-01-033-5/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f7d423403d0aed6b8488559185e2246257abc58b': add optional overscan compensation to recovery graphics
| * | | | | | am c560a67b: add optional overscan compensation to recovery graphicsDoug Zongker2013-01-033-5/+32
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c560a67b12350102ba237fa70cedc7c972ad4e4b': add optional overscan compensation to recovery graphics
| | * | | | | add optional overscan compensation to recovery graphicsDoug Zongker2012-12-193-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If your screen is a TV, it may not actually be displaying the edges of the framebuffer. Allow specifying an overscan percentage, and move each edge of the framebuffer in by that percent of the width/height. (The gr_* layer just lies to the caller about the size of the framebuffer, telling the caller it's smaller than it really is, and offsets all drawing commands to match.) Change-Id: I11bb2feb39ae522bd3e957a14ebdecf3609e0fdc
* | | | | | | am 6a1d21a0: am bb01d0c1: add NextCheckKeyIsLong() and EnqueueKey() methodsDoug Zongker2012-12-182-9/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a1d21a0ceb1fb46e9113f3d2a81390612806dfd': add NextCheckKeyIsLong() and EnqueueKey() methods
| * | | | | | am bb01d0c1: add NextCheckKeyIsLong() and EnqueueKey() methodsDoug Zongker2012-12-182-9/+35
| |\| | | | | | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * commit 'bb01d0c12b29e6ff4a9169c21c95408e7eb882c5': add NextCheckKeyIsLong() and EnqueueKey() methods
| | * | | | add NextCheckKeyIsLong() and EnqueueKey() methodsDoug Zongker2012-12-172-9/+35
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NextCheckKeyIsLong() is called right before each call to CheckKey() to tell the implementation if the key is a long-press or not. (To be used on devices with few buttons.) It's done as a separate method (rather than a parameter to CheckKey) to not break existing recovery UI implementations. EnqueueKey() can be called from CheckKey() to put arbitrary code codes in the synchronous queue (to be processed by HandleMenuKey). Change-Id: If8a83d66efe0bbc9e2dc178e5ebe12acd216324b
* | | | | am 9028fb4d: Merge "Pass the correct pointer to munmap on failure."Elliott Hughes2012-12-171-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '9028fb4d4ceed040c7d3ae9b1ceaa5a7472856ba': Pass the correct pointer to munmap on failure.
| * | | | Merge "Pass the correct pointer to munmap on failure."Elliott Hughes2012-12-171-4/+4
| |\ \ \ \
| | * | | | Pass the correct pointer to munmap on failure.Elliott Hughes2012-12-171-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This won't ever happen, and you're probably screwed anyway if it does, but that's no excuse... Change-Id: I2c56f607e351e84308a72b41b834d13aaa98fc62
* | | | | am 27f31606: (-s ours) am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '27f31606390eeed50d27f2c243dfbfe79e8b5ae2':
| * | | | am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'aa0dbb25a0ae51a8e53018fe05bf59164d9804cb':
| | | \ \
| | | \ \
| | *-. \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ Change-Id: Ibef4c059b7a7e055fe562c60656a9f7f7de4841a
* | | | | move key loading to verifier codeDoug Zongker2012-11-024-103/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to verifier_test to load keys from a file, the way the recovery does. Change-Id: Icba0e391164f2c1a9fefeab4b0bcb878e91d17b4
* | | | | reduce some recovery loggingDoug Zongker2012-10-192-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make minzip log only a count of files when extracting, not individual filenames. Make patching only chatter about free space if there's not enough and compact the other messages. Only the last 8k of the recovery log gets uploaded; this makes it more likely that we will get all of it. Change-Id: I529cb4947fe2185df82b9da5fae450a7480dcecd
* | | | | am cd74108c: resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aospKenny Root2012-10-1711-53/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd74108cdac228e946ca8b6ea2ff11ab62941a6d': Remove HAVE_SELINUX guards
| * | | | resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aospKenny Root2012-10-1711-53/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I861e3a6aa07c448909b2ae54618bba178bd6e457
| | * \ \ \ Merge "Remove HAVE_SELINUX guards"Kenny Root2012-10-1711-53/+4
| | |\ \ \ \
| | | * | | | Remove HAVE_SELINUX guardsKenny Root2012-10-1611-53/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: Ia96201f20f7838d7d9e8926208977d3f8318ced4
* | | | | | am d0d4d44d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-10-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd0d4d44d344779e59ee196637bbc745d68d70677':
| | \ \ \ \
| | \ \ \ \
| *-. \ \ \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-10-100-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| | Change-Id: I3afa60bf8978d750c7072128e9f5e87c5d624b36
| | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | * | | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
* | | | | am 4b57f8f2: am 6016d08b: recovery: fix failure to unmount "/cache"Devin Kim2012-10-101-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '4b57f8f2affade295ec856e2bc63ba02e9f079c4': recovery: fix failure to unmount "/cache"
| * | | | am 6016d08b: recovery: fix failure to unmount "/cache"Devin Kim2012-10-101-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '6016d08b0c3b682f1f7000b42a9ea4b6b6d74f22': recovery: fix failure to unmount "/cache"
| | * | | recovery: fix failure to unmount "/cache"Devin Kim2012-10-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At load_locale_from_cache() function, LOCALE_FILE must get closed after it is opened and used. Otherwise it causes a failure to unmount "/cache" after load_locale_from_cache() function is called. Change-Id: I9cec0f29a8ec4452c8a6a52e2f3c8ce9930d5372 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | | | am 2c3d1d83: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '2c3d1d83d5f28160baa5cbec782d518fa186af73':
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-090-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: I692d63796f64702243898ae1d20d8ce073dc15e6
| | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am 80fb6818: am 8347cb2d: revert to tacky 3D recovery animationDoug Zongker2012-10-0867-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '80fb68181e2a396de97c3d1b2d7c9e736cec4417': revert to tacky 3D recovery animation
| * | | | am 8347cb2d: revert to tacky 3D recovery animationDoug Zongker2012-10-0867-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '8347cb2d813b9a8b7c9165aadaea0b699eb5082f': revert to tacky 3D recovery animation
| | * | | revert to tacky 3D recovery animationDoug Zongker2012-10-0867-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7204420 Change-Id: I16d3346ce54b1aa5a0e6a02839ae9fbd4718fffa
* | | | | am 6cc3ded2: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '6cc3ded278818e2897459bdfdc5a5fb4b9ef3071':
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-260-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: I887d27a16a0713ca92f3b2ebc570033cdb8759fb
| | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-250-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am a8db3764: am 6c8553dd: display error state on OTA failureDoug Zongker2012-09-241-4/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8db3764010310045f63bf8da860a9529b948133': display error state on OTA failure
| * | | | am 6c8553dd: display error state on OTA failureDoug Zongker2012-09-241-4/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '6c8553dda8b7fb45adc9f48a294c130b7e283f40': display error state on OTA failure
| | * | | display error state on OTA failureDoug Zongker2012-09-241-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need prompt_with_wait() to show either the ERROR or NO_COMMAND state as appropriate. Bug: 7221068 Change-Id: I191526cf12630d08b7a8250a2a81e724a4a5d972
* | | | | am 15eaee40: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15eaee40a19c0d7391b5f209e4336e889be43297': tweak recovery text images localization for recovery messages
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: Ifa58ce936a9bf0a9e95f46eebcb4f64c772aa5ba
| | * | | tweak recovery text imagesDoug Zongker2012-09-195-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Center and fix the extents for those locales that have multiple lines of text. Add Urdu as an RTL language. Bug: 7064142 Change-Id: I4c1aa1198be29cab01129dabf2c4a026b93719a6
| | * | | localization for recovery messagesDoug Zongker2012-09-198-7/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add images of text for all locales we support. Make the progress bar fill the correct way for RTL languages. (Flip the direction the spinner turns, too, just for good measure.) Bug: 7064142 Change-Id: I5dddb26e02ee5275c57c4dc4a03c6d68432ac7ba
* | | | | am 42afb545: am b66cb69e: tweak recovery text imagesDoug Zongker2012-09-195-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '42afb5457f75cffb29a6d658fbf17961210080fd': tweak recovery text images
| * | | | am b66cb69e: tweak recovery text imagesDoug Zongker2012-09-195-1/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'b66cb69e3933d5f56f06d88cd31817f49d87df5f': tweak recovery text images
| | * | | tweak recovery text imagesDoug Zongker2012-09-185-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Center and fix the extents for those locales that have multiple lines of text. Add Urdu as an RTL language. Bug: 7064142 Change-Id: I4c1aa1198be29cab01129dabf2c4a026b93719a6
* | | | | am ed3bc11e: am 5fa8c239: localization for recovery messagesDoug Zongker2012-09-188-7/+53
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'ed3bc11e7dd4b6e0ddb77a3c9492675d8ac6855d': localization for recovery messages
| * | | | am 5fa8c239: localization for recovery messagesDoug Zongker2012-09-188-7/+53
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '5fa8c23911759a9e81af0e7fb5eb431277b8e9a6': localization for recovery messages
| | * | | localization for recovery messagesDoug Zongker2012-09-188-7/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add images of text for all locales we support. Make the progress bar fill the correct way for RTL languages. (Flip the direction the spinner turns, too, just for good measure.) Bug: 7064142 Change-Id: I5dddb26e02ee5275c57c4dc4a03c6d68432ac7ba
* | | | | am 74a806e5: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '74a806e5efbfd4a37725f2f1e193c3c2eb973fb7': fix format of installing_text
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / Change-Id: Ia9cde557f8e6abaf0935e6b238eb956be09c12ca
| | * | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-050-0/+0
| |/| |
| | * | fix format of installing_textDoug Zongker2012-08-311-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Was submitted in the wrong PNG format (color type 4 instead of 0). Change-Id: I8780c81eb92bdfc407b43948a92b37d93026325a
* | | | am 52eeea4f: minor recovery fixesDoug Zongker2012-09-053-10/+13
|\| | | | | | | | | | | | | | | | | | | * commit '52eeea4fa59c15ecb09c32b8e05653f4e55f5188': minor recovery fixes
| * | | minor recovery fixesDoug Zongker2012-09-043-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - protect against missing/malformed bitmaps: fail to display them but don't crash. - don't draw animation overlays until the overlay offset is computed. - logging cleanup Change-Id: Ieb1c155cfbb11e643000bdb5d1a57900c8757739
* | | | am f4c6ec84: fix format of installing_textDoug Zongker2012-08-301-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'f4c6ec84c24611856374353bdef87baca5694cc0': fix format of installing_text
| * | | fix format of installing_textDoug Zongker2012-08-301-0/+0
| |/ / | | | | | | | | | | | | | | | Was submitted in the wrong PNG format (color type 4 instead of 0). Change-Id: I8780c81eb92bdfc407b43948a92b37d93026325a
* | | am aff4dbb0: Merge "recovery locale handling fixes" into jb-mr1-devDoug Zongker2012-08-306-9/+1
|\| | | | | | | | | | | | | | * commit 'aff4dbb0ae33e55785d1a11f93c1e20ebfed4a90': recovery locale handling fixes
| * | Merge "recovery locale handling fixes" into jb-mr1-devDoug Zongker2012-08-306-9/+1
| |\ \
| | * | recovery locale handling fixesDoug Zongker2012-08-306-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - change locale filename to "last_locale" so the main system doesn't delete it - clean up some chatty logging - update images with real German (other languages TBD) Change-Id: I2ebb4ed4e054bd1808a3042d9efbb2c18f3a044d
* | | | am d52ef348: am bddbb5b3: Merge "Fixing trivial warnings for libminui"Jean-Baptiste Queru2012-08-241-2/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'd52ef348d5abb65cd067be334d37c86d621786b9': Fixing trivial warnings for libminui
| * | | am bddbb5b3: Merge "Fixing trivial warnings for libminui"Jean-Baptiste Queru2012-08-241-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'bddbb5b370d925d6e5ae62d560f5e7ad09a6ffac': Fixing trivial warnings for libminui
| | * | 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>
* | | | | am 3474ab28: Merge "Add libm due to libpng dependency." into jb-mr1-devStephen Hines2012-08-241-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '3474ab2888838e512c6bcff588fa88f02c81135f': Add libm due to libpng dependency.
| * | | | Merge "Add libm due to libpng dependency." into jb-mr1-devStephen Hines2012-08-241-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add libm due to libpng dependency.Stephen Hines2012-08-241-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I0bdc2df5ef358813587f613a1b50eaa850e95782
* | | | | am e630d945: am 6a693d57: Merge "Fixed warnings in libmtdutils"Jean-Baptiste Queru2012-08-241-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'e630d945f90a3a5610529b761ea9638929949a2e': Fixed warnings in libmtdutils
| * | | | am 6a693d57: Merge "Fixed warnings in libmtdutils"Jean-Baptiste Queru2012-08-241-4/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '6a693d57687a18f8e032293b71ca98882a78c93d': Fixed warnings in libmtdutils
| | * | | 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>
* | | | | am 8876725f: am 0254d573: Merge "Fix multiple defined symbol errors"Jean-Baptiste Queru2012-08-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '8876725f05518e8170aedb81ab40dfe638eb656f': Fix multiple defined symbol errors
| * | | | am 0254d573: Merge "Fix multiple defined symbol errors"Jean-Baptiste Queru2012-08-241-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '0254d57367432069256b623c6852da8b92626e79': Fix multiple defined symbol errors
| | * | | 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>
* | | | | am 7b827d04: am 481e03e3: Merge "Fixed unused param warnings for check-lost+found"Jean-Baptiste Queru2012-08-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '7b827d04a5cab7d8c5573181de3eb4ea2d0e173a': Fixed unused param warnings for check-lost+found
| * | | | am 481e03e3: Merge "Fixed unused param warnings for check-lost+found"Jean-Baptiste Queru2012-08-241-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '481e03e39810ba1b7eab1d0d806039f45c4ad987': Fixed unused param warnings for check-lost+found
| | * | | 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>
* | | | am 4f33e55d: change recovery images to android with spinnerDoug Zongker2012-08-2368-13/+16
|\| | | | | | | | | | | | | | | | | | | * commit '4f33e55d1c38d2f72f3306a82c177850f3676408': change recovery images to android with spinner
| * | | change recovery images to android with spinnerDoug Zongker2012-08-2368-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | Also make writing the locale a bit more robust. Change-Id: I803dd0aa0b9d6661fad74ea13fb085682402323c
* | | | am 02ec6b88: add simple text to recovery UIDoug Zongker2012-08-2313-30/+274
|\| | | | | | | | | | | | | | | | | | | * commit '02ec6b88ed4e6cf40cc257572b07c7277b7b6341': add simple text to recovery UI
| * | | add simple text to recovery UIDoug Zongker2012-08-2313-30/+274
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - recovery takes a --locale argument, which will be passed by the main system - the locale is saved in cache, in case the --locale argument is missing (eg, when recovery is started from fastboot) - we include images that have prerendered text for many locales - we split the background states into four (installing update, erasing, no command, error) so that appropriate text can be shown. Change-Id: I731b8108e83d5ccc09a4aacfc1dbf7e86b397aaf
* | | am a3ccba6d: add bonus data feature to imgdiff/imgpatch/applypatchDoug Zongker2012-08-216-22/+100
|\| | | | | | | | | | | | | | * commit 'a3ccba6d314cb29b02d1dbda9a71427b11da936d': add bonus data feature to imgdiff/imgpatch/applypatch
| * | add bonus data feature to imgdiff/imgpatch/applypatchDoug Zongker2012-08-216-22/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bonus data option lets you give an additional blob of uncompressed data to be used when constructing a patch for chunk #1 of an image. The same blob must be available at patch time, and can be passed to the command-line applypatch tool (this feature is not accessible from edify scripts). This will be used to reduce the size of recovery-from-boot patches by storing parts of the recovery ramdisk (the UI images) on the system partition. Change-Id: Iac1959cdf7f5e4582f8d434e83456e483b64c02c
* | | am 55850258: am 3733d218: Merge changes I664f8dc7,I4154db06,I5e1df90fJoe Onorato2012-08-171-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5585025814418e8b692a3a38b7cff495180a74f8': recovery: import init.recovery.${ro.hardware}.rc Use the static version of libsparse Multiple modules with the same name are going away. host modules don't need LOCAL_MODULE_TAGS
| * | am 3733d218: Merge changes I664f8dc7,I4154db06,I5e1df90fJoe Onorato2012-08-173-37/+63
| |\| | | | | | | | | | | | | | | | | | | * commit '3733d2185bbcedd9ef626907f1f32628986cc0f5': Use the static version of libsparse Multiple modules with the same name are going away. host modules don't need LOCAL_MODULE_TAGS
| | * 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
| * | recovery: import init.recovery.${ro.hardware}.rcColin Cross2012-08-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some devices need hardware specific services started in recovery, for example watchdogd. Import init.recovery.${ro.hardware}.rc from the recovery init.rc. Bug: 6953625 Change-Id: I4a4cee210238150ffaabe774a44340ec3c8ff78c
* | | Use the static version of libsparseJoe Onorato2012-08-142-2/+2
| | | | | | | | | | | | Change-Id: I664f8dc7939f8f902e4775eaaf6476fcd4ab8ed2
* | | Multiple modules with the same name are going away.Joe Onorato2012-08-142-36/+63
| | | | | | | | | | | | Change-Id: I4154db066865d6031caa3c2c3b94064b2f28076e
* | | host modules don't need LOCAL_MODULE_TAGSJoe Onorato2012-08-141-1/+0
|/ / | | | | | | Change-Id: I5e1df90f18fbaf98e3207c553a8fb859c1064137
* | fix the symlink() command to create directories if neededDoug Zongker2012-08-071-3/+29
| | | | | | | | | | | | | | | | | | | | | | Full OTAs currently fail if the build contains a directory containing only symlinks, because nothing creates that directory. Change the symlink() command to create any ancestor directories that don't exist. They're created as owner root perms 0700 because we assume that in practice subsequent set_perm_recursive() calls will fix up their ownership and permissions. Change-Id: I4681cbc85863d9778e36b924f0532b2b3ef14310
* | fix conflicts with merge of jb-dev-makoEd Heyl2012-07-261-2/+4
|\ \ | | | | | | | | | Change-Id: I2d8d18232ed02b2c4e3e661544046bf4b8039800
| * | minui: fix screen update issueDevin Kim2012-07-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yres_virtual value is set incorrectly, causing serveral images to be skipped. Change this value according to the number of buffers to fix this issue. from: codeaurora.org minui: Display the battery charging image correctly commit: 581a4dead6b96579a13ff22e2454c1f329731679 Change-Id: I10f5d1c6cc37705f0287c7dd517082de2e11d264 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | support version 2 (2048-bit e=65537) keys in recoveryDoug Zongker2012-07-256-5/+114
| | | | | | | | | | | | Change-Id: I9849c69777d513bb12926c8c622d1c12d2da568a
* | | am dd6cd4fc: Merge "graphics: add support for "single buffering""Doug Zongker2012-07-211-2/+10
|\ \ \ | | |/ | |/| | | | | | | * commit 'dd6cd4fcc1b22df7f55e1ab3e54589939dc54179': graphics: add support for "single buffering"
| * | 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>
* | | | am 989a2859: Merge "Link against libsparse"Colin Cross2012-07-182-3/+3
|\| | | | | | | | | | | | | | | | | | | * commit '989a28599a600b649f71a06335bf1e4085b5505a': Link against libsparse
| * | | 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
* | | allow double-quotes or not in TARGET_RECOVERY_PIXEL_FORMATDoug Zongker2012-07-111-2/+6
| | | | | | | | | | | | Change-Id: I0bf22c87c51a34ee4a839c4966277fad8150bd59
* | | Add mode when open(O_CREAT) is used.Nick Kralevich2012-06-271-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
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 03:13:26 +0200