Commit Graph

6844 Commits

Author SHA1 Message Date
Yifan Hong ec6d0626f4 Merge "Fix ensure_path_mounted_at for fsck_unshare_blocks"
am: a37aa092c7

Change-Id: Ib621a39aa30868506223ec9ee1219b954389b4f1
2018-11-30 22:19:38 -08:00
Treehugger Robot a37aa092c7 Merge "Fix ensure_path_mounted_at for fsck_unshare_blocks" 2018-12-01 06:00:32 +00:00
Tianjie Xu af36438170 Merge "ImageGenerator: ignore the duplicate locales"
am: 7846823125

Change-Id: I8a50e53fa5da77f264bc45fcbe51f9f0308b3e3d
2018-11-30 20:15:13 -08:00
Tianjie Xu 7846823125 Merge "ImageGenerator: ignore the duplicate locales" 2018-12-01 03:56:10 +00:00
Yifan Hong d7b6858045 Fix ensure_path_mounted_at for fsck_unshare_blocks
Test: pass
Bug: 118634720
Change-Id: Icb2540892bd35659462f56c3883a39759f29eeab
2018-11-30 15:22:19 -08:00
Yifan Hong fe00ae099c Merge "SYSTEM_ROOT -> get_system_root"
am: cbfeb7f6af

Change-Id: I3ac20643f620bcf469509241b17a02f9343efa20
2018-11-30 14:31:35 -08:00
Yifan Hong cbfeb7f6af Merge "SYSTEM_ROOT -> get_system_root" 2018-11-30 22:07:24 +00:00
Tom Cherry 21197a7f2b Merge "Update for long long -> off64_t for fstab.length"
am: 1f66578d6f

Change-Id: I0f9f5ba577a129b9c31f9cb409d95282638227db
2018-11-30 08:57:37 -08:00
Tom Cherry 1f66578d6f Merge "Update for long long -> off64_t for fstab.length" 2018-11-30 16:33:54 +00:00
Tom Cherry 45e505a4e9 Update for long long -> off64_t for fstab.length
Test: boot
Change-Id: I755a5dd48f1d5be2cbd8e494b9c405674b12cebb
2018-11-29 13:33:07 -08:00
xunchang a48f00a5e8 ImageGenerator: ignore the duplicate locales
Some language variants have the duplicated translations. Therefore,
we can compare the translated string for each locale to the default
text string for that language. And the duplicated ones will be skipped
to save some space.

Bug: 74397117
Test: generate and check the image
Change-Id: If51fa8fe700350c06f084f0e74d3698b82d6f177
2018-11-29 12:13:02 -08:00
Tianjie Xu f2099b7872 Merge "ImageGenerator: Handle special characters in xml files"
am: 697003dbce

Change-Id: Iee0eecaa259235f9546db3ca34e557b945ee3c5b
2018-11-29 10:46:08 -08:00
Tianjie Xu 697003dbce Merge "ImageGenerator: Handle special characters in xml files" 2018-11-29 18:28:44 +00:00
xunchang 1eeee45a7d ImageGenerator: Handle special characters in xml files
In specific, the apostrophe appears as "\'"; and a new line appears as
"\n\n". We need to handle these two cases accordingly.

Bug: 74397117
Test: generate and check the image
Change-Id: I67b1ebce7494e4a685a0c7334da58dc6df2ccb29
2018-11-29 18:28:13 +00:00
Tianjie Xu 49ba6fc534 Merge "ImageGenerator: switch to BreakIterator from icu library"
am: 86936c46a8

Change-Id: Ic21c9505c8a8a4509fecc2a96635e9f5014e134a
2018-11-28 10:46:18 -08:00
Tianjie Xu 86936c46a8 Merge "ImageGenerator: switch to BreakIterator from icu library" 2018-11-28 18:27:58 +00:00
Jaegeuk Kim f8c230a072 Merge "make_f2fs: use -g android by default"
am: 4cd38430d7

Change-Id: Id85e7c286e88c4b543df91df95a19d69fb66835a
2018-11-27 17:13:59 -08:00
Tao Bao 096d3205b4 Merge "Update README.md."
am: c075d688fd

