PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,102 Commits 1 Branch 0 Tags
30ed5b99f55b759b2aa0f95cfd457ea0ffbd8bf4
Commit Graph

2102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jed Estep 30ed5b99f5 Merge "Control fault injection with config files instead of build flags" 2016-02-23 01:37:09 +00:00
Yabin Cui bb3d4a102c Merge "recovery: check battery level before installing package." am: 16d0a18514 am: d1b66ad6a1 
am: 9ade9e6c41

* commit '9ade9e6c418aacfcab3e1ec487c8c5c327b7a007':
  recovery: check battery level before installing package.
 2016-02-22 23:23:59 +00:00
Yabin Cui 9ade9e6c41 Merge "recovery: check battery level before installing package." am: 16d0a18514 
am: d1b66ad6a1

* commit 'd1b66ad6a117188751b1342d77edb9756a00ae87':
  recovery: check battery level before installing package.
 2016-02-22 23:13:38 +00:00
Yabin Cui d1b66ad6a1 Merge "recovery: check battery level before installing package." 
am: 16d0a18514

* commit '16d0a185142cff938d94f668e97cb95b4e742199':
  recovery: check battery level before installing package.
 2016-02-22 23:05:26 +00:00
Yabin Cui 16d0a18514 Merge "recovery: check battery level before installing package." 2016-02-22 22:53:52 +00:00
Jed Estep 6fe9f89a6b Fix verifier test base testdata directory after merge conflict am: e1305768f6 
am: fc4971ba52

* commit 'fc4971ba52b34d2b138cc975d328d1d586e84aea':
  Fix verifier test base testdata directory after merge conflict
 2016-02-22 20:02:19 +00:00
Jed Estep fc4971ba52 Fix verifier test base testdata directory after merge conflict 
am: e1305768f6

* commit 'e1305768f69ed8a3cf810f1204a3a2c519747716':
  Fix verifier test base testdata directory after merge conflict
 2016-02-22 19:49:04 +00:00
Jed Estep e1305768f6 Fix verifier test base testdata directory after merge conflict 
Change-Id: I7ffba0be5a6befc875ce59b51a008c1892e7d34b
 2016-02-22 10:59:37 -08:00
Yabin Cui 2bb7624b6c Merge "Check each value read from block map file." 2016-02-22 18:36:22 +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
Yabin Cui 2e947ea55e Check each value read from block map file. 
Bug: 26960931
Change-Id: I50b266ecb899db043831f528c2518bea76168c88
 2016-02-19 17:54:25 -08:00
Elliott Hughes 4d230f78de Merge "Fix minui cleanup path on error." am: fa9af7dae6 am: af38cd9330 
am: 149b9eb2d8

* commit '149b9eb2d82ae49e110c3fd95ab99dd726e0f9e8':
  Fix minui cleanup path on error.
 2016-02-20 01:11:25 +00:00
Elliott Hughes 149b9eb2d8 Merge "Fix minui cleanup path on error." am: fa9af7dae6 
am: af38cd9330

* commit 'af38cd9330d2ee2c96a807e328beb008cd10d789':
  Fix minui cleanup path on error.
 2016-02-20 00:47:28 +00:00
Elliott Hughes af38cd9330 Merge "Fix minui cleanup path on error." 
am: fa9af7dae6

* commit 'fa9af7dae68aad09ed624a9786f6cd57713f7b7f':
  Fix minui cleanup path on error.
 2016-02-20 00:40:46 +00:00
Elliott Hughes fa9af7dae6 Merge "Fix minui cleanup path on error." 2016-02-20 00:30:19 +00:00
Jed Estep d940887dde Control fault injection with config files instead of build flags 
Bug: 26570379
Change-Id: I76109d09276d6e3ed3a32b6fedafb2582f545c0c
 2016-02-19 15:32:12 -08: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
Tao Bao c344062760 DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b -s ours am: 52991c4639 -s ours am: a4436f7b25 -s ours 
am: 2dd284b616  -s ours

* commit '2dd284b6165dbded8127f14e170957145ab6e4be':
  DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB.
 2016-02-19 17:43:38 +00:00
Tao Bao 2dd284b616 DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b -s ours am: 52991c4639 -s ours 
am: a4436f7b25  -s ours

* commit 'a4436f7b25e4b27108a3b6a0be4f244e356f8ffc':
  DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB.
 2016-02-19 17:39:12 +00:00
Tao Bao a4436f7b25 DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b -s ours 
am: 52991c4639  -s ours

