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
07c9edb263
Merge "Fix matches_locale function" into nyc-dev am: 8b86373 am: 45609d3
...
am: 9eeeb17
* commit '9eeeb17e05e5a44c582dc58e30f12bf0c20517ff':
Fix matches_locale function
Change-Id: I765e6c00abeebc608298e1971b995de10c3ef830
2016-04-20 22:52:05 +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
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
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
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
Tao Bao
e179276f7d
recovery: Dump the signature in the zip package.
...
We have been occasionally seeing "signature verification failed" error
message when applying an update. Make more verbose output to help
debugging.
Bug: 28246534
Change-Id: Id83633adc9b86b3fd36abbb504e430f0816f12e4
2016-04-20 14:44:29 -07:00
Elliott Hughes
2efbd3b879
Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: 0e52921" into nyc-mr1-dev-plus-aosp
...
am: 07f0912
* commit '07f0912fe6bd5d4971ceb497e9b921ce20e6d9db':
Change-Id: I5560b9d38eff7995047d08a9d81736148710eebe
2016-04-20 15:28:09 +00:00
Elliott Hughes
b7f24f5f87
Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: c15177b" into nyc-mr1-dev-plus-aosp
...
am: f39da4f
* commit 'f39da4fc1b84c594d95b241d75eec1b25f7d4480':
Remove trailing punctuation from recovery strings.
Change-Id: I8858b1097b301b612494801cce4c2ad3274823dc
2016-04-20 15:28:09 +00:00
Elliott Hughes
2d7c1515cd
Merge "Decrease OTA package verification times further. am: dd895d0 am: 5be36da" into nyc-mr1-dev-plus-aosp
...
am: 2103472
* commit '2103472898e3a58efb52c778a7c41df9c5b0d7a3':
Change-Id: I12be28a8544dc4535ada80cdf9ce94397292bfcb
2016-04-20 15:28:08 +00:00
Elliott Hughes
202214c4d5
Decrease OTA package verification times further. am: dd895d0 am: 1864feb
...
am: 576fb11
* commit '576fb1145bbca145502773443d13751dd45d6fe5':
Decrease OTA package verification times further.
Change-Id: I9aa5ca50bf8a73863068eac44c66951a9f1a5754
2016-04-20 15:28:08 +00: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
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
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
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
7140a083c7
Merge "Fix google-runtime-int warnings." am: a1f4a1e am: bcad1d1 am: 0231e70
...
am: ed4c0c4
* commit 'ed4c0c4ca04943a79d2dc7ac2c095ed6ca20f749':
Fix google-runtime-int warnings.
Change-Id: Ifbed57a32b75f1baf9d31126087a2d3eb2983d8b
2016-04-18 22:39:41 +00: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
David Benjamin
f4b18f50e0
Merge "Fix IWYU errors." am: 51dcd0d am: 405db92
...
am: d911d81
* commit 'd911d81450570f5b9df46dce44898f47ea3b11de':
Fix IWYU errors.
Change-Id: I0e7ee0e34a13ad1169c187f40e7cf7dd3ba45754
2016-04-16 02:00:32 +00: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
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