Commit Graph

9577 Commits

Author SHA1 Message Date
Tao Bao 5b3b373a49 uncrypt: Retire pre-recovery service.
The framework CL in [1] removes the use of "pre-recovery" service which
is basically to trigger a reboot into the recovery.

[1] commit e8a403d57c8ea540f8287cdaee8b90f0cf9626a3

Bug: 26830925
Change-Id: I131f31a228df59e4f9c3024b238bbdee0be2b157
2016-02-22 17:33:41 -08: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
Josh Gao cd324766ab minadbd: update for adb_thread_create signature change.
Change-Id: Ifa0b4d8c1cf0bb39abac61984ff165e82e41222c
(cherry picked from commit cc07b35565)
2016-02-22 15:44:53 -08: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
Yabin Cui 4f2df162c6 Fix integer overflows in recovery procedure.
Bug: 26960931
Change-Id: Ieae45caccfb4728fcf514f0d920976585d8e6caf
(cherry picked from commit a029c9a458)
2016-02-22 11:02:08 -08: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
Ethan Yonker eadfd2eb68 Fix storage selection with adopted storage
Change-Id: Ifcba4e668579c3684df9e47e1c3faf5f4d1f3e83
2016-02-18 22:04:18 -06:00
that 506fc803bf minuitwrp: fix and hopefully speed up fbdev screen flipping
Fix: use row_bytes instead of xres (should help on Shield tablet)
Speed: Moving the calculations out of the inner loop

Change-Id: Ie43ae5e94ae88822360900c7b4d852b7aab4379b
2016-02-19 04:03:01 +01:00
AdrianDC 2948b6f393 twrp: Add support for TW_SECONDARY_BRIGHTNESS_PATH
* Required for devices like Sony Huashan (dual backlighting paths)

Change-Id: I0f84623431aec91fafee6617c1d4c542e4566caf
2016-02-19 04:01:57 +01:00
Ethan Yonker 07926a3845 Fix OEM compile
Change-Id: I39218f2485a2c2c95f0e400c31356bedc4973f6c
2016-02-19 03:58:06 +01:00
Yabin Cui a029c9a458 Fix integer overflows in recovery procedure.
Bug: 26960931
Change-Id: Ieae45caccfb4728fcf514f0d920976585d8e6caf
2016-02-18 14:07:36 -08:00
Ethan Yonker fcf3f24856 Fix adopted storage when andsec flag is present
Change-Id: If903d838abc920f952f243482338188c15bb1dbf
2016-02-18 11:38:33 -06:00
Sultan Qasim Khan 7a48a664fd patternpassword: update large grid password scheme
CM13 and up no longer use the two method scheme.

Change-Id: I21154becb5d7e77a54a5a07e649fe64829173a01
2016-02-17 22:45:21 +01:00
Bill Yi 4b327342fc Merge commit \'ce46828e08281dc507d4e40ba9e8b770bc21cf0b\' into HEAD
am: dfe43869cb

* commit 'dfe43869cbeaf03f0950cf483f419bd9626473a5':
2016-02-17 20:44:25 +00:00
Ethan Yonker d3e96ff43e Restore some old decrypt functionality
Some of the convoluted convert_hex_ascii_to_key code is needed to
properly decrypt CM 12.1 patterns where grid size is larger than
3x3.

Change-Id: I497e17980046c60d2c69ba56e4b83c8b64b0b80e
2016-02-17 13:36:54 -06: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
Sultan Qasim Khan a7e63a28c8 cryptfs: major overhaul and cleanup
- Don't upgrade HW encrypted Lollipop devices to Marshmallow crypto
- Fix support for passwords and patterns with an odd number of elements
- Remove unused code
- Fix build warnings

Change-Id: I25f015085e5c859d0353f42f6a2fbc7ccecd48ed
2016-02-16 13:32:22 -05:00
James Christopher Adduono 09f380dbcd Remove inexplicable checks for enabling/disabled UMS support
Removing these lines allows UMS to be enabled for devices with storage lun.
The checks don't seem to make sense as they are referencing always defined strings.

Change-Id: I75df9b7db5a790807fc2b5c946b271b103326b39
2016-02-15 21:47:41 +01:00
Ethan Yonker e5a288c96b Fix up logd make file rules
logd, the init.recovery.logd.rc, and other related files were
included by default if your device configs specified
TARGET_USES_LOGD := true which would be the case for any device
that has a full ROM tree instead of a minimal TWRP tree.

Change-Id: Ia1e55703631f0f22beab2f4d4479599b88539e1a
2016-02-15 09:27:02 -06: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