Commit graph

8782 commits

Author SHA1 Message Date
Treehugger Robot
46a7a3dfc1 Merge "Add more mounting options to updater mount function." am: ac1ae4fd2e am: 609b8b5360
Change-Id: I11b1637977448ccbfb9ac7b5ac4505728e0ccc42
2020-03-18 22:10:35 +00:00
Treehugger Robot
609b8b5360 Merge "Add more mounting options to updater mount function." am: ac1ae4fd2e
Change-Id: Ic13cf40d7bd82222ded2547750fff2aa5cef8eee
2020-03-18 21:57:12 +00:00
Treehugger Robot
ac1ae4fd2e Merge "Add more mounting options to updater mount function." 2020-03-18 21:46:51 +00:00
TreeHugger Robot
9688e3bdeb Merge "Add more mounting options to updater mount function." into rvc-dev am: 342e53d045
Change-Id: I6cd18dcd97764568a270aa342b5284a2fd49c5da
2020-03-18 19:02:35 +00:00
TreeHugger Robot
342e53d045 Merge "Add more mounting options to updater mount function." into rvc-dev 2020-03-18 18:51:04 +00:00
Hongguang Chen
586565fd8b Add more mounting options to updater mount function.
If enabling the oem partition, it will be mounted by updater before
reading product properties from it. To be safety, we want to enable AVB
to this oem partition. But this means the oem partition can never be
mounted to writable. Otherwise, that partition will be corrupted to AVB
verifying.
This change follows fs_mgr to allow to pass more mounting options to the
updater.

BUG: 150156957
Test: make ota package which mounts AVB oem partition to read only and
run OTA.

Change-Id: I2ebbe3c8ac53c70112f3fed2703fcba9170405a6
2020-03-17 23:39:13 -07:00
Hongguang Chen
b37d794351 Add more mounting options to updater mount function.
If enabling the oem partition, it will be mounted by updater before
reading product properties from it. To be safety, we want to enable AVB
to this oem partition. But this means the oem partition can never be
mounted to writable. Otherwise, that partition will be corrupted to AVB
verifying.
This change follows fs_mgr to allow to pass more mounting options to the
updater.

BUG: 150156957
Test: make ota package which mounts AVB oem partition to read only and
run OTA.

Change-Id: I2ebbe3c8ac53c70112f3fed2703fcba9170405a6
2020-03-17 16:16:43 -07:00
Automerger Merge Worker
aeba1ae5b8 [automerger skipped] Import translations. DO NOT MERGE am: 2f6ed0524e -s ours am: 22f595b2c5 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibc2e02b9a444eb64fafda11bee4711c4638c93ac
2020-03-17 15:34:48 +00:00
Automerger Merge Worker
22f595b2c5 [automerger skipped] Import translations. DO NOT MERGE am: 2f6ed0524e -s ours
am skip reason: subject contains skip directive

Change-Id: Ibac7db9ffa4af2adee660bbf3fe61b5f21495f13
2020-03-17 15:17:12 +00:00
Bill Yi
2f6ed0524e Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I05a2df29e459400e5af878922f6e73a8b94f042b
2020-03-16 19:53:58 -07:00
Automerger Merge Worker
e681626afa Merge "Address the warnings in recovery code" am: 4577dff5a0 am: 03abec6ecb
Change-Id: I8952589ad8f913d4b295f928842643fa96cbfd1b
2020-03-16 05:11:43 +00:00
Automerger Merge Worker
03abec6ecb Merge "Address the warnings in recovery code" am: 4577dff5a0
Change-Id: I1bb34dd7a1269421b1b54f3cbaf12ca91489804f
2020-03-16 04:56:32 +00:00
Treehugger Robot
4577dff5a0 Merge "Address the warnings in recovery code" 2020-03-16 04:35:13 +00:00
Automerger Merge Worker
2bc65f82f6 Merge "Consolidate the wait in recovery's reboot" am: a69c69b26f am: 737a2e41bd
Change-Id: I962b324436ab4139ed2fa24430599d9403a983e1
2020-03-14 23:04:41 +00:00
Automerger Merge Worker
737a2e41bd Merge "Consolidate the wait in recovery's reboot" am: a69c69b26f
Change-Id: I62b55862a49b460a734d0d1d4e5d46a572fb0abb
2020-03-14 22:54:25 +00:00
Tianjie Xu
a69c69b26f Merge "Consolidate the wait in recovery's reboot" 2020-03-14 22:33:29 +00:00
Automerger Merge Worker
b28d0cdbfa Merge "recovery: Remove HOST_OS guard for f2fs tools" am: 95101e7fca am: a233cb1261
Change-Id: I0895c365f6d67b9569c811898e6a4a5efecd87f9
2020-03-13 23:10:29 +00:00
Tianjie Xu
00c4aba9bf Consolidate the wait in recovery's reboot
After a reboot function call, we should always wait for it to finish
without executing other instructions.