* commit '52991c4639347a2e2b098949fdf91c305f8d41dd':
  DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB.
 2016-02-19 17:33:52 +00:00
Tao Bao 52991c4639 DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. 
am: 8559bbfb3b  -s ours

* commit '8559bbfb3b988b1b8790702d277715fc429cc1d8':
  DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB.
 2016-02-19 17:29:34 +00:00
Tao Bao 8559bbfb3b DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. 
Commit [1] made similar changes into AOSP code, but it requires multiple
CLs to cherry-pick into cw-e branch. So we make a separate CL to fix the
issue.

[1] commit bd82b27341

Bug: 27247370
Change-Id: Id5c08a6a29284353f891cdbaa224feee891f3807
 2016-02-19 08:39:25 -08:00
Yabin Cui a029c9a458 Fix integer overflows in recovery procedure. 
Bug: 26960931
Change-Id: Ieae45caccfb4728fcf514f0d920976585d8e6caf
 2016-02-18 14:07:36 -08:00
Bill Yi 4b327342fc Merge commit \'ce46828e08281dc507d4e40ba9e8b770bc21cf0b\' into HEAD 
am: dfe43869cb

* commit 'dfe43869cbeaf03f0950cf483f419bd9626473a5':
 2016-02-17 20:44:25 +00:00
Bill Yi dfe43869cb Merge commit 'ce46828e08281dc507d4e40ba9e8b770bc21cf0b' into HEAD 2016-02-17 09:50:14 -08:00
Sen Jiang e6f3ffe80f Merge "applypatch: Add libimgpatch.pc" 
am: b30663b4a7

* commit 'b30663b4a7d70886c5e8cdfce7307f0271e34de8':
  applypatch: Add libimgpatch.pc
 2016-02-17 00:49:36 +00: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 ba9765b058 Merge "minadbd: update for adb_thread_create signature change." 
am: b69d878b9a

* commit 'b69d878b9a3967b247df30dc6f8a760f720659b7':
  minadbd: update for adb_thread_create signature change.
 2016-02-13 01:32:02 +00:00
Josh Gao b69d878b9a Merge "minadbd: update for adb_thread_create signature change." 2016-02-12 23:42:49 +00:00
Sen Jiang 42b28f0e4b Merge "imgdiff: don\'t fail if gzip is corrupted." 
am: cc8d08a4d8

* commit 'cc8d08a4d82904d6cd202c2d50fc37748aa044c9':
  imgdiff: don't fail if gzip is corrupted.
 2016-02-12 23:12:17 +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 33a65bcdc7 Merge "applypatch: use vector to store data in FileContents." 
am: 7f16c7a4c9

* commit '7f16c7a4c9b457302a0c91c9bd4c739708a9c79e':
  applypatch: use vector to store data in FileContents.
 2016-02-12 18:20:42 +00: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 2566b31b9b Merge "Fix some memory leaks." 
am: 71c657a10e

* commit '71c657a10e39cc99b718fd88784c1437c10fb79e':
  Fix some memory leaks.
 2016-02-11 00:48:55 +00: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 4f0eb3e23a resolve merge conflicts of 7043206503 to nyc-dev-plus-aosp. 
Change-Id: I2c34d9428a1ce15fc625865aa4d5b6e02b796591
 2016-02-10 11:46:57 -08:00
Sen Jiang bca162a98b Merge "applypatch: Add a Makefile to build imgdiff in Chrome OS." 
am: 6a7bf1d9aa

* commit '6a7bf1d9aa7cd52a594e91e6a8f9111a18ae3551':
  applypatch: Add a Makefile to build imgdiff in Chrome OS.
 2016-02-10 19:30:20 +00: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 2a32d1c509 Merge "verifier_test: Suppress the unused parameter warnings." 
am: c213a7c1d1

* commit 'c213a7c1d1eb0c6ab9bbe08c7375e8814a59a3ac':
  verifier_test: Suppress the unused parameter warnings.
 2016-02-09 04:10:34 +00:00
Tao Bao c213a7c1d1 Merge "verifier_test: Suppress the unused parameter warnings." 2016-02-09 04:06:18 +00:00
Tao Bao f81db4e1c0 Merge "Change on-device directory for recovery test data" 
am: bd39fa7bdb

* commit 'bd39fa7bdb0ce4e55cada877084062f32f90edc2':
  Change on-device directory for recovery test data
 2016-02-08 20:01:34 +00:00
Tao Bao bd39fa7bdb Merge "Change on-device directory for recovery test data" 2016-02-08 19:45:35 +00:00