PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,257 Commits 1 Branch 0 Tags
481ce238ccc776c86d78cb04010d5ad29fdd32d5
Commit Graph

2257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jed Estep 481ce238cc Merge "Correct caching behavior for should_inject_cache" am: 9afbf2a 
am: c52b853

* commit 'c52b853194553dae146bf19b9279b6290fe8c678':
  Correct caching behavior for should_inject_cache
 2016-03-25 20:09:23 +00:00
Jed Estep c52b853194 Merge "Correct caching behavior for should_inject_cache" 
am: 9afbf2a

* commit '9afbf2af4ca615b036926f8008c4e6aa2f7dd987':
  Correct caching behavior for should_inject_cache
 2016-03-25 20:07:02 +00:00
Tao Bao 9afbf2af4c Merge "Correct caching behavior for should_inject_cache" 2016-03-25 19:03:28 +00:00
Jed Estep e326b22446 Correct caching behavior for should_inject_cache 
Bug: 27800498
Change-Id: I5255283c1d04a385ed719c5bc2be461cae9f3648
(cherry picked from commit 88dd7796a1)
 2016-03-25 11:21:12 -07:00
Tianjie Xu 8085b38c18 Merge "Skip stashing source blocks in verify mode" into nyc-dev am: adca297 
am: 7781778

* commit '77817789e04337011d4a659114795d745c98bf7a':
  Skip stashing source blocks in verify mode
 2016-03-24 00:40:01 +00:00
Tianjie Xu 77817789e0 Merge "Skip stashing source blocks in verify mode" into nyc-dev 
am: adca297

* commit 'adca29794376e4936824b60aeaa53b285962ee05':
  Skip stashing source blocks in verify mode
 2016-03-24 00:37:55 +00:00
Tianjie Xu adca297943 Merge "Skip stashing source blocks in verify mode" into nyc-dev 2016-03-24 00:33:46 +00:00
Jed Estep fc723a3a34 Correct caching behavior for should_inject_cache am: 88dd779 
am: 7a9da52

* commit '7a9da521e1ecdba7a51fc15c0fc921123d1d5c4e':
  Correct caching behavior for should_inject_cache
 2016-03-23 23:10:25 +00:00
Jed Estep 7a9da521e1 Correct caching behavior for should_inject_cache 
am: 88dd779

* commit '88dd7796a1fd4c64d57afb20021bf66cb26fa886':
  Correct caching behavior for should_inject_cache
 2016-03-23 23:08:13 +00:00
Tianjie Xu 0188935d55 Skip stashing source blocks in verify mode 
Currently block_image_verify() stashes source blocks to /cache and
in some case triggers I/O errors. To avoid this risk, We create
a map from the hash value to the source blocks' range_set. When
executing stash command in verify mode, source range is saved but block
contents aren't stashed. And load_stash could get its value from
either the stashed file from the previous update, or the contents on
the source partition specified by the saved range.

Bug: 27584487
Bug: 25633753
Change-Id: I775baf4bee55762b6e7b204f8294afc597afd996
 2016-03-23 15:19:18 -07:00
Elliott Hughes 355d12487b Merge "Remove dead tools." am: 4cb6812 
am: e969958

* commit 'e9699584b573a8dd7e0edde0fda2a23b277e96af':
  Remove dead tools.
 2016-03-23 20:52:37 +00:00
Elliott Hughes e9699584b5 Merge "Remove dead tools." 
am: 4cb6812

* commit '4cb68121b86ca88c9ac7c08c64bb6c13f26da7bc':
  Remove dead tools.
 2016-03-23 20:48:28 +00:00
Elliott Hughes 4cb68121b8 Merge "Remove dead tools." 2016-03-23 19:52:56 +00:00
Elliott Hughes 57eb4fd6e2 Remove dead tools. 
None of these have been touched since cupcake, except to keep them building.

Change-Id: I5ed13849e6842e755c62da05f1a8a6da2583b1ee
 2016-03-22 21:08:39 -07:00
Jed Estep 88dd7796a1 Correct caching behavior for should_inject_cache 
Bug: 27800498
Change-Id: I5255283c1d04a385ed719c5bc2be461cae9f3648
 2016-03-22 17:57:23 -07:00
Jed Estep 9d8a68099f Control fault injection with config files instead of build flags am: ff6df89 
am: 6f78768

* commit '6f7876816b2322169432658235ebf7882ced0564':
  Control fault injection with config files instead of build flags
 2016-03-21 21:40:15 +00:00
Jed Estep 6f7876816b Control fault injection with config files instead of build flags 
am: ff6df89

* commit 'ff6df890a2a01bf3bf56d3f430b17a5ef69055cf':
  Control fault injection with config files instead of build flags
 2016-03-21 21:37:33 +00:00
