Commit Graph

7159 Commits

Author SHA1 Message Date
David Benjamin a86392ea92 Fix IWYU errors.
This fixes build errors with BoringSSL master. (The cpp file uses functions
from bn.h and neither it nor the header includes it.)

Change-Id: If7f38aa0b931aa7940079bc006c7283b31f3b774
2016-04-15 20:27:44 -04:00
Elliott Hughes db8002379d Merge "Update the system update animation." into nyc-dev am: e8d0ecc
am: 4846bc4

* commit '4846bc461ccf498f7dbf3752fedae58c1ca028b2':
  Update the system update animation.

Change-Id: I78d2fd63196caba6eb9d0cfeb1a17644ca3c7170
2016-04-15 20:03:44 +00:00
Elliott Hughes 4846bc461c Merge "Update the system update animation." into nyc-dev
am: e8d0ecc

* commit 'e8d0ecccf7e54e73418cac94b0b136bfed94d51a':
  Update the system update animation.

Change-Id: I5d0ad44b13a505bca62a5316447603fab4d280aa
2016-04-15 20:00:26 +00:00
Elliott Hughes e8d0ecccf7 Merge "Update the system update animation." into nyc-dev 2016-04-15 19:53:19 +00:00
Jeremy Compostella c747a51548 Merge "Define the Bootloader Control A/B structure" am: e6af522 am: b30c6f6
am: 81f13d0

* commit '81f13d0e7dc1b8aac7bd07b9e423ee964db0d819':
  Define the Bootloader Control A/B structure

Change-Id: I0382d5a690a40a81ead3814cebd9fbe3086ca3ff
2016-04-15 17:01:27 +00:00
Tao Bao 81f13d0e7d Merge "Define the Bootloader Control A/B structure" am: e6af522
am: b30c6f6

* commit 'b30c6f690a293f4b4107a739b8ab69b2e39e379a':
  Define the Bootloader Control A/B structure

Change-Id: I7f57d76054923aebee66573a6b2b0ca6f10b468b
2016-04-15 16:58:10 +00:00
Jeremy Compostella b30c6f690a Merge "Define the Bootloader Control A/B structure"
am: e6af522

* commit 'e6af5228aa47300e4fe96a0f5068bb344c4b268d':
  Define the Bootloader Control A/B structure

Change-Id: I8a66fe124a0c18818485a9e73e742108b3c9d80a
2016-04-15 16:55:02 +00:00
Tao Bao e6af5228aa Merge "Define the Bootloader Control A/B structure" 2016-04-15 16:51:14 +00:00
Elliott Hughes c30e7978e5 Explicitly set the font face and color. am: 70ae70b
am: 6fa5fa9

* commit '6fa5fa91bf1439e6c5070f3aee9b447f995882c1':
  Explicitly set the font face and color.

Change-Id: I1b2079d35cb7165db738a8d9ca442fa96729979e
2016-04-15 16:01:01 +00:00
Elliott Hughes 6fa5fa91bf Explicitly set the font face and color.
am: 70ae70b

* commit '70ae70b81e452ce8a85dfbb184786c02a9072c23':
  Explicitly set the font face and color.

Change-Id: I94011b0f4df228e6cdfe4c095542839abb689a74
2016-04-15 15:57:55 +00:00
Elliott Hughes 498cda6ef6 Update the system update animation.
Switch to a Wear-like intro/loop system. We don't have an intro yet,
but hopefully this will let Wear delete more code when they move to N.
Unlike them, we don't hard-code the number of frames: we just look to
see what we have available. We do hard-code the fps though.

Also add a graphics test mode so you can see a demo of the UI components
without having to actually apply an OTA.

Also fix a bug where default locale is null rather than en-US: it's
more useful to show _some_ text if we don't have a locale (which should
only be during development anyway).

Bug: http://b/26548285
Change-Id: I63422e3fef3c41109f924d96fb5ded0b3ae7815d
2016-04-14 22:44:23 -07:00
Elliott Hughes 70ae70b81e Explicitly set the font face and color.
This matches what the UI folks asked us to use.

Also fix the locale parsing code.

Bug: http://b/27837319
Bug: http://b/22465983
Bug: http://b/26548285
Change-Id: I316a6e1f44855313dd983950abf21b543be7ffc0
2016-04-14 17:18:41 -07:00
Elliott Hughes 0ceef69073 resolve merge conflicts of 8febafa to nyc-dev-plus-aosp
am: 6e08bff

* commit '6e08bff22b6b9019c72422e1902201d7cb4397b5':
  Use BoringSSL instead of mincrypt to speed up package verification.

