Commit graph

9605 commits

Author SHA1 Message Date
Treehugger Robot
1ba8f356dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 11b041710b -s ours am: eeb7222983 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2481d24fd63c48dd47ea2c377d893af7c40a892d
2021-07-04 17:15:29 +00:00
Treehugger Robot
eeb7222983 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 11b041710b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55ec283438a46d969bb6ea0a98fc39a7e51c5070
2021-07-04 16:23:45 +00:00
Treehugger Robot
11b041710b Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:48:41 +00:00
Bill Yi
609dcf711d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a09867ff4c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3aec83d12459ae0f39e061a08171d673e493f731
2021-07-04 04:21:38 +00:00
Bill Yi
a09867ff4c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibe50b0777060c00326cf0fdfa0636aef2aef3d0a
2021-07-04 02:40:02 +00:00
Bill Yi
e98dac63c8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I41664a496a05c88909750171841f6acf39d4c8ba
2021-07-03 18:29:22 -07:00
Bill Yi
801f46d765 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64898ea3f9 -s ours am: 51a144391d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie3a46d6c559545549463d5d70aff60e8dc334b56
2021-07-03 03:59:32 +00:00
Bill Yi
3aec28f35f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e679e5773 -s ours am: ef90ab7b16 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I097c7fd8edaa3437c81ee3deb776ff6357a6fd0e
2021-07-03 03:59:28 +00:00
Bill Yi
9210869eff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c11d9b87 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I86e75dff451c80420710863123fc12742807c396
2021-07-03 03:59:17 +00:00
Bill Yi
51a144391d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64898ea3f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I40dd87870655a572424a82e01f9404d29de89ed5
2021-07-03 03:50:35 +00:00
Bill Yi
ef90ab7b16 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e679e5773 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0072871bf5f5369b5dd0f2be4c8cbc125f7a92df
2021-07-03 03:41:45 +00:00
Bill Yi
42c11d9b87 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I615873a60232a720aed242972af03014967b3bdf
2021-07-02 22:55:28 +00:00
Bill Yi
6e679e5773 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I84b147a52db1507ba1351c768b740d05265d7ce0
2021-07-02 22:53:03 +00:00
Bill Yi
64898ea3f9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I007c5387105b2839a4f31581e58800cd3ece07a2
2021-07-02 22:50:35 +00:00
Treehugger Robot
b02fa30455 Merge "Use recovery variant for librecovery_ui_ext" am: 910adf418b am: ce55edf4c8
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1750168

Change-Id: I885246b2077b849a854cc09fc4f9b886e58f6d6b
2021-06-30 23:57:55 +00:00
Treehugger Robot
ce55edf4c8 Merge "Use recovery variant for librecovery_ui_ext" am: 910adf418b
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1750168

Change-Id: I79d4372d919a7435174ac2b1229f8516d2283026
2021-06-30 23:37:26 +00:00
Treehugger Robot
910adf418b Merge "Use recovery variant for librecovery_ui_ext" 2021-06-30 23:24:09 +00:00
Inseob Kim
5d4dea1618 Use recovery variant for librecovery_ui_ext
It's installed to recovery, so it should use recovery variants.