Bug: 151110322
Test: build
Change-Id: I1dda291a0835ff96df7eaf42eba1a38267a3beeb
2020-03-13 16:09:48 -07:00
Automerger Merge Worker
a233cb1261 Merge "recovery: Remove HOST_OS guard for f2fs tools" am: 95101e7fca
Change-Id: I9b7bfc77b8a0445f8c046133d09974c34428d211
2020-03-13 22:54:01 +00:00
Treehugger Robot
95101e7fca Merge "recovery: Remove HOST_OS guard for f2fs tools" 2020-03-13 22:40:02 +00:00
Tianjie Xu
fb08b015f2 Address the warnings in recovery code
The following warnngs generate when compile with WITH_TIDY=1

.../bootable/recovery/applypatch/imgdiff.cpp:968:7: warning: 'src_ranges' used after it was moved [bugprone-use-after-move]
      src_ranges.Clear();
      ^
.../bootable/recovery/applypatch/imgdiff.cpp:966:27: note: move occurred here
        split_src_ranges->push_back(std::move(src_ranges));

The logic itself seems correct since the class is meant to be cleared
after move. I feel the std::move in 966 is actually useful to call the
move constructor in RangeSet. So I just modify L968 to suppress the
warning.

Less important ones:
bootable/recovery/applypatch/applypatch_modes.cpp:79:34: warning: passing result of std::move() as a const reference argument; no move will actually happen [performance-move-const-arg]
bootable/recovery/applypatch/imgdiff.cpp:1038:30: warning: passing result of std::move() as a const reference argument; no move will actually happen [performance-move-const-arg]
bootable/recovery/applypatch/imgdiff.cpp:1054:48: warning: passing result of std::move() as a const reference argument; no move will actually happen [performance-move-const-arg]
bootable/recovery/updater/include/private/commands.h:310:16: warning: std::move of the variable 'patch' of the trivially-copyable type 'PatchInfo' has no effect; remove std::move() [performance-move-const-arg]
bootable/recovery/updater/install.cpp:663:43: warning: passing result of std::move() as a const reference argument; no move will actually happen [performance-move-const-arg]