Change-Id: I1fce90ecfa92369b767c2d3387dfe72dced4faad
2016-04-14 18:22:59 +00:00
Elliott Hughes 6e08bff22b resolve merge conflicts of 8febafa to nyc-dev-plus-aosp
Change-Id: I423937b4b20a2079714aa38ab7f8b199782df689
2016-04-14 09:39:47 -07:00
Elliott Hughes 8febafa67e Use BoringSSL instead of mincrypt to speed up package verification.
This changes the verification code in bootable/recovery to use
BoringSSL instead of mincrypt.

Cherry-pick of 452df6d99c, with
merge conflict resolution, extra logging in verifier.cpp, and
an increase in the hash chunk size from 4KiB to 1MiB.

Bug: http://b/28135231
Change-Id: I1ed7efd52223dd6f6a4629cad187cbc383d5aa84
2016-04-13 16:39:56 -07:00
Mattias Nissler ecd32c786c resolve merge conflicts of 2bf95ac to nyc-dev-plus-aosp
am: 6e2a8b1

* commit '6e2a8b11ecb0bdfd6f4a2f096519075663a2d1c2':
  Convert recovery to use BoringSSL instead of mincrypt.

Change-Id: Ief6b279d1e7fd00af4e8153ac29212343493b293
2016-04-13 01:49:17 +00:00
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 c2e63870e8 resolve merge conflicts of a58a6db to nyc-dev-plus-aosp
am: 49ef134

* commit '49ef1342c15cc501d340ebbbc52d5b0763ce3761':
  uncrypt: split libbootloader_message_writer for reuse.

Change-Id: Id74ae9fec0e0c6c49af041b46a62fa4a10c23d91
2016-04-09 05:42:43 +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 53ea95d0c2 Import translations. DO NOT MERGE
Change-Id: Id4a5f32acb01776c95b092cc6e883036812836a9
Auto-generated-cl: translation import
2016-04-06 04:02:16 -07:00
Jeremy Compostella b3bf958d4f Define the Bootloader Control A/B structure
Define the A/B structure for implementation using the misc partition
as storage.  The bootloader_control structure is designed to be put in
the bootloader_message slot_suffix field.

Change-Id: I158bdf3e69b3f327a1dde4c6eb1f907dbaf8939c
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
2016-04-06 09:56:10 +02:00
Bill Yi c91a08359c Merge "Import translations. DO NOT MERGE" into nyc-dev am: b162551 -s ours
am: fc60583  -s ours

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

Change-Id: Ie62a08f06cb9eaff0a441e3c784b1f1c605dec97
2016-04-05 18:54:13 +00: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
Bill Yi 1d2bf4f631 Merge "Import translations. DO NOT MERGE" 2016-04-05 16:33:18 +00:00
Bill Yi 1b4ee01cfa Import translations. DO NOT MERGE
Change-Id: Ib4ebc02261abc4610947ab54f5e53f9958190e27
Auto-generated-cl: translation import
2016-04-05 09:23:08 -07:00
Mark Salyzyn a29251c0ae recovery-persist: pick up both pstore console files am: a569727
am: f726865

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

Change-Id: I4787bf7b5893e2d902e55d0c2d92b33f9bc277a5
2016-04-05 14:59:06 +00: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 af1cc8c327 Merge "recovery-persist: pick up both pstore console files" am: 901f315 am: 4195388
am: 59a55b5

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

Change-Id: I94e04f486fed0bc79827a1805989424265afa28b
2016-04-05 14:41:31 +00: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 dcc29b8ff5 Import translations. DO NOT MERGE am: f75b6e4 -s ours
am: ea22f8f  -s ours

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

Change-Id: I10f58bfa96d16326e4a912abf96a2a82a82a376e
2016-04-05 03:29:37 +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
Bill Yi af39dc8d36 Import translations. DO NOT MERGE
Change-Id: I5280c977c6c5099c681fa5069bdde9b5426d5949
Auto-generated-cl: translation import
2016-04-04 16:28:16 -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 844007b722 Merge "Move selinux dependencies out of header files." am: 8124750 am: dc91161
am: 5c23b80

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

Change-Id: I191e0337501fc5520da1fa726911ffabd5d156c9
2016-04-02 16:12:29 +00: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 ccc49f9da6 recovery: use __android_log_pmsg_file_write for log files am: 13aca59
am: 658a467

* commit '658a467a1228e99cd858b49c7571c420b41419bf':
  recovery: use __android_log_pmsg_file_write for log files

Change-Id: I94f01d485b0f0ca0e697763d9f428b6014d667ac
2016-03-31 21:56:17 +00: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