Change-Id: Ic0b46e5337e759d02b7251b36e5cf5e05437c433
2018-11-27 17:10:35 -08:00
Jaegeuk Kim 4cd38430d7 Merge "make_f2fs: use -g android by default" 2018-11-28 00:57:25 +00:00
Treehugger Robot c075d688fd Merge "Update README.md." 2018-11-28 00:50:44 +00:00
Yifan Hong 4932780606 SYSTEM_ROOT -> get_system_root
Add a get_system_root() function in roots.cpp
which returns / or /system based on fstab.
This factors out the 'if' check from recovery.cpp
and fsck_unshare_blocks.cpp.

Test: boot recovery, mount system
Bug: 118634720
Change-Id: If4947cba3a3f08dbe695fd2b50a9354cd302ee03
2018-11-27 15:57:47 -08:00
Tao Bao 67a57dbed0 Merge "minui: GRSurface::Create() computes data_size on its own."
am: a54b883607

Change-Id: Ied588a37611a94ea3ea76da7fc1284078fd97845
2018-11-27 15:39:44 -08:00
Tao Bao a54b883607 Merge "minui: GRSurface::Create() computes data_size on its own." 2018-11-27 23:21:50 +00:00
xunchang acacc9d30f ImageGenerator: switch to BreakIterator from icu library
The icu library takes care of the line boundary, so that we don't need
to worry about if the given language is logogram.

Bug: 74397117
Test: Generate and check the image
Change-Id: I1447f51b178c0fca83c5497d2f5b8e4009ca7f64
2018-11-27 15:11:04 -08:00
Tao Bao 2abb9fdc54 Update README.md.
The `ResourceTest` mentioned in the doc has been moved into
recovery_component_test in commit
6b28f05c5b.

Since Q, `/sbin/adbd` has been relocated to `/system/bin/adbd`. And `adb
shell` no longer requires mounting /system first, because
`/system/bin/sh` has been included in recovery image.

Test: N/A
Change-Id: I72029a6c8bfaac7a17c0a526a3c511de19356baa
2018-11-27 13:47:13 -08:00
Tao Bao dd78982d58 minui: GRSurface::Create() computes data_size on its own.
GRSurface::Create() doesn't need to rely on caller specifying the buffer
size, as it can compute that info based on the given args.

This CL also uses `size_t` for all the parameters in
GRSurface::Create().

Test: Run recovery_unit_test on marlin.
Test: Build and boot into blueline recovery. `Run graphics test`.
Test: Build and boot into blueline charger mode.
Change-Id: Idec9381079196abf13553a475006fefcfca10950
2018-11-26 22:46:19 -08:00
Tao Bao 1166fd1855 Merge "minui: Fix a wrong arg in calling GRSurface::Create()."
am: ea4ec3149b

Change-Id: Ic593ecc63dd840ae2927420d60158f0dbf0ecbb2
2018-11-26 21:05:55 -08:00
Tao Bao ea4ec3149b Merge "minui: Fix a wrong arg in calling GRSurface::Create()." 2018-11-27 04:52:56 +00:00
Tao Bao 2201d08f8d minui: Fix a wrong arg in calling GRSurface::Create().
This is a bug introduced while refactoring init_display_surface(), in
[1]. As a result, user of res_create_multi_display_surface(), which is
effectively `charger` right now, crashes due to buffer overrun.

This CL fixes the wrong arg and adds a sanity test for
res_create_multi_display_surface(). The testdata (battery_scale.png) is
copied from system/core/healthd/images/battery_scale.png.

[1] commit 44820ac1e3.

Bug: 119122296
Test: Run recovery_unit_test on marlin.
Test: Build and boot into charger mode on blueline. Verify that
      `charger` no longer crashes.
Change-Id: Ib6d083e1512a9c3c6eb63874d26d22658921d693
2018-11-26 17:06:53 -08:00
Tianjie Xu 5e789287d4 Merge changes I7b7cee68,I07d22c0d
am: fb8a636a2d

Change-Id: I859acad650b34e6038034ecd8dd42d899eb40281
2018-11-26 14:15:08 -08:00
Tianjie Xu fb8a636a2d Merge changes I7b7cee68,I07d22c0d
* changes:
  ImageGenerator: add an option to specify the supported locales
  Handle rendering problem for the word "Android" and punctuations
2018-11-26 22:03:29 +00:00
Tianjie Xu 7b636b64a1 ImageGenerator: add an option to specify the supported locales
A smaller list of locales helps to reduce the size of the generated
images; and mitigate the additional space requirement on the tight boot
image for some devices. The caller of the program will be responsible
for providing the locale list.

Also add a verbose option and switch to logger.