Bug: 192312249
Test: boot and enter recovery mode
Change-Id: I99eafa756ba071e37c7ee60a8da210385378710b
2021-06-30 15:08:16 +09:00
Xin Li
9a0c839382 [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: d326488958 -s ours am: 42cc85fa1c -s ours
am skip reason: Merged-In Ieed7c5966700bdda4ffd51c108d4c02a58b6b452 with SHA-1 c921adfabf is already in history

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

Change-Id: I64396e6a24649f41201047c5895751bfbaaa0ced
2021-06-21 06:42:46 +00:00
Xin Li
42cc85fa1c [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: d326488958 -s ours
am skip reason: Merged-In Ieed7c5966700bdda4ffd51c108d4c02a58b6b452 with SHA-1 c921adfabf is already in history

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

Change-Id: I8e554024f4b8dc2fd1b848672d4ea412cc06034e
2021-06-21 06:10:18 +00:00
Xin Li
d326488958 Merge "DO NOT MERGE - Merge RQ3A.210605.005" 2021-06-21 05:49:05 +00:00
Xin Li
492cc4c639 DO NOT MERGE - Merge RQ3A.210605.005
Bug: 190855093
Merged-In: Ieed7c5966700bdda4ffd51c108d4c02a58b6b452
Change-Id: Ifbd9c70b096132bfe7377c330b78f545d2ace93f
2021-06-18 12:24:33 -07:00
Xin Li
da2f06af56 [automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: c921adfabf -s ours
am skip reason: Merged-In I816926c0ed685b880a8aac520d654e653347cc8a with SHA-1 5626984392 is already in history

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

Change-Id: I395d80b5852785bc7f814f81e4d5f108ead641b2
2021-06-18 06:18:41 +00:00
Xin Li
c921adfabf DO NOT MERGE - Mark RQ3A.210410.001 as merged
Bug: 190855093
Merged-In: I816926c0ed685b880a8aac520d654e653347cc8a
Change-Id: Ieed7c5966700bdda4ffd51c108d4c02a58b6b452
2021-06-17 22:43:24 -07:00
Treehugger Robot
7cdfe3fc5f Merge "DO NOT MERGE - Merge ab/7272582" am: aff8d9e93d am: 5626984392
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1735955

Change-Id: Ibf7c6d621a7a02298b02c40aae32d046e6b5b375
2021-06-14 07:44:53 +00:00
Xin Li
350d402f94 DO NOT MERGE - Merge ab/7272582 am: 2bbaa4f010 am: 23a9661d5c
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1735955

Change-Id: I964556d4deae0eed1ea9ce68577f486107fafa18
2021-06-14 07:44:45 +00:00
Treehugger Robot
5626984392 Merge "DO NOT MERGE - Merge ab/7272582" am: aff8d9e93d
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1735955

Change-Id: I816926c0ed685b880a8aac520d654e653347cc8a
2021-06-14 07:26:36 +00:00
Xin Li
23a9661d5c DO NOT MERGE - Merge ab/7272582 am: 2bbaa4f010
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1735955

Change-Id: Ie902dada52f19a5bf62a9732c9df3ed5e1626c30
2021-06-14 07:26:23 +00:00
Treehugger Robot
aff8d9e93d Merge "DO NOT MERGE - Merge ab/7272582" 2021-06-14 07:12:31 +00:00
Xin Li
2bbaa4f010 DO NOT MERGE - Merge ab/7272582
Bug: 190855093
Change-Id: Id4ff748fba2ba8d672ee862c15ff3ab4bf37025a
2021-06-11 17:34:02 -07:00
Kelvin Zhang
151c395b72 Merge "Add caremap proto target for release tools" am: 3ac7598c61 am: 334cff9cca
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1725932

Change-Id: If506728b107a8c9db20d47f9785499783099198f
2021-06-06 23:42:36 +00:00
Kelvin Zhang
334cff9cca Merge "Add caremap proto target for release tools" am: 3ac7598c61
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1725932

Change-Id: I4f8d69712ba321d50db415deed27689426a79d69
2021-06-06 23:17:13 +00:00
Kelvin Zhang
3ac7598c61 Merge "Add caremap proto target for release tools" 2021-06-06 22:56:49 +00:00
Kelvin Zhang
b4b619ce52 Add caremap proto target for release tools
Test: th
Change-Id: I389a210e723ee179caf5f02f2bcb257c524fb076
2021-06-03 16:03:02 -04:00
Kelvin Zhang
1406ab1281 Check SPL downgrade before install OTA in recovery am: e631225204
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14648682

Change-Id: I24bde0c2109fc0bc323fb4c200c01df906999590
2021-05-20 20:21:21 +00:00
Kelvin Zhang
e631225204 Check SPL downgrade before install OTA in recovery
Applying an SPL downgrade package can cause boot failures
(/data failed to decrypt). Today's ota_from_target_files
tool already try to prevent this. But Packages generated
using older tools are still around.

Add check in recovery to prevent such OTA package from
installing.

Test: th
Test: Sideload an OTA with newer SPL, make sure check passes
Test; Sideload an OTA with older SPL, make sure check fails

Bug: 186581246
Bug: 188575410

cherry-picked from aosp/1708986
cherry-picked from commit: 33c62fc4b8

Change-Id: Icffe8097521c511e151af023a443ccbb4b59e22c
2021-05-19 20:58:02 +00:00
Kelvin Zhang
e01114fcee Merge "Check SPL downgrade before install OTA in recovery" am: bbde214b48 am: b30df4cd74
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1708986

Change-Id: Ie83b90192b7437360baa90f22d8fc06e5102bc6e
2021-05-19 13:33:00 +00:00
Kelvin Zhang
b30df4cd74 Merge "Check SPL downgrade before install OTA in recovery" am: bbde214b48
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1708986

Change-Id: I6513ee1cdefa33c2c4f7a45c4919c789026889c9
2021-05-19 13:15:18 +00:00
Kelvin Zhang
bbde214b48 Merge "Check SPL downgrade before install OTA in recovery" 2021-05-19 12:59:43 +00:00
Treehugger Robot
4a784883a8 Merge "use create_dumb.size as size of buffer" am: adcddf8555 am: d9a29a428d
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1658139

Change-Id: Id09e08186cb2915c0885ca823fdbddab5d56db1d
2021-05-18 02:27:53 +00:00
Treehugger Robot
d9a29a428d Merge "use create_dumb.size as size of buffer" am: adcddf8555
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1658139

Change-Id: If7f2e545739f6e17c0edc9dda2eb8e1d1f554c83
2021-05-18 01:47:14 +00:00
Treehugger Robot
adcddf8555 Merge "use create_dumb.size as size of buffer" 2021-05-18 01:21:57 +00:00
Kelvin Zhang
33c62fc4b8 Check SPL downgrade before install OTA in recovery
Applying an SPL downgrade package can cause boot failures
(/data failed to decrypt). Today's ota_from_target_files
tool already try to prevent this. But Packages generated
using older tools are still around.

Add check in recovery to prevent such OTA package from
installing.

Test: th
Test: Sideload an OTA with newer SPL, make sure check passes
Test; Sideload an OTA with older SPL, make sure check fails

Bug: 186581246

Change-Id: Icffe8097521c511e151af023a443ccbb4b59e22c
2021-05-17 16:25:00 -04:00
Kelvin Zhang
90f783f3ca use create_dumb.size as size of buffer
According to `man drm-memory` , "The size field contains the absolute
size in bytes of the buffer. This can normally also be computed with
(height * pitch + width) * bpp / 4". Which suggests that we should use
the .size field to allocate buffer.

Test: th
Test: go to recovery, make sure contents are properly displayed.

BYPASS_INCLUSIVE_LANGUAGE_REASON=commit message referenced "man",
        which is a linux command for lookup manual pages.

Change-Id: I512be6b7d493ef1783f2b7f746e279bc1dfe65f2
2021-05-17 16:25:00 -04:00
Bill Yi
7e53762a5e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48a7e7dd7b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb0d3d36851643f295098b26dd245c0e5e273bc1
2021-05-09 04:00:41 +00:00
Bill Yi
48a7e7dd7b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1cda13316ca0951ffc5eef1170aed2595b7c2dca
2021-05-08 18:49:48 -07:00
Bill Yi
bc70b8cc5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 25491dc368 -s ours am: 77bacf9369 -s ours am: 353a5ac00f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8d2b5cb74be737743d656d7de1a815b1c4a7f67d
2021-05-08 01:18:13 +00:00
Bill Yi
353a5ac00f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 25491dc368 -s ours am: 77bacf9369 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I24aa287887bd9b20998d458a56ebd86fcdcdecc7
2021-05-08 01:05:54 +00:00
Bill Yi
77bacf9369 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 25491dc368 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e18ff98765ae143a1dc8057572748371a9bcc9f
2021-05-08 00:49:05 +00:00
Bill Yi
32eec9d6f8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a0dc131542 -s ours am: 98894d1c0b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7388ad65879dd2e61c9f1a0a82269d057bcdf16b
2021-05-07 23:44:12 +00:00