caozhiyuan a61aed2f31 Merge "Fix: full ota package larger than 2GB fails to upgrade" am: 867e60d 
am: 9570508

* commit '9570508c0be67f75553571bed7f4b343a1cc591c':
  Fix: full ota package larger than 2GB fails to upgrade
 2016-03-21 19:18:11 +00:00
caozhiyuan 9570508c0b Merge "Fix: full ota package larger than 2GB fails to upgrade" 
am: 867e60d

* commit '867e60db16d2ec687a12e525cf26f203da8396b2':
  Fix: full ota package larger than 2GB fails to upgrade
 2016-03-21 19:15:49 +00:00
Tao Bao 867e60db16 Merge "Fix: full ota package larger than 2GB fails to upgrade" 2016-03-21 18:59:31 +00:00
caozhiyuan 2584f9c24d Fix: full ota package larger than 2GB fails to upgrade 
Change-Id: I45d9fab8739cc6fa8a0bacaca9238896118d9d7f
Signed-off-by: diruomeng <di.ruomeng@zte.com.cn>
Signed-off-by: caozhiyuan <cao.zhiyuan@zte.com.cn>
 2016-03-21 10:21:03 -07:00
Jed Estep ff6df890a2 Control fault injection with config files instead of build flags 
Bug: 27724259
Change-Id: I65bdefed10b3fb85fcb9e1147eaf0687d7d438f4
 2016-03-18 17:58:25 -07:00
Prashant Malani f5645d8306 recovery: Move SwipeDetector into common location am: 9020e0f 
am: 1500f11

* commit '1500f11e81584c105eb1f36439719629e2c39073':
  recovery: Move SwipeDetector into common location
 2016-03-18 17:03:58 +00:00
Prashant Malani 1500f11e81 recovery: Move SwipeDetector into common location 
am: 9020e0f

* commit '9020e0f141d1c26dcf8b6fa4212ee94b7891d53f':
  recovery: Move SwipeDetector into common location
 2016-03-18 17:01:44 +00:00
Prashant Malani 9020e0f141 recovery: Move SwipeDetector into common location 
The SwipeDetector class is used almost unchanged in all locations.

This patch moves it into the recovery module, from which devices can
reference it if required.

The class is now renamed to WearSwipeDetector.

Bug: 27407422
Change-Id: Ifd3c7069a287548b89b14ab5d6d2b90a298e0145
 2016-03-18 06:03:21 +00:00
Tao Bao 156de0473e resolve merge conflicts of ce58688 to nyc-dev-plus-aosp 
am: 6f44637

* commit '6f446373fdda9e084e7cce86c4694f365e75951b':
  Revert "DO NOT MERGE Control fault injection with config files instead of build flags"
 2016-03-17 22:57:55 +00:00
Tao Bao 6f446373fd resolve merge conflicts of ce58688 to nyc-dev-plus-aosp 
Change-Id: Ia9bfb989b6d13ee4f6a22216beb94065a9487484
 2016-03-17 15:46:10 -07:00
Tao Bao ce5868862a Revert "DO NOT MERGE Control fault injection with config files instead of build flags" 
This reverts commit f73abf36bc.

Bug: 27724259
Change-Id: I1301fdad15650837d0b1febd0c3239134e2b94fb
 2016-03-17 22:29:23 +00:00
Jed Estep 36278798a1 resolve merge conflicts of f73abf3 to nyc-dev-plus-aosp 
am: d6e5862

* commit 'd6e586204f10c9675009bfcf533860e39a3a4cbf':
  DO NOT MERGE Control fault injection with config files instead of build flags
 2016-03-17 15:45:21 +00:00
Elliott Hughes d6e586204f resolve merge conflicts of f73abf3 to nyc-dev-plus-aosp 
Change-Id: I9ce2fee126c70abf5129330430585fd27efd0bcc
 2016-03-17 08:40:46 -07:00
Jed Estep f73abf36bc DO NOT MERGE Control fault injection with config files instead of build flags 
Bug: 26570379
Change-Id: I76109d09276d6e3ed3a32b6fedafb2582f545c0c
 2016-03-16 12:36:57 -07:00
Alex Deymo 3934e1228a Merge "Add include/ to the Makefile include path." am: 38234f4bef 
am: 1b688e8039

* commit '1b688e8039a26b7deb9217487f99136d2afcc688':
  Add include/ to the Makefile include path.
 2016-03-14 21:56:57 +00:00
Alex Deymo 1b688e8039 Merge "Add include/ to the Makefile include path." 
am: 38234f4bef

* commit '38234f4bef8b70d985c09224e6d7752d71400f23':
  Add include/ to the Makefile include path.
 2016-03-14 21:52:51 +00:00
