PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,833 Commits 1 Branch 0 Tags
4b3cdce702fefa7eac0626f57d09ff018127c191
Commit Graph

1833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianjie Xu 4b3cdce702 Merge "Surpress warnings in minzip/Zip.c" 2016-02-23 19:16:42 +00:00
Tianjie Xu 6629655476 Surpress warnings in minzip/Zip.c 
bootable/recovery/minzip/Zip.c:514:5: warning: Value stored to 'compRemaining' is never read
    compRemaining = pEntry->compLen;
        ^               ~~~~~~~~~~~~~~~
  bootable/recovery/minzip/Zip.c:778:9: warning: Null pointer argument in call to memory copy function
    memcpy(p, helper->targetDir, helper->targetDirLen);
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Bug: 27229894
Change-Id: I0482bac3a4fcddc191783d1e5b5a83cf29fa4e85
 2016-02-23 11:15:43 -08:00
Tao Bao ed796b046d Merge "Control fault injection with config files instead of build flags" 2016-02-23 04:50:47 +00:00
Jed Estep 39c1b5e872 Control fault injection with config files instead of build flags 
Bug: 26570379
Change-Id: I76109d09276d6e3ed3a32b6fedafb2582f545c0c
(cherry picked from commit d940887dde)
 2016-02-22 17:31:12 -08:00
Yabin Cui 16d0a18514 Merge "recovery: check battery level before installing package." 2016-02-22 22:53:52 +00:00
Yabin Cui 53e7a0628f recovery: check battery level before installing package. 
Bug: 26879394

Change-Id: I63dce5bc50c2e104129f1bcab7d3cad5682bf45d
 2016-02-19 18:08:09 -08:00
Elliott Hughes fa9af7dae6 Merge "Fix minui cleanup path on error." 2016-02-20 00:30:19 +00:00
Elliott Hughes 7d626df079 Fix minui cleanup path on error. 
bootable/recovery/minui/resources.cpp:321:21: warning: Branch condition evaluates to a garbage value
                if (surface[i]) free(surface[i]);
                    ^~~~~~~~~~
  bootable/recovery/minui/resources.cpp:424:13: warning: Value stored to 'len' during its initialization is never read
        int len = row[4];
            ^~~   ~~~~~~

Bug: http://b/27264652
Change-Id: Icc1a914c59d6a89dab1b752b2cd2b40549566481
 2016-02-19 10:33:01 -08:00
Sen Jiang b30663b4a7 Merge "applypatch: Add libimgpatch.pc" 2016-02-17 00:42:15 +00:00
Sen Jiang f3e05f504d applypatch: Add libimgpatch.pc 
Test: pkg-config --libs libimgpatch
Bug: 26866274
Change-Id: I79a103099d951943a88768c577224fccacbb79e3
 2016-02-16 11:35:29 -08:00
Josh Gao b69d878b9a Merge "minadbd: update for adb_thread_create signature change." 2016-02-12 23:42:49 +00:00
Josh Gao cc07b35565 minadbd: update for adb_thread_create signature change. 
Change-Id: Ifa0b4d8c1cf0bb39abac61984ff165e82e41222c
 2016-02-12 15:00:52 -08:00
Sen Jiang cc8d08a4d8 Merge "imgdiff: don't fail if gzip is corrupted." 2016-02-12 22:58:32 +00:00
Sen Jiang fa4f1b75b6 imgdiff: don't fail if gzip is corrupted. 
Treat it as a normal chunk if inflate() fails.

Test: run imgdiff on corrupted gzip and apply the patch
Bug: 27153028
Change-Id: Idcbb3c1360ec0774e6c7861b21d99af8ee10604a
 2016-02-12 12:57:03 -08:00
Yabin Cui 7f16c7a4c9 Merge "applypatch: use vector to store data in FileContents." 2016-02-12 18:09:20 +00:00
Yabin Cui d6c93afcc2 applypatch: use vector to store data in FileContents. 
Bug: 26906416
Change-Id: Ib53b445cd415a1ed5e95733fbc4073f9ef4dbc43
 2016-02-11 18:10:31 -08:00
Yabin Cui 71c657a10e Merge "Fix some memory leaks." 2016-02-11 00:41:52 +00:00
Yabin Cui 4425c1d960 Fix some memory leaks. 
Bug: 26906328
Change-Id: Iebaf03db0cb3054f91715f8c849be6087d01b27b
 2016-02-10 15:32:19 -08:00
Tao Bao 7043206503 Merge "IO fault injection for OTA packages" 2016-02-10 19:00:02 +00:00
Jed Estep a7b9a4660c IO fault injection for OTA packages 
Bug: 25951086
Change-Id: I31c74c735eb7a975b7f41fe2b2eff042e5699c0c
(cherry-picked from commit f1fc48c6e6)
 2016-02-10 10:49:38 -08:00
Sen Jiang 6a7bf1d9aa Merge "applypatch: Add a Makefile to build imgdiff in Chrome OS." 2016-02-10 18:21:31 +00:00
Sen Jiang 696692a3c9 applypatch: Add a Makefile to build imgdiff in Chrome OS. 
Also fixed some warnings and added check for target_len.

Test: mma; emerge-peppy imgdiff; emerge-nyan imgdiff; sudo emerge imgdiff
Bug: 26866274

Change-Id: Ifbcd3afd6701c769ccf626e33ed94461706f7ee6
 2016-02-09 15:26:57 -08:00
Tao Bao c213a7c1d1 Merge "verifier_test: Suppress the unused parameter warnings." 2016-02-09 04:06:18 +00:00
Tao Bao bd39fa7bdb Merge "Change on-device directory for recovery test data" 2016-02-08 19:45:35 +00:00
Yabin Cui 6b89aa7662 Merge "applypatch: fix memory leaks reported by static analysis." 2016-02-05 22:54:36 +00:00
Jed Estep d5a14c6a49 Change on-device directory for recovery test data 
Test data needs to go outside the gtest module.

