Commit Graph

9577 Commits

Author SHA1 Message Date
Elliott Hughes 5d73735552 Merge "Switch to <android-base/unique_fd.h>." 2016-03-29 17:55:47 +00:00
Elliott Hughes bcabd09293 Switch to <android-base/unique_fd.h>.
Change-Id: I13ba3f40bd52b5f3e3fe9002a45a9a8630040129
2016-03-29 08:18:34 -07:00
Tianjie Xu 1ee0ff3d78 Add string for Installing_security_update
Bug: 27837319
Change-Id: I037158697a294c3e03f186f3b4207ea700321a8a
2016-03-28 18:16:15 -07:00
Mark Salyzyn a4f701af93 recovery: use __android_log_pmsg_file_write for log files
- Add call to __android_log_pmsg_file_write for recovery logging.
- Add call to refresh pmsg if we reboot back into recovery and then
  allow overwrite of those logs.
- Add a new one-time executable recovery-refresh that refreshes pmsg
  in post-fs phase of init. We rely on pmsg eventually scrolling off
  to age the content after recovery-persist has done its job.
- Add a new one-time executable recovery-persist that transfers from
  pmsg to /data/misc/recovery/ directory if /cache is not mounted
  in post-fs-data phase of init.
- Build and appropriately trigger the above two as required if
  BOARD_CACHEIMAGE_PARTITION_SIZE is undefined.
- Add some simple unit tests

NB: Test failure is expected on systems that do not deliver either
the recovery-persist or recovery-refresh executables, e.g. systems
with /cache. Tests also require a timely reboot sequence of test
to truly verify, tests provide guidance on stderr to direct.

Bug: 27176738
Change-Id: I17bb95980234984f6b2087fd5941b0a3126b706b
2016-03-28 11:07:00 -07:00
The Android Automerger ebaa0bc45a merge in nyc-release history after reset to nyc-dev 2016-03-27 00:02:59 -07:00
Elliott Hughes 0609e14728 Move recovery_l10n here from development/tools. am: cc79490
am: e833769

* commit 'e833769e7be7ffa3db8a35c84fc9c6b6aea9f663':
  Move recovery_l10n here from development/tools.
2016-03-26 17:11:57 +00:00
Elliott Hughes e833769e7b Move recovery_l10n here from development/tools.
am: cc79490

* commit 'cc79490fa83fe2dea6cbcd219751d346645ca7ec':
  Move recovery_l10n here from development/tools.
2016-03-26 16:53:35 +00:00
Elliott Hughes 092052a6fd Merge "Move recovery_l10n here from development/tools." am: 2dbd06c
am: c15adeb

* commit 'c15adeb34c6e93aa9dbb22d2336e7873249ba8bb':
  Move recovery_l10n here from development/tools.
2016-03-26 15:54:37 +00:00
Elliott Hughes c15adeb34c Merge "Move recovery_l10n here from development/tools."
am: 2dbd06c

* commit '2dbd06c7ed9e753439fb2c0e17d11ca6323e5157':
  Move recovery_l10n here from development/tools.
2016-03-26 15:52:06 +00:00
Elliott Hughes cc79490fa8 Move recovery_l10n here from development/tools.
Bug: http://b/27837319

(cherry picked from commit 3d0153a807)

Change-Id: Iec2cd10fa77ed1881d55ac4e0ab48e45172f0cf7
2016-03-26 08:45:51 -07:00
Elliott Hughes 2dbd06c7ed Merge "Move recovery_l10n here from development/tools." 2016-03-26 15:45:24 +00:00
Elliott Hughes 3d0153a807 Move recovery_l10n here from development/tools.
Bug: http://b/27837319
Change-Id: I116fc13ae108a59b657f5c9f7efe971de72ac743
2016-03-26 08:42:49 -07:00
Tianjie Xu ed5244dd98 Merge "Skip stashing source blocks in verify mode" am: 3123e5a
am: 05e76f7

* commit '05e76f7183b72fb2762472e083647a07ede9a2fa':
  Skip stashing source blocks in verify mode
2016-03-25 22:18:40 +00:00
Tianjie Xu 05e76f7183 Merge "Skip stashing source blocks in verify mode"
am: 3123e5a

* commit '3123e5ad94350ddc3449dea3214f312c38709832':
  Skip stashing source blocks in verify mode
2016-03-25 22:15:43 +00:00
Tianjie Xu 3123e5ad94 Merge "Skip stashing source blocks in verify mode" 2016-03-25 22:09:34 +00:00
Tianjie Xu 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
Tianjie Xu c29b22b066 Merge "Clean up intent_file related code in recovery.cpp" am: 7e18ce2
am: 180de7a

* commit '180de7a58c50224e95078acd69843aebd35bf858':
  Clean up intent_file related code in recovery.cpp
2016-03-25 21:23:50 +00:00
Tianjie Xu 180de7a58c Merge "Clean up intent_file related code in recovery.cpp"
am: 7e18ce2

* commit '7e18ce221fac387d5f08da2519879c1fc2046a4a':
  Clean up intent_file related code in recovery.cpp
2016-03-25 21:21:11 +00:00
Tianjie Xu 7e18ce221f Merge "Clean up intent_file related code in recovery.cpp" 2016-03-25 21:03:00 +00:00
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 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
The Android Automerger e07faa4ffd merge in nyc-release history after reset to nyc-dev 2016-03-24 09:59:01 -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
The Android Automerger a3ca8ee46f merge in nyc-release history after reset to nyc-dev 2016-03-22 00:00:41 -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
The Android Automerger a764d6063d merge in nyc-release history after reset to nyc-dev 2016-03-20 00:00:45 -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 b1e4100011 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 16:52:19 -07:00
sndnvaps a915ec4215 Fix RELINK of toybox for twrp
Change-Id: Ia609eec928278fc63e699d42799f74b4ada82221
Signed-off-by: sndnvaps <sndnvaps@gmail.com>
2016-03-18 00:31:51 +01:00