Alex Deymo 38234f4bef Merge "Add include/ to the Makefile include path." 2016-03-14 21:48:52 +00:00
Greg Kaiser ee772d426e resolve merge conflicts of 0222db01fd to nyc-dev-plus-aosp 
am: d2425ed063

* commit 'd2425ed063863b502600a4d80d01f362021bd61a':
  otafault: Fix setting of have_eio_error.
 2016-03-14 21:41:59 +00:00
Alex Deymo 82f8c82046 Add include/ to the Makefile include path. 
The applypatch heaaders were recently moved to the include/ directory.
This patch reflects that change in the Makefile.

Bug: None
TEST=sudo emerge imgdiff

Change-Id: I0bf3f991b5e0c98054033c5939ed69b3e3c827a9
 2016-03-14 14:25:33 -07:00
Greg Kaiser d2425ed063 resolve merge conflicts of 0222db01fd to nyc-dev-plus-aosp 
Change-Id: I415774ace081b866226a74eebfd1013f7e5c49f3
 2016-03-14 14:13:54 -07:00
Greg Kaiser 0222db01fd Merge "otafault: Fix setting of have_eio_error." into nyc-dev 2016-03-14 20:44:36 +00:00
Greg Kaiser f4300bc126 otafault: Fix setting of have_eio_error. 
There was one case (ota_fsync, under TARGET_SYNC_FAULT, when the
filename was cached) where we were not setting have_eio_error
prior to returning.  We fix that.

Change-Id: I2b0aa61fb1e821f0e77881aba04db95cd8396812
 2016-03-14 12:15:24 -07:00
Jed Estep 409b7b1b0c Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev am: 761653a4ad 
am: 3f581f7828

* commit '3f581f782883f011e3b63c5f9086e09f3762db35':
  Port applypatch.sh tests to recovery_component_tests
 2016-03-12 02:50:53 +00:00
Jed Estep 3f581f7828 Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev 
am: 761653a4ad

* commit '761653a4ad1c392fcd505e8909661fd64f02ce97':
  Port applypatch.sh tests to recovery_component_tests
 2016-03-12 02:48:57 +00:00
Jed Estep 761653a4ad Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev 2016-03-12 02:44:26 +00:00
Jed Estep b8a693bbc7 Port applypatch.sh tests to recovery_component_tests 
Bug: 27135282
Change-Id: If53682b591397ddfdb84860a3779b612904d4489
 2016-03-11 18:37:34 -08:00
Prashant Malani 8f4f11179a Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev am: 20df4adead 
am: 8dcd014951

* commit '8dcd0149514830f8b73101d83c9eb3368acab340':
  recovery: Remove SetColor, and other refactoring for WearUI
 2016-03-12 01:42:30 +00:00
Prashant Malani 8dcd014951 Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev 
am: 20df4adead

* commit '20df4adead04f5a137cce868c6b8024794d47fc0':
  recovery: Remove SetColor, and other refactoring for WearUI
 2016-03-12 00:39:48 +00:00
Prashant Malani 20df4adead Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev 2016-03-12 00:36:33 +00:00
Yabin Cui 42cfba5427 applypatch: use vector to store data in FileContents. am: 1c522df25f -s ours 
am: a0b8dc7aa6

* commit 'a0b8dc7aa6748ed05b05046f68afbc1b4d442904':
  applypatch: use vector to store data in FileContents.
 2016-03-11 23:41:08 +00:00
Yabin Cui a0b8dc7aa6 applypatch: use vector to store data in FileContents. 
am: 1c522df25f  -s ours

* commit '1c522df25f9524eaa0273538b3de0b9ad1b8fcea':
  applypatch: use vector to store data in FileContents.
 2016-03-11 23:38:56 +00:00
Prashant Malani 7a491225bb recovery: Remove SetColor, and other refactoring for WearUI 
The only difference from SetColor in ScreenRecoveryUI is the that the
LOG messages have slightly different colors. That's not enough to
warrant a duplicate function. So this patch removes SetColor and uses
the parent class version.

This patch also moves the DrawTextLine* functions into ScreenRecoveryUI
since they're mostly the same. It also moves char_width and char_height
into the class instead of keeping them as static variables.

Bug: 27407422
Change-Id: I30428c9433baab8410cf710a01c9b1c44c217bf1
 2016-03-11 15:22:20 -08:00
Yabin Cui 1c522df25f applypatch: use vector to store data in FileContents. 
Cherry pick this patch because it fixes the problem that
a newed Value is released by free().

Bug: 26906416
Change-Id: Ib53b445cd415a1ed5e95733fbc4073f9ef4dbc43
(cherry picked from commit d6c93afcc2)
 2016-03-11 11:11:11 -08:00