Commit graph

9531 commits

Author SHA1 Message Date
TreeHugger Robot
e147f93df6 Merge "Update Armenian fonts to a variable format" am: e6c342aad5
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12602470

Change-Id: I80fb17c79fefa6b36eac82170d1b65e341c2fbcf
2020-09-19 02:26:44 +00:00
TreeHugger Robot
e6c342aad5 Merge "Update Armenian fonts to a variable format" 2020-09-19 01:32:05 +00:00
Kelvin Zhang
c1d2c15785 Merge "Check for overflow before allocating memory fore decompression." 2020-09-19 00:51:22 +00:00
Kelvin Zhang
d1ba38f7c9 Check for overflow before allocating memory fore decompression.
On 32bit devices, an ZipEntry64 may have size > 2^32, we should check
for such cases before attempting to allocate memory.

Test: mm -j
Change-Id: I0f916ef4b2a692f167719a74bd6ff2e887c6c2ce
2020-09-18 17:41:51 -04:00
Bill Yi
7a899bb461 Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" 2020-09-18 18:47:53 +00:00
Bill Yi
0139ad11a5 Merge mainline-release 6664920 to master - DO NOT MERGE
Merged-In: I58a59150174f298ff6e2fae9cd5b4a761279458f
Change-Id: Ieec93fb9ffc33c022e7c7896675dc62b9f8a09ff
2020-09-17 21:56:55 -07:00
Kelvin Zhang
616fcd847e Merge "Switch to zip64 in recovery" am: a35202befd am: a973d68fcb am: 5bb0917365 am: 805e3a983f am: df4c28991b am: 131ef82fa0
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1429048

Change-Id: I9d534d330d9fcfc9ea1a759e8c78dbeac89d6b44
2020-09-17 08:51:16 +00:00
Kelvin Zhang
131ef82fa0 Merge "Switch to zip64 in recovery" am: a35202befd am: a973d68fcb am: 5bb0917365 am: 805e3a983f am: df4c28991b
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1429048

Change-Id: If1163876965533a3b798de8e48f8c2d223de469a
2020-09-17 05:35:57 +00:00
Kelvin Zhang
df4c28991b Merge "Switch to zip64 in recovery" am: a35202befd am: a973d68fcb am: 5bb0917365 am: 805e3a983f
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1429048

Change-Id: Id0990957f4cdf47e6e2ea004180246f9d64ce700
2020-09-17 05:19:51 +00:00
Kelvin Zhang
805e3a983f Merge "Switch to zip64 in recovery" am: a35202befd am: a973d68fcb am: 5bb0917365
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1429048

Change-Id: Id448c6291c026c25534bc682563b9ab505bc46bf
2020-09-17 04:40:01 +00:00
Kelvin Zhang
5bb0917365 Merge "Switch to zip64 in recovery" am: a35202befd am: a973d68fcb
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1429048

Change-Id: I58a59150174f298ff6e2fae9cd5b4a761279458f
2020-09-17 01:13:41 +00:00
Kelvin Zhang
a973d68fcb Merge "Switch to zip64 in recovery" am: a35202befd
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1429048

Change-Id: If3de6e828aaff1953a5adc43a786f04d527667c0
2020-09-17 00:50:21 +00:00
Kelvin Zhang
a35202befd Merge "Switch to zip64 in recovery" 2020-09-17 00:19:41 +00:00
Kelvin Zhang
4f81130039 Switch to zip64 in recovery
There's already library support for zip64 in libziparchive. We just need
to start using the new APIs.

Bug: 167951876
Test: Sideload a large ota package in recovery
Change-Id: I652741965f28de079d873c6822317ee9fa855201
2020-09-16 14:21:37 -04:00
Bill Yi
2b3aa29664 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 22dc338781 -s ours am: 0f2f5051c5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12286523

Change-Id: I4ec80e3ba689f317462393d169dc0f06ed230c9c
2020-09-16 06:39:06 +00:00
Bill Yi
50873308fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd33b4992d -s ours am: 19f396653d -s ours am: 7fd848af0a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12182454

