Commit Graph

2314 Commits

Author SHA1 Message Date
Tianjie Xu 76734915c7 Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512
am: 4cc6145423

* commit '4cc61454239cd053e9d12e8de6df2878d30b9c72':
  Regenerate background text imgs in recovery

Change-Id: I64145a026a91cddea95dec604fdbfe0abd03de55
2016-04-21 01:08:00 +00:00
Tianjie Xu 4cc6145423 Merge "Regenerate background text imgs in recovery" into nyc-dev
am: df093c1512

* commit 'df093c15121df40693519d2a1c703cf1684423d5':
  Regenerate background text imgs in recovery

Change-Id: If4c878b2ffd03189107ed24e1cd3e9e88833024c
2016-04-21 01:05:46 +00:00
Tianjie Xu df093c1512 Merge "Regenerate background text imgs in recovery" into nyc-dev 2016-04-21 00:55:51 +00:00
Tianjie Xu d32182da00 Merge "Fix matches_locale function" into nyc-dev am: 8b86373
am: 210b0a5

* commit '210b0a5a20830beea3b3e96e84c6b3fd2a626cf5':

Change-Id: I0ead2ccee7d8a2db4a2ac585a2054ee80abd569c
2016-04-20 23:26:00 +00:00
Tianjie Xu 9eeeb17e05 Merge "Fix matches_locale function" into nyc-dev am: 8b86373
am: 45609d3

* commit '45609d37efe3ced3a599b6eccd6e6dbd184152e6':
  Fix matches_locale function

Change-Id: I3f3a41dbcb4ab42d287f36b6ff0f2eaa6806f99a
2016-04-20 22:30:13 +00:00
Tianjie Xu 210b0a5a20 Merge "Fix matches_locale function" into nyc-dev
am: 8b86373

* commit '8b86373fd954276b18a6fba81afbe42c9caa49d3':
  Fix matches_locale function

Change-Id: I9494f416b12cba3c63972096137ddaf805bc453b
2016-04-20 22:12:11 +00:00
Tianjie Xu 45609d37ef Merge "Fix matches_locale function" into nyc-dev
am: 8b86373

* commit '8b86373fd954276b18a6fba81afbe42c9caa49d3':
  Fix matches_locale function

Change-Id: If7726c2f381ba0e4ab0519b77c167e75a9d46104
2016-04-20 22:12:11 +00:00
Tianjie Xu 8b86373fd9 Merge "Fix matches_locale function" into nyc-dev 2016-04-20 21:55:30 +00:00
Tianjie Xu 2430e2978b Fix matches_locale function
matches_locale was expecting input locale string to have at most one
underscore; as a result "zh_CN_#Hans" ignores "zh_CN" and matches into
"zh". Fix the match function and add unit tests.

Bug: 27837319
Change-Id: I4e8a66f91cae6ac2a46b6bf21f670d5ea564c7c8
2016-04-20 14:50:35 -07:00
Android Build Merger (Role) 07f0912fe6 Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: 0e52921" into nyc-mr1-dev-plus-aosp 2016-04-20 15:25:18 +00:00
Android Build Merger (Role) f39da4fc1b Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: c15177b" into nyc-mr1-dev-plus-aosp 2016-04-20 15:25:17 +00:00
Android Build Merger (Role) 2103472898 Merge "Decrease OTA package verification times further. am: dd895d0 am: 5be36da" into nyc-mr1-dev-plus-aosp 2016-04-20 15:25:15 +00:00
Elliott Hughes 9552397004 Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d
am: c15177b

* commit 'c15177b8b8f125c0c86bd7dabacde1289e68c45e':
  Remove trailing punctuation from recovery strings.

Change-Id: I2518baa5eb2be33da5f86d92e33b88a402724209
2016-04-20 15:25:07 +00:00
Elliott Hughes 5f86a2e627 Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d
am: 0e52921

* commit '0e5292104b515d7eb9976b7d5c9e8c5e8a04a30d':
  Remove trailing punctuation from recovery strings.

Change-Id: I0bc91e855be85bbc26d4230ebc80d7d7115941ec
2016-04-20 15:25:06 +00:00
Elliott Hughes 576fb1145b Decrease OTA package verification times further. am: dd895d0
am: 1864feb

* commit '1864feb8d2ab6f764d377df28613a973927d85e8':
  Decrease OTA package verification times further.

Change-Id: I0e2eb49ed48081f93bc0c42eeb64aef356912260
2016-04-20 15:25:06 +00:00
Elliott Hughes 984e81a599 Decrease OTA package verification times further. am: dd895d0
am: 5be36da

* commit '5be36da6518cc0707e8cdcdc6382999efcf70f17':
  Decrease OTA package verification times further.

Change-Id: I27c2b1ff7c8ab415c4b6e1c5b903b0a5b5ad57cb
2016-04-20 15:25:06 +00:00
Elliott Hughes c15177b8b8 Merge "Remove trailing punctuation from recovery strings." into nyc-dev
am: 4eec72d