Change-Id: Ic444ca838cbafa651ec97ff8730129da84fafc09
 2016-02-05 11:49:20 -08:00
Tao Bao e1a16af3ea verifier_test: Suppress the unused parameter warnings. 
Change-Id: I51fec30114c0a31efc9c2ac8472654baf8bb3e84
 2016-02-05 10:41:53 -08:00
Tao Bao 38b02cc6a0 Merge "Refactor existing tests to use gtest" 2016-02-05 18:41:01 +00:00
Yabin Cui e50d447692 Merge "updater: fix memory leak based on static analysis." 2016-02-05 02:46:23 +00:00
Yabin Cui d483c20a7e applypatch: fix memory leaks reported by static analysis. 
Bug: 26906416
Change-Id: I163df5a8f3abda3ba5d4ed81dfc8567054eceb27
 2016-02-04 15:42:02 -08:00
Yabin Cui 64be2135d8 updater: fix memory leak based on static analysis. 
Bug: 26907377
Change-Id: I384c0131322b2d12f0ef489735e70e86819846a4
 2016-02-04 14:49:06 -08:00
Tao Bao 6e71c90fad Merge "Switch from mincrypt to BoringSSL in applypatch and updater." 2016-02-04 19:16:20 +00:00
Jed Estep 432918603f Refactor existing tests to use gtest 
Bug: 26962907
Change-Id: I5f80636af1740badeff7d08193f08e23f4e4fee1
 2016-02-04 10:11:30 -08:00
Sen Jiang c48cb5e597 Switch from mincrypt to BoringSSL in applypatch and updater. 
Bug: 18790686
Change-Id: I7d2136fb39b2266f5ae5be24819c617b08a6c21e
 2016-02-04 16:27:43 +08:00
Yabin Cui e3434279c8 Merge "uncrypt: add options to setup bcb and clear bcb." 2016-02-03 18:52:52 +00:00
Yabin Cui 2d46da57e1 uncrypt: add options to setup bcb and clear bcb. 
Bug: 26696173

Change-Id: I3a612f045aaa9e93e61ae45b05300d02b19bb3ad
 2016-02-03 10:43:03 -08:00
Tao Bao 351ddbbc0a Merge "recovery: Refactor verifier and verifier_test." 2016-02-03 17:16:56 +00:00
Tao Bao 71e3e09ec2 recovery: Refactor verifier and verifier_test. 
Move to using std::vector and std::unique_ptr to manage key
certificates to stop memory leaks.

Bug: 26908001
Change-Id: Ia5f799bc8dcc036a0ffae5eaa8d9f6e09abd031c
 2016-02-02 21:51:32 -08:00
Yabin Cui 4c07a7ec05 Merge "uncrypt: generate map file by renaming tmp file." 2016-02-02 00:12:21 +00:00
Yabin Cui 25dd0386fe uncrypt: generate map file by renaming tmp file. 
Writing map file directly can break consistency in map file if
it fails in the middle. Instead, we write a temporary file and
rename the temporary file to map file.

Bug: 26883096
Change-Id: I5e99e942e1b75e758af5f7a48f8a08a0b0041d6a
 2016-02-01 14:43:14 -08:00
Tao Bao 9d72d4175b Merge "Fix build." 2016-01-29 06:01:32 +00:00
Tao Bao 8b0db11eba Fix build. 
Disable libimgpatch for non-Linux host.

Change-Id: Ib3615204b76564c691ddafaa29e59fef334d9d36
 2016-01-28 21:59:09 -08:00
Sen Jiang 1f3616f3fd Merge "applypatch: Compile libimgpatch for target and host." 2016-01-29 04:35:05 +00:00
Sen Jiang 0cce9cda0c applypatch: Compile libimgpatch for target and host. 
update_engine need it for the new IMGDIFF operation.

Also removed __unused in ApplyImagePatch() as I got error building it
for the host, and I think it's dangerous not checking the size of the
input.

Test: mma
Bug: 26628339

Change-Id: I22d4cd55c2c3f87697d6afdf10e8106fef7d1a9c
 2016-01-28 13:26:25 +08:00
Yabin Cui d379b4410b Merge "edify: accept long string literal." 2016-01-27 23:05:57 +00:00
Yabin Cui 12f499e86d edify: accept long string literal. 
Bug: 24717917
Change-Id: I134cf00ae7efbc3703f976459a1b9f9a197e495d
 2016-01-27 12:26:18 -08:00
Tao Bao 5797bf9c90 Merge "Change BCB to perform synchronous writes." 2016-01-22 17:23:17 +00:00
Tao Bao bd82b27341 Change BCB to perform synchronous writes. 
Also some trivial clean-ups in bootloader control block (BCB) code.

Change-Id: I42828954caa4d08998310de40fd0391f76d99cbe
 2016-01-21 14:49:13 -08:00
Tao Bao 37e3c71da3 Merge "recovery: Fork a process for fuse when sideloading from SD card." 2016-01-14 18:25:54 +00:00
Tao Bao cdcf28f54f recovery: Fork a process for fuse when sideloading from SD card. 
For applying update from SD card, we used to use a thread to serve the
file with fuse. Since accessing through fuse involves going from kernel
to userspace to kernel, it may run into deadlock (e.g. for mmap_sem)
when a page fault occurs. Switch to using a process instead.

Bug: 23783099
Bug: 26313124
Change-Id: Iac0f55b1bdb078cadb520cfe1133e70fbb26eadd
 2016-01-13 21:29:20 -08:00