PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,241 Commits 1 Branch 0 Tags
f41c35d774de88bc668c94ee5cfa43b60eb6eea1
Commit Graph
2241 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Yabin Cuiandandroid-build-merger f41c35d774 Merge "uncrypt: remove --read-bcb option." am: ebd22be 
am: ecc068c  -s ours

* commit 'ecc068c2f83b4db891f9d479170c06cf06bb409a':
  uncrypt: remove --read-bcb option.

Change-Id: I53dc530930eb95d00ea2efd51a07e34502ab63c6
 2016-03-30 01:59:07 +00:00
Yabin Cuiandandroid-build-merger ecc068c2f8 Merge "uncrypt: remove --read-bcb option." 
am: ebd22be

* commit 'ebd22be4f742f5eeb32b2eeaf212b34e7605da50':
  uncrypt: remove --read-bcb option.

Change-Id: I06ed6c0a36246041d03c57bc03f532de414c926f
 2016-03-30 01:29:42 +00:00
Yabin CuiandGerrit Code Review ebd22be4f7 Merge "uncrypt: remove --read-bcb option." 2016-03-30 01:19:25 +00:00
Yabin Cui 6507265906 uncrypt: remove --read-bcb option. 
Bug: 27897241
Change-Id: I4f52ada58e8f204dba8c974ea0ae03876411ecf0
(cherry picked from commit 61799baba3)
 2016-03-29 18:14:44 -07:00
Yabin Cuiandandroid-build-merger 31d0872119 Merge "uncrypt: fix call to close()." into nyc-dev 
am: 912e87e  -s ours

* commit '912e87e91d15c35c18ce6710bf6a0b34f50b3672':
  uncrypt: fix call to close().

Change-Id: Ib9d13b4b39d64a9b7ff95429152eb9f3383ee4b3
 2016-03-30 00:18:38 +00:00
Tianjie Xuandandroid-build-merger 0d661262e9 Merge "Add string for Installing_security_update" am: 3568004 
am: 2e21897

* commit '2e2189728b3172327e93825ed803768c72fe7f28':
  Add string for Installing_security_update

Change-Id: I5b00f7c996c2a0653f1769790498c0a6578f6ac5
 2016-03-30 00:08:55 +00:00
Tianjie Xuandandroid-build-merger 2e2189728b Merge "Add string for Installing_security_update" 
am: 3568004

* commit '3568004cba740a466bd9731a4bb5c8a1475e6d2d':
  Add string for Installing_security_update

Change-Id: I11a147726cd535e574690e01df35ec961888c5c6
 2016-03-30 00:05:54 +00:00
Tianjie XuandGerrit Code Review 3568004cba Merge "Add string for Installing_security_update" 2016-03-29 23:58:31 +00:00
Yabin Cui 0c39203698 resolve merge conflicts of 61799ba to nyc-dev-plus-aosp 
Change-Id: Ib1d0afe9022ec82f05be8b56201e73505160cacc
 2016-03-29 16:47:18 -07:00
Yabin CuiandAndroid (Google) Code Review 912e87e91d Merge "uncrypt: fix call to close()." into nyc-dev 2016-03-29 22:48:08 +00:00
Yabin Cui ffa3a1c222 uncrypt: fix call to close(). 
Bug: 27897229
Change-Id: Iab5e829af1676f7fcd8a4b00a194aa679ed4e372
 2016-03-29 15:35:58 -07:00
Yabin Cui 61799baba3 uncrypt: remove --read-bcb option. 
Bug: 27897241
Change-Id: I4f52ada58e8f204dba8c974ea0ae03876411ecf0
 2016-03-29 14:33:35 -07:00
Tianjie Xuandandroid-build-merger 0f54a46af3 Add string for Installing_security_update 
am: 1ee0ff3

* commit '1ee0ff3d78c5143d4e3307bc44e3c27792e72d1e':
  Add string for Installing_security_update

Change-Id: Ied2a3b07fbf8548688759727da527fc7a994d5a0
 2016-03-29 21:06:05 +00:00
Tianjie Xu 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
Elliott Hughes d6ac68665d Fix uncrypt.cpp unique_fd build breakage. 
Change-Id: I4654f59463d1f3e1f4450e937cd910508b64c157
 2016-03-29 12:53:36 -07:00
Elliott Hughes 20ab2db8f1 resolve merge conflicts of 5cf4701 to nyc-dev-plus-aosp 
Change-Id: Ia69f8b070c05cfe201115de510e3c12e813e38b5
 2016-03-29 11:15:47 -07:00
Elliott Hughesandandroid-build-merger 5cf4701d66 Merge "Switch to <android-base/unique_fd.h>." 
am: 5d73735

* commit '5d73735552b3eca103830bd1433ce4b74b54b2b3':
  Switch to <android-base/unique_fd.h>.

Change-Id: I2f03ba036160376f03516eb7ede62229bb8e20ba
 2016-03-29 18:00:38 +00:00
Elliott HughesandGerrit Code Review 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
Elliott Hughesandandroid-build-merger 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 Hughesandandroid-build-merger 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 HughesandGerrit Code Review 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 Xuandandroid-build-merger 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 XuandGerrit Code Review 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 Xuandandroid-build-merger 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 XuandGerrit Code Review 7e18ce221f Merge "Clean up intent_file related code in recovery.cpp" 2016-03-25 21:03:00 +00:00
Jed Estepandandroid-build-merger 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 BaoandGerrit Code Review 9afbf2af4c Merge "Correct caching behavior for should_inject_cache" 2016-03-25 19:03:28 +00:00
Jed EstepandTao Bao 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
Tianjie Xuandandroid-build-merger 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 XuandAndroid (Google) Code Review adca297943 Merge "Skip stashing source blocks in verify mode" into nyc-dev 2016-03-24 00:33:46 +00:00
Jed Estepandandroid-build-merger 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 Hughesandandroid-build-merger e9699584b5 Merge "Remove dead tools." 
am: 4cb6812

* commit '4cb68121b86ca88c9ac7c08c64bb6c13f26da7bc':
  Remove dead tools.
 2016-03-23 20:48:28 +00:00
Elliott HughesandGerrit Code Review 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 Estepandandroid-build-merger 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
caozhiyuanandandroid-build-merger 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 BaoandGerrit Code Review 867e60db16 Merge "Fix: full ota package larger than 2GB fails to upgrade" 2016-03-21 18:59:31 +00:00
caozhiyuanandTao Bao 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 Malaniandandroid-build-merger 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 6f446373fd resolve merge conflicts of ce58688 to nyc-dev-plus-aosp 
Change-Id: Ia9bfb989b6d13ee4f6a22216beb94065a9487484
 2016-03-17 15:46:10 -07:00