* commit '4eec72d2cf8c1be0068feffc804035dab756c78d':
  Remove trailing punctuation from recovery strings.

Change-Id: I60cf10d7748227d81f60fc9d1fe18cdb01f8b2f3
2016-04-20 15:21:35 +00:00
Elliott Hughes 0e5292104b Merge "Remove trailing punctuation from recovery strings." into nyc-dev
am: 4eec72d

* commit '4eec72d2cf8c1be0068feffc804035dab756c78d':
  Remove trailing punctuation from recovery strings.

Change-Id: If9529323c0933f88f8d28a450589d2864af19ad2
2016-04-20 15:21:34 +00:00
Elliott Hughes 1864feb8d2 Decrease OTA package verification times further.
am: dd895d0

* commit 'dd895d0adaa691a078f18a95a7f5ac0eaf776cae':
  Decrease OTA package verification times further.

Change-Id: If3bee4cbe66e576193556472776a232c9460af9a
2016-04-20 15:21:34 +00:00
Elliott Hughes 5be36da651 Decrease OTA package verification times further.
am: dd895d0

* commit 'dd895d0adaa691a078f18a95a7f5ac0eaf776cae':
  Decrease OTA package verification times further.

Change-Id: I2d7da4a19c3fc52cae1dedc6e26201fe0f972d37
2016-04-20 15:21:34 +00:00
Elliott Hughes 4eec72d2cf Merge "Remove trailing punctuation from recovery strings." into nyc-dev 2016-04-20 15:14:47 +00:00
Elliott Hughes ebcdea85e3 Remove trailing punctuation from recovery strings.
Bug: http://b/26548285
Change-Id: I235c620532e1759bfc76a4486409a4404f1c8c6a
2016-04-19 16:17:42 -07:00
Elliott Hughes dd895d0ada Decrease OTA package verification times further.
Timing from Nexus 5X:

      89 MiB OTA update package: 1.4 s -> 0.6 s (decreased by 57%)
    1196 MiB OTA update package: 8.0 s -> 7.5 s (decreased by 6%)

Bug: http://b/28135231
Change-Id: Id91f2ad15df2bffb9f8a4b4ec5a57657a02847ec
2016-04-19 15:24:38 -07:00
Tianjie Xu 494cf65176 Regenerate background text imgs in recovery
Add a image for "installing security update"; and make the text
looks larger in the image. Also extend the length of string
wrapper for high definition devices, so the text will fit better
on the screen.

Bug: 22465983
Bug: 27837319
Change-Id: I2a8b7437f96a834660d6d8d8861c722dcde812f2
2016-04-18 16:49:42 -07:00
Chih-Hung Hsieh ed4c0c4ca0 Merge "Fix google-runtime-int warnings." am: a1f4a1e am: bcad1d1
am: 0231e70

* commit '0231e7016dfe56625d6d01a1de468cd23d9cf01a':
  Fix google-runtime-int warnings.

Change-Id: I0e80a2b91b107375f3fb5836e8948e4f1ff72185
2016-04-18 22:37:16 +00:00
Chih-hung Hsieh 0231e7016d Merge "Fix google-runtime-int warnings." am: a1f4a1e
am: bcad1d1

* commit 'bcad1d1ced730478c94f951034d252e777661332':
  Fix google-runtime-int warnings.

Change-Id: Ifad31026502e3375f4833899056662da540319b5
2016-04-18 22:34:41 +00:00
Chih-Hung Hsieh bcad1d1ced Merge "Fix google-runtime-int warnings."
am: a1f4a1e

* commit 'a1f4a1ec3319ee1ab869a46805bff63550b56ca7':
  Fix google-runtime-int warnings.

Change-Id: If924b2e1b1e7e7bb4317fdca0c583b7de45db397
2016-04-18 22:29:19 +00:00
Chih-hung Hsieh a1f4a1ec33 Merge "Fix google-runtime-int warnings." 2016-04-18 22:19:06 +00:00
Chih-Hung Hsieh 54a2747ef3 Fix google-runtime-int warnings.
Bug: 28220065
Change-Id: Ida199c66692a1638be6990d583d2ed42583fb592
2016-04-18 12:29:30 -07:00
Treehugger Robot d911d81450 Merge "Fix IWYU errors." am: 51dcd0d
am: 405db92

* commit '405db92b6e6384f0f22ba6be338c08e8f1aad345':
  Fix IWYU errors.

Change-Id: Iedb6480e232c560ff9095f5593f13ad412616e4d
2016-04-16 01:58:03 +00:00
David Benjamin 405db92b6e Merge "Fix IWYU errors."
am: 51dcd0d

* commit '51dcd0da37dd10238017bae03fc708dc6e05bb56':
  Fix IWYU errors.

Change-Id: I9dd499afab1d5bf5e6f30a424bd70a016194124d
2016-04-16 01:55:32 +00:00
Treehugger Robot 51dcd0da37 Merge "Fix IWYU errors." 2016-04-16 01:46:25 +00:00
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 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
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 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 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
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
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