tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2270 commits 1 branch 0 tags 82 MiB
Commit graph

2270 commits

This branch
This branch
All branches
Author SHA1 Message Date
Elliott Hughes
6e2a8b11ec resolve merge conflicts of 2bf95ac to nyc-dev-plus-aosp 
Change-Id: Iaf232fbe65879bad6e19c7a9600aa6303a491a67
 2016-04-12 17:15:40 -07:00
Mattias Nissler
2bf95acf7a Merge "Convert recovery to use BoringSSL instead of mincrypt." 
am: 62e6637

* commit '62e6637f8bfad588ff0b3c72beacab5c079db203':
  Convert recovery to use BoringSSL instead of mincrypt.

Change-Id: Id4e95bb85866b65998c44312afc444dd29a3103d
 2016-04-12 23:30:02 +00:00
Elliott Hughes
62e6637f8b Merge "Convert recovery to use BoringSSL instead of mincrypt." 2016-04-12 23:12:35 +00:00
Yabin Cui
49ef1342c1 resolve merge conflicts of a58a6db to nyc-dev-plus-aosp 
Change-Id: I6d95fbd33f570d60e2caf42931ef6aa9f2634239
 2016-04-08 18:33:01 -07:00
Yabin Cui
a58a6dbe3d uncrypt: split libbootloader_message_writer for reuse. 
init and vold also need to write bootloader message, so
split this function from uncrypt into a separate library.

Bug: 27176738
Change-Id: If9b0887b4f6ffab6162d9cb47a6ceb7eedd60b4d
 2016-04-08 11:46:56 -07:00
Mattias Nissler
452df6d99c Convert recovery to use BoringSSL instead of mincrypt. 
This changes the verification code in bootable/recovery to use
BoringSSL instead of mincrypt.

Change-Id: I37b37d84b22e81c32ac180cd1240c02150ddf3a7
 2016-04-06 15:54:17 +02:00
Bill Yi
fc60583a2c Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: b162551  -s ours

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

Change-Id: If605bd508a2f61db0d96b4f6261aa59c92486e0b
 2016-04-05 18:51:08 +00:00
Bill Yi
b162551a30 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 18:44:50 +00:00
Bill Yi
c1afe830cf Import translations. DO NOT MERGE 
Change-Id: Ic643d0e2d39e45d772ffb25001de45afdf923579
Auto-generated-cl: translation import
 2016-04-05 11:13:59 -07:00
Mark Salyzyn
f726865333 recovery-persist: pick up both pstore console files 
am: a569727

* commit 'a5697276097913f3b2771f9b2cb077bdbcbecf38':
  recovery-persist: pick up both pstore console files

Change-Id: I9f2165a63ee73b26d49a85eba62707c50f44359a
 2016-04-05 14:55:50 +00:00
Mark Salyzyn
a569727609 recovery-persist: pick up both pstore console files 
(cherry pick from commit 5f7111ff4d)

- Volantis console-ramoops-0 (upstream correct)
- Angler console-ramoops
- Bullhead console-ramoops
- Shamu console-ramoops

NB: Shamu also has kernel crashes in other pstore files,
    not merging them in.

Bug: 27176738
Change-Id: Ib6eef3e25475935b89252f51c960719c7860511a
 2016-04-05 07:46:34 -07:00
Mark Salyzyn
59a55b57bc Merge "recovery-persist: pick up both pstore console files" am: 901f315 
am: 4195388

* commit '419538869d3e92270f748316f4956eeb431663c3':
  recovery-persist: pick up both pstore console files

Change-Id: I85571bfef8ab8f1a4f44c2a9138d3eaca78e57aa
 2016-04-05 14:38:39 +00:00
Mark Salyzyn
419538869d Merge "recovery-persist: pick up both pstore console files" 
am: 901f315

* commit '901f31531ba7b7e40e8a9c915467892997d176da':
  recovery-persist: pick up both pstore console files

Change-Id: I7febc439147995adc06b75d1b0de3d30f55719a9
 2016-04-05 14:35:53 +00:00
Mark Salyzyn
901f31531b Merge "recovery-persist: pick up both pstore console files" 2016-04-05 14:29:05 +00:00
Bill Yi
ea22f8f61e Import translations. DO NOT MERGE 
am: f75b6e4  -s ours

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

Change-Id: I948c6f31dd9c54a1f1abc5e0fdccb6571f095eb6
 2016-04-05 03:26:34 +00:00
Bill Yi
f75b6e47de Import translations. DO NOT MERGE 
Change-Id: Ia0012b89f00c65ec6056d29612748e60564bab32
Auto-generated-cl: translation import
 2016-04-04 17:59:17 -07:00
Mark Salyzyn
5f7111ff4d recovery-persist: pick up both pstore console files 
- Volantis console-ramoops-0 (upstream correct)
- Angler console-ramoops
- Bullhead console-ramoops
- Shamu console-ramoops

NB: Shamu also has kernel crashes in other pstore files,
    not merging them in.

Bug: 27176738
Change-Id: Ib6eef3e25475935b89252f51c960719c7860511a
 2016-04-04 16:24:48 -07:00
Elliott Hughes
5c23b801e5 Merge "Move selinux dependencies out of header files." am: 8124750 
am: dc91161

* commit 'dc91161a56c74bb6c73560d728d92b115f0f6e75':
  Move selinux dependencies out of header files.

Change-Id: I439d352c9366dbed201a5592059b886968324633
 2016-04-02 16:06:57 +00:00
Elliott Hughes
dc91161a56 Merge "Move selinux dependencies out of header files." 
am: 8124750

* commit '81247500d535dac714fad657860b67474e1f6e42':
  Move selinux dependencies out of header files.

Change-Id: If8fde7a64334327a2b0880a742d784642481ceeb
 2016-04-02 16:01:25 +00:00
Elliott Hughes
81247500d5 Merge "Move selinux dependencies out of header files." 2016-04-02 15:53:11 +00:00
Elliott Hughes
4bbd5bf8a6 Move selinux dependencies out of header files. 
Bug: http://b/27764900
Change-Id: Ib62a59edcb13054f40f514c404d32b87b14ed5f1
 2016-04-01 18:24:39 -07:00
Mark Salyzyn
658a467a12 recovery: use __android_log_pmsg_file_write for log files 
am: 13aca59

* commit '13aca598f8e93548fef36d87136e85ce8c9d18de':
  recovery: use __android_log_pmsg_file_write for log files

Change-Id: I068397cfa182fb14285a266f038f8c5230466a3b
 2016-03-31 21:53:01 +00:00
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
13aca598f8 recovery: use __android_log_pmsg_file_write for log files 
(cherry-pick from commit a4f701af93)

- 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-31 13:52:54 -07: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