fc723a3a34
Correct caching behavior for should_inject_cache am: 88dd779
...
am: 7a9da52
2016-03-23 23:10:25 +00:00
7a9da521e1
Correct caching behavior for should_inject_cache
...
am: 88dd779
2016-03-23 23:08:13 +00:00
355d12487b
Merge "Remove dead tools." am: 4cb6812
...
am: e969958
2016-03-23 20:52:37 +00:00
e9699584b5
Merge "Remove dead tools."
...
am: 4cb6812
2016-03-23 20:48:28 +00:00
4cb68121b8
Merge "Remove dead tools."
2016-03-23 19:52:56 +00:00
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
88dd7796a1
Correct caching behavior for should_inject_cache
...
Bug: 27800498
Change-Id: I5255283c1d04a385ed719c5bc2be461cae9f3648
2016-03-22 17:57:23 -07:00
9d8a68099f
Control fault injection with config files instead of build flags am: ff6df89
...
am: 6f78768
2016-03-21 21:40:15 +00:00
6f7876816b
Control fault injection with config files instead of build flags
...
am: ff6df89
2016-03-21 21:37:33 +00:00
a61aed2f31
Merge "Fix: full ota package larger than 2GB fails to upgrade" am: 867e60d
...
am: 9570508
2016-03-21 19:18:11 +00:00
9570508c0b
Merge "Fix: full ota package larger than 2GB fails to upgrade"
...
am: 867e60d
2016-03-21 19:15:49 +00:00
867e60db16
Merge "Fix: full ota package larger than 2GB fails to upgrade"
2016-03-21 18:59:31 +00:00
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
ff6df890a2
Control fault injection with config files instead of build flags
...
Bug: 27724259
Change-Id: I65bdefed10b3fb85fcb9e1147eaf0687d7d438f4
2016-03-18 17:58:25 -07:00
f5645d8306
recovery: Move SwipeDetector into common location am: 9020e0f
...
am: 1500f11
2016-03-18 17:03:58 +00:00
1500f11e81
recovery: Move SwipeDetector into common location
...
am: 9020e0f
2016-03-18 17:01:44 +00:00
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
156de0473e
resolve merge conflicts of ce58688 to nyc-dev-plus-aosp
...
am: 6f44637
2016-03-17 22:57:55 +00:00
6f446373fd
resolve merge conflicts of ce58688 to nyc-dev-plus-aosp
...
Change-Id: Ia9bfb989b6d13ee4f6a22216beb94065a9487484
2016-03-17 15:46:10 -07:00
ce5868862a
Revert "DO NOT MERGE Control fault injection with config files instead of build flags"
...
This reverts commit f73abf36bc
2016-03-17 22:29:23 +00:00
36278798a1
resolve merge conflicts of f73abf3 to nyc-dev-plus-aosp
...
am: d6e5862
2016-03-17 15:45:21 +00:00
d6e586204f
resolve merge conflicts of f73abf3 to nyc-dev-plus-aosp
...
Change-Id: I9ce2fee126c70abf5129330430585fd27efd0bcc
2016-03-17 08:40:46 -07:00
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
3934e1228a
Merge "Add include/ to the Makefile include path." am: 38234f4bef
...
am: 1b688e8039
2016-03-14 21:56:57 +00:00
1b688e8039
Merge "Add include/ to the Makefile include path."
...
am: 38234f4bef
2016-03-14 21:52:51 +00:00
38234f4bef
Merge "Add include/ to the Makefile include path."
2016-03-14 21:48:52 +00:00
ee772d426e
resolve merge conflicts of 0222db01fd to nyc-dev-plus-aosp
...
am: d2425ed063
2016-03-14 21:41:59 +00:00
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
d2425ed063
resolve merge conflicts of 0222db01fd to nyc-dev-plus-aosp
...
Change-Id: I415774ace081b866226a74eebfd1013f7e5c49f3
2016-03-14 14:13:54 -07:00
0222db01fd
Merge "otafault: Fix setting of have_eio_error." into nyc-dev
2016-03-14 20:44:36 +00:00
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
409b7b1b0c
Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev am: 761653a4ad
...
am: 3f581f7828
2016-03-12 02:50:53 +00:00
3f581f7828
Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev
...
am: 761653a4ad
2016-03-12 02:48:57 +00:00
761653a4ad
Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev
2016-03-12 02:44:26 +00:00
b8a693bbc7
Port applypatch.sh tests to recovery_component_tests
...
Bug: 27135282
Change-Id: If53682b591397ddfdb84860a3779b612904d4489
2016-03-11 18:37:34 -08:00
8f4f11179a
Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev am: 20df4adead
...
am: 8dcd014951
2016-03-12 01:42:30 +00:00
8dcd014951
Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev
...
am: 20df4adead
2016-03-12 00:39:48 +00:00
20df4adead
Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev
2016-03-12 00:36:33 +00:00
42cfba5427
applypatch: use vector to store data in FileContents. am: 1c522df25f -s ours
...
am: a0b8dc7aa6
2016-03-11 23:41:08 +00:00
a0b8dc7aa6
applypatch: use vector to store data in FileContents.
...
am: 1c522df25f
2016-03-11 23:38:56 +00:00
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
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
d755057c91
recovery: Remove duplicate variables and functions am: 0ba21cff07
...
am: 749054e1e3
2016-03-11 19:07:38 +00:00
749054e1e3
recovery: Remove duplicate variables and functions
...
am: 0ba21cff07
2016-03-11 18:31:00 +00:00
0ba21cff07
recovery: Remove duplicate variables and functions
...
The function that modifies rtl_locale exists only in the base class,
and so the variable should not have a duplicate in the derived class,
otherwise there may be incosistent values when it is read by the derived
class (the thinking being that invoking the function will modify the
base class version of the variable, and not the derived class version).
Remove the updateMutex variable, and instead re-use the one in the base
class.
Also remove LoadBitmap from WearUI since it is identical to the one in
ScreenRecoveryUI.
Bug: 27407422
Change-Id: Idd823fa93dfa16d7b2c9c7160f8d0c2559d28731
2016-03-10 15:36:31 -08:00
6086f4d18f
Merge "Reboot and retry on I/O errors" into nyc-dev am: d345de66ef -s ours
...
am: 3f004e03e5
2016-03-10 22:18:05 +00:00
3f004e03e5
Merge "Reboot and retry on I/O errors" into nyc-dev
...
am: d345de66ef
2016-03-10 22:13:05 +00:00
d345de66ef
Merge "Reboot and retry on I/O errors" into nyc-dev
2016-03-10 21:27:26 +00:00
fa12b9737d
Reboot and retry on I/O errors
...
When I/O error happens, reboot and retry installation two times
before we abort this OTA update.
Bug: 25633753
Change-Id: Iba6d4203a343a725aa625a41d237606980d62f69
(cherry picked from commit 3c62b67faf
2016-03-10 11:50:28 -08:00
0eb5c48514
Revert "recovery: More refactoring of WearUI" am: f7f9e50528
...
am: 46c7756b1a
2016-03-10 19:14:00 +00:00
Jed Estep
Elliott Hughes
caozhiyuan
Tao Bao
Prashant Malani
Alex Deymo
Greg Kaiser
Yabin Cui
Tianjie Xu