Change-Id: I5dab5d4ba033055ab5b762ad4a42a70b534d9235
2020-09-16 06:19:45 +00:00
Bill Yi
0f2f5051c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 22dc338781 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12286523

Change-Id: I0bd44760b6b95ca3213178601a29c7d7d8c51676
2020-09-16 05:54:05 +00:00
Bill Yi
7fd848af0a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd33b4992d -s ours am: 19f396653d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12182454

Change-Id: Ib4ee7f35160b71ce56fc10c99df43563dc5cc47c
2020-09-16 05:43:53 +00:00
Marek Z Jeziorek
c6820e1c20 Update Armenian fonts to a variable format
Bug: 168657713

Test: All tests below are manual.
Test: 0. Open a reference device with an existing set of fonts
Test: 1. Upload new fonts.xml and the new fonts to a test device
Test: 2. Change language to Armenian on both devices (look for Հայերեն
or similar)
Test: 3. Open settings on both devices and visually compare them (they
should be the same)
Test: 4. Open the following pages on the test device (and on a reference
device):
Test:  https://en.wikipedia.org/wiki/Armenian_(Unicode_block)
Test:  https://unicode.org/udhr/d/udhr_hye.html
Test:
https://hy.wikipedia.org/wiki/%D5%80%D5%A1%D5%B5%D5%A5%D6%80%D5%A5%D5%B6
Test:  ... and visually compare them (they should be the same)