Bug: 74397117
Test: generate and check the image
Change-Id: I7b7cee681ccdc6e13fdd0575cf02f8add2ad9a2d
2018-11-26 10:44:24 -08:00
Tianjie Xu 542c617883 Handle rendering problem for the word "Android" and punctuations
The word "Android" is not translated. As a result, some locales fail to
render this word and some punctuations, leading to holes in the middle
of the text. In these cases, we will need to fall back to the default font
and re-measure the text width.

For now, we haven't handled the mix of latin and logogram languages; and
we can blacklist the problematic ones first.

Bug: 74397117
Test: generate and inspect the image
Change-Id: I07d22c0dae2e31eb74f2954e354cd39a42c22f14
2018-11-26 10:44:24 -08:00
Jaegeuk Kim 04630e738e Merge "uncrypt: write permission for f2fs_pin_file"
am: d65cde7c5a

Change-Id: Ied103fbb17b2f55bfad327440eec22c459285059
2018-11-22 01:54:26 -08:00
Jaegeuk Kim d65cde7c5a Merge "uncrypt: write permission for f2fs_pin_file" 2018-11-22 09:34:33 +00:00
Jaegeuk Kim 91e631d4dd make_f2fs: use -g android by default
Bug: 119875846
Change-Id: Ibff18ea6f92620852222fff4073379ec8afd0e10
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-11-21 12:53:09 -08:00
Jaegeuk Kim 051b9d87e2 uncrypt: write permission for f2fs_pin_file
We need a write permission to set a flag in the file.

Change-Id: I4896ecbe0fc04374e01d006b1c8acdb932e5d16d
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-11-21 12:52:29 -08:00
Tianjie Xu 74fa7cd1d9 Merge "Delete the dumpkey host tool"
am: 14d5540426

Change-Id: Ie3be5a201b8ef98ce936e9f0904c72667fa21dc0
2018-11-20 18:13:40 -08:00
Tianjie Xu f1cb8dbdee [automerger skipped] Merge "Import translations. DO NOT MERGE"
am: d01f664cae  -s ours

Change-Id: Ia12ae9d3a41efabfeb34adae7bddc21296bbcd0b
2018-11-20 18:09:29 -08:00
Tianjie Xu 14d5540426 Merge "Delete the dumpkey host tool" 2018-11-21 01:45:39 +00:00
Tianjie Xu d01f664cae Merge "Import translations. DO NOT MERGE" 2018-11-21 01:45:22 +00:00
Yifan Hong 5f16d61150 Merge "logical -> dynamic partitions."
am: b22bd959e5

Change-Id: I1a22ef028bd75ffd7595a378ef48451c2779d5ae
2018-11-16 15:56:38 -08:00
Treehugger Robot b22bd959e5 Merge "logical -> dynamic partitions." 2018-11-16 23:35:28 +00:00
Yifan Hong d17174c3e5 logical -> dynamic partitions.
Reflect a name change.
Test: boots
Test: boot into recovery
Bug: 119286600

Change-Id: I7c323f27574ce033b8fc1750aab00f7300c5cc84
2018-11-16 12:56:44 -08:00
Bill Yi 967d4ac73c Import translations. DO NOT MERGE
Change-Id: I1bd6d7f12c7bfffb7e022f09347a5be5a96766a3
Auto-generated-cl: translation import
2018-11-15 16:16:39 -08:00
Mark Salyzyn 838cac4798 Merge "switch to using android-base/file.h instead of android-base/test_utils.h"
am: 814c306106

Change-Id: I8a039d9fc8c602a44825d871b1b7800aa7754ffd
2018-11-15 08:09:56 -08:00
Treehugger Robot 814c306106 Merge "switch to using android-base/file.h instead of android-base/test_utils.h" 2018-11-15 15:59:45 +00:00
Josh Gao 421a39e271 Merge "minadbd: track adb C++ version change."
am: b67811dd49

Change-Id: I5ed644ad8dcd1929599520ccca11e5dd75f84db0
2018-11-15 01:01:40 -08:00
Josh Gao b67811dd49 Merge "minadbd: track adb C++ version change." 2018-11-15 08:48:11 +00:00
Tianjie Xu f565ebb45f Merge "Adjust the background text image width to reduce its size"
am: 4ef9cb27eb

Change-Id: I133fcc25bf6995f848ddb602a779fecc85eed67f
2018-11-14 22:01:17 -08:00