Commit Graph

7024 Commits

Author SHA1 Message Date
Tao Bao b78c30c394 Merge "applypatch: Fix comparison of integers of different signs." am: dfbdaf3f1d
am: acdb8d8d18

Change-Id: I29de1277fb4eec55c615c906379c8379ca801a46
2018-12-17 13:48:12 -08:00
Tao Bao acdb8d8d18 Merge "applypatch: Fix comparison of integers of different signs."
am: dfbdaf3f1d

Change-Id: Ic5c55cefd61bc60536a956216ed56d482110a231
2018-12-17 13:35:08 -08:00
Tao Bao dfbdaf3f1d Merge "applypatch: Fix comparison of integers of different signs." 2018-12-17 21:22:41 +00:00
Tao Bao 7ebef8fd40 applypatch: Fix comparison of integers of different signs.
bootable/recovery/applypatch/imgpatch.cpp:57:3: error: comparison of integers of different signs: 'unsigned int' and 'int' [-Werror,-Wsign-compare]
  CHECK_GT(expected_target_length, 0);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

bootable/recovery/applypatch/freecache.cpp:145:50: error: comparison of integers of different signs: 'long' and '__fsblkcnt64_t' (aka 'unsigned long') [-Werror,-Wsign-compare]
  if (sf.f_bsize == 0 || free_space / sf.f_bsize != sf.f_bavail) {
                         ~~~~~~~~~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~
bootable/recovery/applypatch/freecache.cpp:190:16: error: comparison of integers of different signs: 'int64_t' (aka 'long') and 'size_t' (aka 'unsigned long') [-Werror,-Wsign-compare]
  if (free_now >= bytes_needed) {
      ~~~~~~~~ ^  ~~~~~~~~~~~~
bootable/recovery/applypatch/freecache.cpp:233:18: error: comparison of integers of different signs: 'int64_t' (aka 'long') and 'size_t' (aka 'unsigned long') [-Werror,-Wsign-compare]
    if (free_now >= bytes_needed) {
        ~~~~~~~~ ^  ~~~~~~~~~~~~

Test: `mmma -j bootable/recovery/applypatch` with -Wsign-compare
Test: Run recovery_unit_test on marlin.
Change-Id: I4aa1fd0f9b7205b9e4e50874fc4bccb62951e7fe
2018-12-17 10:07:27 -08:00
Tianjie Xu 9d59cecdf9 Merge "Show wipe data confirmation text in recovery mode" am: c456aab7e2
am: 608acc9ca2

Change-Id: I60b84434d54669694523d46c4e854d833306722b
2018-12-11 16:08:25 -08:00
Tianjie Xu 608acc9ca2 Merge "Show wipe data confirmation text in recovery mode"
am: c456aab7e2

Change-Id: Id1dfc9ca935b8d5f88387b55809dd152fe600544
2018-12-11 15:39:19 -08:00
Bill Yi b15357267f [automerger skipped] Import translations. DO NOT MERGE
am: 00ab5cd4f7  -s ours

Change-Id: Ide23d66ac4ba10402828c748b90a59dc02f007e7
2018-12-11 15:29:39 -08:00
Tianjie Xu c456aab7e2 Merge "Show wipe data confirmation text in recovery mode" 2018-12-11 23:24:05 +00:00
Tianjie Xu 1a0a30a16a Show wipe data confirmation text in recovery mode
After we generate the localized confirmation text images for certain dpi,
we can now load these images and display them under recovery. Devices that
cannot load the images will use the backup text strings as before.

Bug: 74397117
Test: check the menu with multiple locales, and check all the images locally
with locale test, check the fall back strings.
Change-Id: Ic31a55670026c909ec7a05cb0bb4a0fc1d5d15c7
2018-12-11 23:23:41 +00:00
Bill Yi 2f6ed69b53 Import translations. DO NOT MERGE
Change-Id: I1bd6d7f12c7bfffb7e022f09347a5be5a96766a3
Cherry-picked from: f560a89470
Test: mma
Auto-generated-cl: translation import
2018-12-11 20:33:09 +00:00
Bill Yi 00ab5cd4f7 Import translations. DO NOT MERGE
Change-Id: I1bd6d7f12c7bfffb7e022f09347a5be5a96766a3
Cherry-picked from: f560a89470
Test: mma
Auto-generated-cl: translation import
2018-12-11 12:30:44 -08:00
Tao Bao 073815431d Merge "tests: Temporarily disable ScreenRecoveryUITest tests." am: ceab300864
am: f68cf7c34f

Change-Id: I1b94e616756c558bfa577fc1638a0de28cbadec7
2018-12-07 08:45:08 -08:00
Tao Bao f68cf7c34f Merge "tests: Temporarily disable ScreenRecoveryUITest tests."
am: ceab300864

Change-Id: I64aa4e6e4c8782ee977c41febf625f3935f06af4
2018-12-07 08:41:01 -08:00
Tao Bao ceab300864 Merge "tests: Temporarily disable ScreenRecoveryUITest tests." 2018-12-07 16:31:18 +00:00
Tao Bao f242a7ec2c tests: Temporarily disable ScreenRecoveryUITest tests.
Seems they're racing with SurfaceFlinger in acquiring the display, which
occasionally takes down the device and leads to test failures.

Bug: 120601844
Test: Run recovery_unit_test on marlin. ScreenRecoveryUITest not
      triggered.
Change-Id: I80b21595247a87fc1f2f95aa68df59f58bdf0257
2018-12-06 13:05:05 -08:00
Tao Bao b69ddfd904 Merge changes Id946ab1c,Ifacd01d6 am: 5de42a592a
am: 211fe93f19

Change-Id: Ia8c69e46c8ca1bd698f9ade1cc7c7259fda54fcb
2018-12-06 10:07:02 -08:00
Tao Bao 211fe93f19 Merge changes Id946ab1c,Ifacd01d6
am: 5de42a592a

Change-Id: I2a6a5d0b6a4a151fa46467608d3aabe2d341004f
2018-12-06 10:03:05 -08:00
Treehugger Robot 5de42a592a Merge changes Id946ab1c,Ifacd01d6
* changes:
  uncrypt: Fix the comparison in FindBlockDevice().
  uncrypt: Replace a few C-strings with std::string.
2018-12-06 17:47:46 +00:00
Tao Bao bb134b2613 uncrypt: Fix the comparison in FindBlockDevice().
Previously it considered a match if the given path (i.e. path to an
update package) fully equals to a mount_point.  For example, `uncrypt
/data block.map` or `uncrypt /vendor block.map` would exit successfully,
without producing a block map.

Test: `uncrypt /path/to/package.zip block.map`
Test: `uncrypt /vendor block.map` fails.
Change-Id: Id946ab1c0b158b623013f89463cbb1960141d8b5
2018-12-05 14:44:32 -08:00
Tao Bao d1670a064d uncrypt: Replace a few C-strings with std::string.
Also use android::base::{Dirname,Realpath,StartsWith}.

Test: Run uncrypt on device (`uncrypt package block.map`).
Change-Id: Ifacd01d6b35d85ea4afcb93a0dbc0235bb765a75
2018-12-05 14:44:24 -08:00
Tom Cherry c4bd945988 Merge "Move some small users of fstab to new C++ Fstab" am: 62040c53e0
am: 94b3574440

Change-Id: Ied287fa138b5b58351d37747e0ae8bd7ced8ef74
2018-12-04 17:01:23 -08:00
Tom Cherry 94b3574440 Merge "Move some small users of fstab to new C++ Fstab"
am: 62040c53e0

Change-Id: I67b07c175d08e5c9166875c9e316831cde425c79
2018-12-04 16:53:20 -08:00
Tom Cherry 62040c53e0 Merge "Move some small users of fstab to new C++ Fstab" 2018-12-05 00:36:14 +00:00
Tom Cherry 772c93ca5c Move some small users of fstab to new C++ Fstab
Bug: 62292478
Test: tree-hugger
Change-Id: Ie2cc10e5168ef3b9dcc42f88e67a1ccd1175fcc5
2018-12-04 11:11:14 -08:00
Elliott Hughes 4d371e77e1 Merge "C++17 is the default now." am: 8fc15c02bd
am: 9f909492c0

Change-Id: Ic872f06bae64f5ee90db002043132a2de7c7ba02
2018-12-03 14:43:14 -08:00
Elliott Hughes 9f909492c0 Merge "C++17 is the default now."
am: 8fc15c02bd

Change-Id: Ifdbf426e445f1527c0f17c2a1e2901c084f8140c
2018-12-03 13:52:56 -08:00
Treehugger Robot 8fc15c02bd Merge "C++17 is the default now." 2018-12-03 20:42:40 +00:00
Elliott Hughes 31b92a5d75 C++17 is the default now.
Test: builds
Change-Id: I91923da25f470621189589711c50f3d67e435c68
2018-12-03 09:27:17 -08:00
Yifan Hong 7cd9030196 Merge "Fix ensure_path_mounted_at for fsck_unshare_blocks" am: a37aa092c7
am: ec6d0626f4

Change-Id: Ie353e86ded08409982b318d430fc6eb0d638c924
2018-11-30 22:26:38 -08:00
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 f502a8c979 Merge "ImageGenerator: ignore the duplicate locales" am: 7846823125
am: af36438170

Change-Id: Idc119188727a1e261d8238db994389597c25635e
2018-11-30 20:19:45 -08: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 0a53c37bce Merge "SYSTEM_ROOT -> get_system_root" am: cbfeb7f6af
am: fe00ae099c

Change-Id: I2def1cab9b23061e62c263dd14c5f1061b0d74d8
2018-11-30 14:38:41 -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 80dbb1d979 Merge "Update for long long -> off64_t for fstab.length" am: 1f66578d6f
am: 21197a7f2b

Change-Id: I70bc51263711a1bd810c7347c5817d0cd1695b18
2018-11-30 09:01:41 -08: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 2a0f71627e Merge "ImageGenerator: Handle special characters in xml files" am: 697003dbce
am: f2099b7872

Change-Id: Ia0b812f6441a712bde8441c742b7777948366042
2018-11-29 10:51:16 -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 64cedfe780 Merge "ImageGenerator: switch to BreakIterator from icu library" am: 86936c46a8
am: 49ba6fc534

Change-Id: I0c1e4302815e271d2262ca2d1807f3fb57c3a589
2018-11-28 10:50:35 -08: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