d0678147cd
Merge "Add string for Installing_security_update" am: 3568004 am: 2e21897
...
am: 0d66126
2016-03-30 00:11:58 +00:00
0d661262e9
Merge "Add string for Installing_security_update" am: 3568004
...
am: 2e21897
2016-03-30 00:08:55 +00:00
2e2189728b
Merge "Add string for Installing_security_update"
...
am: 3568004
2016-03-30 00:05:54 +00:00
3568004cba
Merge "Add string for Installing_security_update"
2016-03-29 23:58:31 +00:00
2286b23373
resolve merge conflicts of 61799ba to nyc-dev-plus-aosp
...
am: 0c39203
2016-03-29 23:53:26 +00:00
0c39203698
resolve merge conflicts of 61799ba to nyc-dev-plus-aosp
...
Change-Id: Ib1d0afe9022ec82f05be8b56201e73505160cacc
2016-03-29 16:47:18 -07:00
61799baba3
uncrypt: remove --read-bcb option.
...
Bug: 27897241
Change-Id: I4f52ada58e8f204dba8c974ea0ae03876411ecf0
2016-03-29 14:33:35 -07:00
78bac9a66a
Add string for Installing_security_update am: 1ee0ff3
...
am: 0f54a46
2016-03-29 21:09:03 +00:00
0f54a46af3
Add string for Installing_security_update
...
am: 1ee0ff3
2016-03-29 21:06:05 +00:00
1c95c97e55
Add string for Installing_security_update
...
Bug: 27837319
Change-Id: I037158697a294c3e03f186f3b4207ea700321a8a
(cherry picked from commit 1ee0ff3d78
2016-03-29 13:59:22 -07:00
ee3314d335
Fix uncrypt.cpp unique_fd build breakage.
...
am: d6ac686
2016-03-29 20:09:36 +00:00
d6ac68665d
Fix uncrypt.cpp unique_fd build breakage.
...
Change-Id: I4654f59463d1f3e1f4450e937cd910508b64c157
2016-03-29 12:53:36 -07:00
54937d0b59
resolve merge conflicts of 5cf4701 to nyc-dev-plus-aosp
...
am: 20ab2db
2016-03-29 18:29:55 +00:00
20ab2db8f1
resolve merge conflicts of 5cf4701 to nyc-dev-plus-aosp
...
Change-Id: Ia69f8b070c05cfe201115de510e3c12e813e38b5
2016-03-29 11:15:47 -07:00
5cf4701d66
Merge "Switch to <android-base/unique_fd.h>."
...
am: 5d73735
2016-03-29 18:00:38 +00:00
5d73735552
Merge "Switch to <android-base/unique_fd.h>."
2016-03-29 17:55:47 +00:00
bcabd09293
Switch to <android-base/unique_fd.h>.
...
Change-Id: I13ba3f40bd52b5f3e3fe9002a45a9a8630040129
2016-03-29 08:18:34 -07:00
1ee0ff3d78
Add string for Installing_security_update
...
Bug: 27837319
Change-Id: I037158697a294c3e03f186f3b4207ea700321a8a
2016-03-28 18:16:15 -07:00
0609e14728
Move recovery_l10n here from development/tools. am: cc79490
...
am: e833769
2016-03-26 17:11:57 +00:00
e833769e7b
Move recovery_l10n here from development/tools.
...
am: cc79490
2016-03-26 16:53:35 +00:00
092052a6fd
Merge "Move recovery_l10n here from development/tools." am: 2dbd06c
...
am: c15adeb
2016-03-26 15:54:37 +00:00
c15adeb34c
Merge "Move recovery_l10n here from development/tools."
...
am: 2dbd06c
2016-03-26 15:52:06 +00:00
cc79490fa8
Move recovery_l10n here from development/tools.
...
Bug: http://b/27837319
(cherry picked from commit 3d0153a807
2016-03-26 08:45:51 -07:00
2dbd06c7ed
Merge "Move recovery_l10n here from development/tools."
2016-03-26 15:45:24 +00:00
3d0153a807
Move recovery_l10n here from development/tools.
...
Bug: http://b/27837319
Change-Id: I116fc13ae108a59b657f5c9f7efe971de72ac743
2016-03-26 08:42:49 -07:00
ed5244dd98
Merge "Skip stashing source blocks in verify mode" am: 3123e5a
...
am: 05e76f7
2016-03-25 22:18:40 +00:00
05e76f7183
Merge "Skip stashing source blocks in verify mode"
...
am: 3123e5a
2016-03-25 22:15:43 +00:00
3123e5ad94
Merge "Skip stashing source blocks in verify mode"
2016-03-25 22:09:34 +00:00
7eca97e75d
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
(cherry picked from commit 0188935d55
2016-03-25 14:56:21 -07:00
c29b22b066
Merge "Clean up intent_file related code in recovery.cpp" am: 7e18ce2
...
am: 180de7a
2016-03-25 21:23:50 +00:00
180de7a58c
Merge "Clean up intent_file related code in recovery.cpp"
...
am: 7e18ce2
2016-03-25 21:21:11 +00:00
7e18ce221f
Merge "Clean up intent_file related code in recovery.cpp"
2016-03-25 21:03:00 +00:00
481ce238cc
Merge "Correct caching behavior for should_inject_cache" am: 9afbf2a
...
am: c52b853
2016-03-25 20:09:23 +00:00
c52b853194
Merge "Correct caching behavior for should_inject_cache"
...
am: 9afbf2a
2016-03-25 20:07:02 +00:00
9afbf2af4c
Merge "Correct caching behavior for should_inject_cache"
2016-03-25 19:03:28 +00:00
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
c14d95da58
Clean up intent_file related code in recovery.cpp
...
No one in recovery or framework is utilizing intent file. Clean
up the code.
Bug:27725880
Change-Id: I78b37ff94261793e0d6a86a0fa6d27dcfe3f4783
2016-03-24 12:49:46 -07:00
8085b38c18
Merge "Skip stashing source blocks in verify mode" into nyc-dev am: adca297
...
am: 7781778
2016-03-24 00:40:01 +00:00
77817789e0
Merge "Skip stashing source blocks in verify mode" into nyc-dev
...
am: adca297
2016-03-24 00:37:55 +00:00
adca297943
Merge "Skip stashing source blocks in verify mode" into nyc-dev
2016-03-24 00:33:46 +00:00
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
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
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
Tianjie Xu
Yabin Cui
Elliott Hughes
Jed Estep
Tao Bao