Change-Id: If95a0f26fb46c030a7f50bd001474bd9a1a103bc
2020-09-16 00:01:32 +00:00
Bill Yi
e86cc982bc [automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b3896c679e -s ours am: 7428812159 -s ours am: d757c4c90d -s ours am: 73f4ba0967 -s ours am: 6527ab710f -s ours
am skip reason: Change-Id I0181ce6e0a8271fcfdfbfb5b8e5c64791693d07f with SHA-1 4b028fac0b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12578853

Change-Id: I329275c14aaa1b87776100f0dd9608ba536f80db
2020-09-15 22:43:38 +00:00
Bill Yi
6527ab710f [automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b3896c679e -s ours am: 7428812159 -s ours am: d757c4c90d -s ours am: 73f4ba0967 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12578853

Change-Id: I2a2f727c51fd8c5f3ea6b9293cf7a41fe5efb9a1
2020-09-15 20:32:11 +00:00
Bill Yi
73f4ba0967 [automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b3896c679e -s ours am: 7428812159 -s ours am: d757c4c90d -s ours
am skip reason: Change-Id I0181ce6e0a8271fcfdfbfb5b8e5c64791693d07f with SHA-1 4b028fac0b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12578853

Change-Id: Id72ff8c1be02e9a18c13d5380bcdd9f768ec0e24
2020-09-14 22:20:13 +00:00
Bill Yi
d757c4c90d [automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b3896c679e -s ours am: 7428812159 -s ours
am skip reason: Change-Id I0181ce6e0a8271fcfdfbfb5b8e5c64791693d07f with SHA-1 4b028fac0b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12578853

Change-Id: I4adddd8fc32af1a6891083a57e987759e3e1f1b5
2020-09-14 21:50:52 +00:00
Hongguang Chen
c823045bb5 [automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 am: aba17e1c9a -s ours am: 218d5fcbed -s ours
am skip reason: Change-Id I73fe44be3790bdba5a6059fbba3f7264b21eed99 with SHA-1 4d0df88d88 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11528649

Change-Id: I2e011fa1a8d1285fb386f72f622d79bac883bc14
2020-09-14 21:22:58 +00:00
Bill Yi
7428812159 [automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b3896c679e -s ours
am skip reason: Change-Id I0181ce6e0a8271fcfdfbfb5b8e5c64791693d07f with SHA-1 4b028fac0b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12578853

Change-Id: Id8104464c62a01be2b0db3e56c515b91015f7578
2020-09-14 21:18:48 +00:00
Hongguang Chen
218d5fcbed [automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 am: aba17e1c9a -s ours
am skip reason: Change-Id I73fe44be3790bdba5a6059fbba3f7264b21eed99 with SHA-1 4d0df88d88 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11528649

Change-Id: I4f16fb42414b6d89736604def3f01d353a3e5704
2020-09-14 21:06:06 +00:00
Bill Yi
b3896c679e Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE
Merged-In: I0181ce6e0a8271fcfdfbfb5b8e5c64791693d07f
Change-Id: I8bce5f15127d0ea06a2a1efe53aa6f2b16444125
2020-09-13 07:58:37 -07:00
TreeHugger Robot
88ac21e7d6 Merge changes from topic "nonab_on_vab_r" into rvc-dev am: b62ff1abe3 am: 7875d824f9 am: 4a0485ecbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11345698

Change-Id: Ib3754820cce2fd44cd247a62da9149322937f9db
2020-09-12 21:53:44 +00:00
Yifan Hong
400422b3d0 Add slot suffix to DAP ops am: bc7e1db211 am: 05569dc667 am: 567804a41f
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11345697

Change-Id: Icdf0cb97fde622fb285a55de85daef69dbe81c63
2020-09-12 21:53:43 +00:00
Yifan Hong
c385f8174a Detect non-A/B vs. A/B packages correctly. am: 2a4afd29a1 am: 672fec0538 am: 1343db27c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11345696

Change-Id: Ia70db6c3fc68a5cda25007f2f2b2f0a45c02735a
2020-09-12 21:53:41 +00:00
TreeHugger Robot
4a0485ecbe Merge changes from topic "nonab_on_vab_r" into rvc-dev am: b62ff1abe3 am: 7875d824f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11345698

Change-Id: I08665b80df208d40b2e48c341dd5ab98f24fe53c
2020-09-12 21:41:09 +00:00
Yifan Hong
567804a41f Add slot suffix to DAP ops am: bc7e1db211 am: 05569dc667
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11345697

Change-Id: I8e000f3d5e18aafcae999c75b6d8e60e9520225d
2020-09-12 21:41:08 +00:00
Yifan Hong
1343db27c7 Detect non-A/B vs. A/B packages correctly. am: 2a4afd29a1 am: 672fec0538
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11345696

Change-Id: I41ed8e550c402afd7081baa93bca256e63d56ae1
2020-09-12 21:41:06 +00:00
Xin Li
f062e545ed [automerger skipped] Merge "Merge Android R" am: 2172474d50 -s ours am: c975ecfe33 -s ours am: 4b028fac0b -s ours am: 37059f4ee5 -s ours am: fabb0fbef5 -s ours am: 4d457eb3ed -s ours
am skip reason: Change-Id I22ea459266eeb88509fefb34277e6426166e2502 with SHA-1 e1e08fc8d1 is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1421705

Change-Id: I62a24b0c29199b6a99bc4bb0475193124dc14bcf
2020-09-11 22:41:09 +00:00
Xin Li
4d457eb3ed [automerger skipped] Merge "Merge Android R" am: 2172474d50 -s ours am: c975ecfe33 -s ours am: 4b028fac0b -s ours am: 37059f4ee5 -s ours am: fabb0fbef5 -s ours
am skip reason: Change-Id I22ea459266eeb88509fefb34277e6426166e2502 with SHA-1 e1e08fc8d1 is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1421705

Change-Id: I85ab455872110183950db38a9cc1120ba47ac589
2020-09-11 21:27:11 +00:00
Xin Li
fabb0fbef5 [automerger skipped] Merge "Merge Android R" am: 2172474d50 -s ours am: c975ecfe33 -s ours am: 4b028fac0b -s ours am: 37059f4ee5 -s ours
am skip reason: Change-Id I22ea459266eeb88509fefb34277e6426166e2502 with SHA-1 e1e08fc8d1 is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1421705

Change-Id: Ic3307da2b882e5ca73f57ecfe5e0652bba870d7b
2020-09-11 03:58:41 +00:00
Xin Li
37059f4ee5 [automerger skipped] Merge "Merge Android R" am: 2172474d50 -s ours am: c975ecfe33 -s ours am: 4b028fac0b -s ours
am skip reason: Change-Id I22ea459266eeb88509fefb34277e6426166e2502 with SHA-1 e1e08fc8d1 is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1421705

Change-Id: Ib919ddf67b6dfc8166fd0a62591426516caa8c86
2020-09-11 03:33:10 +00:00
Xin Li
4b028fac0b [automerger skipped] Merge "Merge Android R" am: 2172474d50 -s ours am: c975ecfe33 -s ours
am skip reason: Change-Id I22ea459266eeb88509fefb34277e6426166e2502 with SHA-1 e1e08fc8d1 is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1421705

Change-Id: I0181ce6e0a8271fcfdfbfb5b8e5c64791693d07f
2020-09-11 02:02:19 +00:00
Xin Li
c975ecfe33 [automerger skipped] Merge "Merge Android R" am: 2172474d50 -s ours
am skip reason: Change-Id I22ea459266eeb88509fefb34277e6426166e2502 with SHA-1 e1e08fc8d1 is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1421705

Change-Id: Ia3b57074613c623ea3105505c4b32b29baba3436
2020-09-11 00:39:35 +00:00
Xin Li
2172474d50 Merge "Merge Android R" 2020-09-10 17:22:18 +00:00
Xin Li
7d57e8e43e Merge Android R
Bug: 168057903
Merged-In: I22ea459266eeb88509fefb34277e6426166e2502
Change-Id: I61f0ddc32a51997cca143ec58d0a6b08453a8b32
2020-09-08 16:52:45 -07:00
Treehugger Robot
265659dc0e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b1afe09da2 -s ours am: e1e08fc8d1 -s ours am: b105b0b821 -s ours am: 50f2a5cabb -s ours am: 9233d47dc1 -s ours am: 4131afde00 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420415

Change-Id: I2440c0ff61f24e3697039b590ef0b1853dee73e5
2020-09-05 15:59:08 +00:00
Treehugger Robot
4131afde00 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b1afe09da2 -s ours am: e1e08fc8d1 -s ours am: b105b0b821 -s ours am: 50f2a5cabb -s ours am: 9233d47dc1 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420415

Change-Id: I5498a05dff878674476bfe201866406d3ba300ff
2020-09-05 15:44:46 +00:00
Treehugger Robot
9233d47dc1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b1afe09da2 -s ours am: e1e08fc8d1 -s ours am: b105b0b821 -s ours am: 50f2a5cabb -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420415

Change-Id: I380356c6051f1671972ebd6282419c56d65c97df
2020-09-05 15:28:19 +00:00
Treehugger Robot
50f2a5cabb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b1afe09da2 -s ours am: e1e08fc8d1 -s ours am: b105b0b821 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420415

Change-Id: Iec1ea82bf54fb3a27ca516b1f7f23287a76097ad
2020-09-05 15:16:29 +00:00
Treehugger Robot
b105b0b821 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b1afe09da2 -s ours am: e1e08fc8d1 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420415

Change-Id: Iaaf0aca6158ef915761a658361b747d7300b93d1
2020-09-05 15:01:57 +00:00
Treehugger Robot
e1e08fc8d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b1afe09da2 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420415

Change-Id: I22ea459266eeb88509fefb34277e6426166e2502
2020-09-05 14:26:05 +00:00
Treehugger Robot
b1afe09da2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 13:51:55 +00:00
Bill Yi
065d5a7755 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie5d70a5d2923833172fc27f21a1f96ef484ed9eb
2020-09-05 07:36:49 +00:00
Treehugger Robot
093c822bbe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3202d82adb -s ours am: c07f2aa249 -s ours am: ca94ed0350 -s ours am: 5f513949c3 -s ours am: 1bb9e29e4f -s ours am: e950af36a0 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420265

Change-Id: I4b7a75cb7148d5b063340714c8c961877e929fc0
2020-09-05 06:21:49 +00:00