PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,294 Commits 1 Branch 0 Tags
08875b220db75b452a2ff57938d70827b8fa93f7
Commit Graph

2294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yabin Cui 08875b220d Merge "uncrypt: fix call to close()." into nyc-dev am: 912e87e -s ours 
am: 31d0872

* commit '31d08721194392bb8dd19fa2aee5d9720e960843':
  uncrypt: fix call to close().

Change-Id: Ida59e364ac117786d996eb841d5acb89ebb7dfa7
 2016-03-30 00:21:43 +00:00
Yabin Cui 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 Xu d0678147cd Merge "Add string for Installing_security_update" am: 3568004 am: 2e21897 
am: 0d66126

* commit '0d661262e99ae6ba6baeae6cdce05791923fe445':
  Add string for Installing_security_update

Change-Id: I5a1817ff5ef8494c53441892612070274432c92a
 2016-03-30 00:11:58 +00:00
Tianjie Xu 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 Xu 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 Xu 3568004cba Merge "Add string for Installing_security_update" 2016-03-29 23:58:31 +00:00
Yabin Cui 2286b23373 resolve merge conflicts of 61799ba to nyc-dev-plus-aosp 
am: 0c39203

* commit '0c39203698b904e165237f67d6bd013debd6dc47':
  uncrypt: remove --read-bcb option.

Change-Id: Ic84b20a7736d6c0cd5f4e3ff07a02cbd64e285aa
 2016-03-29 23:53:26 +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 Cui 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 Xu 78bac9a66a Add string for Installing_security_update am: 1ee0ff3 
am: 0f54a46

* commit '0f54a46af3d2fa5f01fd1e37ed050b3cf697008c':
  Add string for Installing_security_update

Change-Id: Ib9cc5307a030a94f7d9d6e9c52646cf1665bbe3d
 2016-03-29 21:09:03 +00:00
Tianjie Xu 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 ee3314d335 Fix uncrypt.cpp unique_fd build breakage. 
am: d6ac686

* commit 'd6ac68665dcef6c12d44ee6bcd7d938ab5028150':
  Fix uncrypt.cpp unique_fd build breakage.

Change-Id: Ibb0c2a7e7cc3668b2fe41e756a637043cfecc03f
 2016-03-29 20:09:36 +00:00
Elliott Hughes d6ac68665d Fix uncrypt.cpp unique_fd build breakage. 
Change-Id: I4654f59463d1f3e1f4450e937cd910508b64c157
 2016-03-29 12:53:36 -07:00
Elliott Hughes 54937d0b59 resolve merge conflicts of 5cf4701 to nyc-dev-plus-aosp 
am: 20ab2db

* commit '20ab2db8f1e04f4f9b4c1dc0e9377f0586bfc10a':
  Switch to <android-base/unique_fd.h>.

Change-Id: I3ad1eae327ad83c82aa684e4a2846d4313fd4486
 2016-03-29 18:29:55 +00: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 Hughes 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 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
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
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