PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,247 Commits 1 Branch 0 Tags
9b9e5843d296c4bb0d2cdca5eb18a2d2277dff96
Commit Graph

2247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Salyzyn
9b9e5843d2 Merge "recovery: use __android_log_pmsg_file_write for log files" am: 75da771 
am: 6f83130

* commit '6f83130d7acd85df89a80e691d3aa63bd2ceda39':
  recovery: use __android_log_pmsg_file_write for log files

Change-Id: Id2e7a76bae8eb061f6f57249dd912f25cd6332c6
 2016-03-31 21:00:59 +00:00
Mark Salyzyn
6f83130d7a Merge "recovery: use __android_log_pmsg_file_write for log files" 
am: 75da771

* commit '75da77105f329f5d6c1b4dc46ce02377ec4afd6a':
  recovery: use __android_log_pmsg_file_write for log files

Change-Id: I3da18530294ec71cd24b5ad8c720ab16c3e47dab
 2016-03-31 20:57:51 +00:00
Mark Salyzyn
75da77105f Merge "recovery: use __android_log_pmsg_file_write for log files" 2016-03-31 20:49:56 +00:00
Bill Yi
6a54ca4f91 Import translations. DO NOT MERGE 
am: f1b2785  -s ours

* commit 'f1b2785129b64a140764483901530f40716e53f5':
  Import translations. DO NOT MERGE

Change-Id: I36787400a12a3a9258a9d9c569da69b79cb2738f
 2016-03-31 15:45:44 +00:00
Bill Yi
f1b2785129 Import translations. DO NOT MERGE 
Change-Id: Id992a2cff5d431b5862f7c27f3823dbffe52f5c7
Auto-generated-cl: translation import
 2016-03-30 22:15:27 -07:00
Yabin Cui
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 Cui
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 Cui
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 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
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
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
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 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
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
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
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
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
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
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
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
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
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
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
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