Bug: 150955971
Test: build
Change-Id: Ieb75f0229c47d470d4f5ac93fab39c5698d3f914
2020-03-07 17:54:11 -08:00
Automerger Merge Worker
7e7c57bcb6 [automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 917b666966 am: 2d9c7a23b3 -s ours
am skip reason: subject contains skip directive

Change-Id: I7e05cedfd3d6671cc68acb5d103b868c6431905d
2020-03-06 00:26:01 +00:00
Automerger Merge Worker
837b059e52 [automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 42ac06e560 am: 52d940cabb -s ours
am skip reason: subject contains skip directive

Change-Id: Ic76aa44fddbd99fe894d7c78acc177041a64e5f7
2020-03-06 00:25:27 +00:00
Automerger Merge Worker
2d9c7a23b3 Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 917b666966
Change-Id: If126109411453044f0f264103a597928d8df9159
2020-03-06 00:12:52 +00:00
Automerger Merge Worker
52d940cabb Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 42ac06e560
Change-Id: I9fbabaa7eff0f2143448d54cc9de665a19fbb662
2020-03-06 00:12:15 +00:00
Bill Yi
917b666966 Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" 2020-03-05 18:27:29 +00:00
Bill Yi
42ac06e560 Merge stage-aosp-master to aosp-master - DO NOT MERGE
Change-Id: I07b5b396b277573f276cec97ed0f0684e8a72885
2020-03-05 09:50:55 -08:00
Automerger Merge Worker
8f99c6abb5 Merge "Move libboot_control to boot_control 1.1" into rvc-dev am: 2774d5f4f0
Change-Id: I204d901247905c64733c1745277273af61c39fd8
2020-03-03 07:08:48 +00:00
TreeHugger Robot
2774d5f4f0 Merge "Move libboot_control to boot_control 1.1" into rvc-dev 2020-03-03 06:52:35 +00:00
Automerger Merge Worker
20d3a7fbc8 New priority scripts + critical updates to fonts. am: cbb0b54b12
Change-Id: Ifddcec2a5582ac3943b588c07141ddd24979655f
2020-03-03 05:20:34 +00:00
Automerger Merge Worker
77c2ac87dc Merge "Add libavb as a dependency" am: 6038661eec am: ff9ca5b4fa
Change-Id: Ied63bf2c7621fe53f00c9d8bad1e375fe596acd7
2020-02-28 22:10:01 +00:00
Automerger Merge Worker
ff9ca5b4fa Merge "Add libavb as a dependency" am: 6038661eec
Change-Id: I5c77634e039ccdffadcd821725e13986466c915c
2020-02-28 21:58:47 +00:00
Tianjie Xu
6038661eec Merge "Add libavb as a dependency" 2020-02-28 21:47:14 +00:00
Tianjie Xu
2bb374a86d Add libavb as a dependency
It's needed by libfec

Test: mma
Change-Id: Ic82671f6506e7718afa965a511261b1b329ea38f
2020-02-28 11:41:31 -08:00
Marek Z Jeziorek
cbb0b54b12 New priority scripts + critical updates to fonts.
Author: Marek Z. Jeziorek <marekj@google.com>

Needs to be submitted with
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/10280447

BUGANIZER BUGS Addressed
========================
BUG: 149257053

CHANGES
=======
Remove font files no longer required
deleted:    other/NotoSansAdlam-Regular.ttf
deleted:    other/NotoSansGeorgian-Bold.otf
deleted:    other/NotoSansGeorgian-Medium.otf
deleted:    other/NotoSansGeorgian-Regular.otf
deleted:    other/NotoSansJavanese-Regular.ttf
deleted:    other/NotoSansTifinagh-Regular.ttf
deleted:    other/NotoSerifGeorgian-Bold.otf
deleted:    other/NotoSerifGeorgian-Regular.otf

modified:   fonts.mk
modified:   other/Android.bp

Replacements for the above deleted files:
new file:   other/NotoSansAdlam-VF.ttf
new file:   other/NotoSansGeorgian-VF.ttf
new file:   other/NotoSansJavanese-Regular.otf
new file:   other/NotoSansTifinagh-Regular.otf
new file:   other/NotoSerifGeorgian-VF.ttf

New additions to Android fonts (living/revival languages):
new file:   other/NotoSansGunjalaGondi-Regular.otf
new file:   other/NotoSansHanifiRohingya-Regular.otf
new file:   other/NotoSansKhojki-Regular.otf
new file:   other/NotoSansMasaramGondi-Regular.otf
new file:   other/NotoSansWancho-Regular.otf
new file:   other/NotoSansWarangCiti-Regular.otf

Test: ===================================================
Test: on Android (click on a link within a browser):
Test: Adlam https://en.wikipedia.org/wiki/Adlam_(Unicode_block)
Test: Georgian https://en.wikipedia.org/wiki/Georgian_(Unicode_block)
Test: Georgian https://en.wikipedia.org/wiki/Georgian_Extended
Test: Gunjala Gondi
https://en.wikipedia.org/wiki/Gunjala_Gondi_(Unicode_block)
Test: Hanifi Rohingya
https://en.wikipedia.org/wiki/Hanifi_Rohingya_(Unicode_block)
Test: Javanese https://en.wikipedia.org/wiki/Javanese_(Unicode_block)
Test: Khojki https://en.wikipedia.org/wiki/Khojki_(Unicode_block)
Test: Masaram Gondi
https://en.wikipedia.org/wiki/Masaram_Gondi_(Unicode_block)
Test: Tifinagh https://en.wikipedia.org/wiki/Tifinagh_(Unicode_block)
Test: Wancho https://en.wikipedia.org/wiki/Wancho_(Unicode_block)
Test: Warang Citi
https://en.wikipedia.org/wiki/Warang_Citi_(Unicode_block)
Test: ===================================================
Test: on Android (click on a link within a browser):
Test: udhr Adlam https://unicode.org/udhr/d/udhr_fuf_adlm.html
Test: udhr Georgian https://unicode.org/udhr/d/udhr_kat.html
Test: udhr Gunjala Gondi NA (Not Available)
Test: udhr Hanifi Rohingya NA (Not Available)
Test: udhr Javanese https://unicode.org/udhr/d/udhr_jav_java.html
Test: udhr Khojki NA (Not Available)
Test: udhr Masaram Gondi NA (Not Available)
Test: udhr Tifinagh https://unicode.org/udhr/d/udhr_tzm_tfng.html
Test: udhr Wancho NA (Not Available)
Test: udhr Warang Citi NA (Not Available)
Test: ===================================
Test: on Android (comparing two systems - before/after)
Test: Georgian: Systems settings menus compared side by side
Test: ===================================
Test: on Mac (comparing the existing Android fonts with the new font
Test: using diffenator - https://github.com/googlefonts/fontdiffenator)
Test: ===================================
Test: SansAdlam-VF: VALIDATED
Test: SansGeorgian-VF: VALIDATED
Test: SansGunjalaGondi: NEW (No Applicable)
Test: SansHanifiRohingya: NEW (No Applicable)
Test: SansJavanese: VALIDATED
Test: SansKhojki: NEW (No Applicable)
Test: SansMasaramGondi: NEW (No Applicable)
Test: SansTifinagh: VALIDATED
Test: SansWancho: NEW (No Applicable)
Test: SansWarangCiti: NEW (No Applicable)
Test: SerifGeorgian-VF: VALIDATED

Change-Id: I41e030b63f83ec243ae6f174c061faa5298bd6dc
Signed-off-by: Marek Z Jeziorek <marekj@google.com>
(cherry picked from commit f165b9c886)
2020-02-28 14:33:58 +00:00
Tianjie Xu
9c8d0f6103 Move libboot_control to boot_control 1.1
It should belong to the default /misc implementation of boot control
1.1. Right now, it's only used by cuttlefish. So move it over to reduce
confusion in bootloader_message.

Bug: 131775112
Test: build
Change-Id: If09bc6f4cc8adf74c8798048c8e54ec94566abaa
(cherry picked from commit dc4d2a70db)
2020-02-26 12:14:54 -08:00
Automerger Merge Worker
430b513cc1 Merge "Move libboot_control to boot_control 1.1" am: feb6b91ed4 am: d7df83c4bd
Change-Id: If3082fc44432720cb7dbee9a6a35b229b92adc1c
2020-02-25 22:16:31 +00:00
Automerger Merge Worker
d7df83c4bd Merge "Move libboot_control to boot_control 1.1" am: feb6b91ed4
Change-Id: I9b99e64e747cdc3fb11ef3042108fe9e6a5b11d8
2020-02-25 21:57:24 +00:00
Tianjie Xu
feb6b91ed4 Merge "Move libboot_control to boot_control 1.1" 2020-02-25 21:43:07 +00:00
Automerger Merge Worker
f8802616b3 Merge "Generate recovery.img for unittest during build time" am: bf885b6b21 am: 616db72209
Change-Id: I98fbd47d9bb92cb07b856af3bd418b064eaa532d
2020-02-24 19:14:40 +00:00
Automerger Merge Worker
616db72209 Merge "Generate recovery.img for unittest during build time" am: bf885b6b21
Change-Id: I75f0fa79c3e8d2c771edb18bcdc8faa344f273f9
2020-02-24 19:01:14 +00:00
Tianjie Xu
bf885b6b21 Merge "Generate recovery.img for unittest during build time" 2020-02-24 18:49:05 +00:00
Automerger Merge Worker
6a6471c858 Merge "Recovery UI meet issue if image size is too large" am: f5b94d6e9b am: c9b0fe7172
Change-Id: I62ff5470d4d720aab136984e92e8f6287e4abfc0
2020-02-22 17:54:18 +00:00
Automerger Merge Worker
c9b0fe7172 Merge "Recovery UI meet issue if image size is too large" am: f5b94d6e9b
Change-Id: I358dc2c378a2301b46046832ae4c168e7a6fb649
2020-02-22 17:46:03 +00:00
Elliott Hughes
f5b94d6e9b Merge "Recovery UI meet issue if image size is too large" 2020-02-22 17:39:19 +00:00
Automerger Merge Worker
67ab5e4bee [automerger skipped] Force package installation with FUSE unless the package stores on device am: ba27adbbb6 -s ours am: e00afc3fbf -s ours
am skip reason: Change-Id Ibc9b095036a2fa624e8edf6c347ed4f12aef072f with SHA-1 5e6c4e9a91 is in history

Change-Id: Idb8d1b20ddecef33a912ca41ae497a6bbe515db9
2020-02-21 19:44:31 +00:00
Automerger Merge Worker
e00afc3fbf [automerger skipped] Force package installation with FUSE unless the package stores on device am: ba27adbbb6 -s ours
am skip reason: Change-Id Ibc9b095036a2fa624e8edf6c347ed4f12aef072f with SHA-1 5e6c4e9a91 is in history

Change-Id: I27862517a8dd9f64325226bcb73643f82da30398
2020-02-21 19:25:03 +00:00
zhang sanshan
0d81b89472 Recovery UI meet issue if image size is too large
When display screen size is too small, some images in recovery
resource cannot caculate the right display position. So the
image cannot show in the screen.
Limit the calculated position to avoid such issue.

Change-Id: Iebebfe0dfbc568ee3a6b6a31b81d060b3ce5f940
Signed-off-by: zhang sanshan <sanshan.zhang@nxp.com>
2020-02-21 16:20:47 +00:00
Tianjie Xu
fa77ee8470 Generate recovery.img for unittest during build time
The unit tests for imgpatch is comparing the compressed bytes. As
a result, these unit tests will fail with libz change.

Since the recovery image is just a gzipped ramdisk with some wrappings,
we can generate with minigzip it during the build time. This matches
the usage in the real world, where we generate the patch with the host
side libz; and apply the patch with the library on the device.

Bug: 149443852
Test: tests pass on Pixel3
Change-Id: I7885765a161c6bf765671bc55a72cfcaa04b4138
2020-02-20 23:09:44 -08:00
Automerger Merge Worker
c6f36bfd30 Merge "recovery: add a way to enable metadata_csum for ext4" am: 5ac6163822 am: 9af39bf5c4 am: 4d1f8869f4
Change-Id: I1e277b5ba5e45bcf1388c4658fa4fb713092999e
2020-02-21 06:05:03 +00:00