073815431d
Merge "tests: Temporarily disable ScreenRecoveryUITest tests." am: ceab300864
...
am: f68cf7c34f
2018-12-07 08:45:08 -08:00
f68cf7c34f
Merge "tests: Temporarily disable ScreenRecoveryUITest tests."
...
am: ceab300864
2018-12-07 08:41:01 -08:00
ceab300864
Merge "tests: Temporarily disable ScreenRecoveryUITest tests."
2018-12-07 16:31:18 +00:00
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
b69ddfd904
Merge changes Id946ab1c,Ifacd01d6 am: 5de42a592a
...
am: 211fe93f19
2018-12-06 10:07:02 -08:00
211fe93f19
Merge changes Id946ab1c,Ifacd01d6
...
am: 5de42a592a
2018-12-06 10:03:05 -08:00
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
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
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
c4bd945988
Merge "Move some small users of fstab to new C++ Fstab" am: 62040c53e0
...
am: 94b3574440
2018-12-04 17:01:23 -08:00
94b3574440
Merge "Move some small users of fstab to new C++ Fstab"
...
am: 62040c53e0
2018-12-04 16:53:20 -08:00
62040c53e0
Merge "Move some small users of fstab to new C++ Fstab"
2018-12-05 00:36:14 +00:00
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
4d371e77e1
Merge "C++17 is the default now." am: 8fc15c02bd
...
am: 9f909492c0
2018-12-03 14:43:14 -08:00
9f909492c0
Merge "C++17 is the default now."
...
am: 8fc15c02bd
2018-12-03 13:52:56 -08:00
8fc15c02bd
Merge "C++17 is the default now."
2018-12-03 20:42:40 +00:00
31b92a5d75
C++17 is the default now.
...
Test: builds
Change-Id: I91923da25f470621189589711c50f3d67e435c68
2018-12-03 09:27:17 -08:00
7cd9030196
Merge "Fix ensure_path_mounted_at for fsck_unshare_blocks" am: a37aa092c7
...
am: ec6d0626f4
2018-11-30 22:26:38 -08:00
ec6d0626f4
Merge "Fix ensure_path_mounted_at for fsck_unshare_blocks"
...
am: a37aa092c7
2018-11-30 22:19:38 -08:00
a37aa092c7
Merge "Fix ensure_path_mounted_at for fsck_unshare_blocks"
2018-12-01 06:00:32 +00:00
f502a8c979
Merge "ImageGenerator: ignore the duplicate locales" am: 7846823125
...
am: af36438170
2018-11-30 20:19:45 -08:00
af36438170
Merge "ImageGenerator: ignore the duplicate locales"
...
am: 7846823125
2018-11-30 20:15:13 -08:00
7846823125
Merge "ImageGenerator: ignore the duplicate locales"
2018-12-01 03:56:10 +00:00
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
0a53c37bce
Merge "SYSTEM_ROOT -> get_system_root" am: cbfeb7f6af
...
am: fe00ae099c
2018-11-30 14:38:41 -08:00
fe00ae099c
Merge "SYSTEM_ROOT -> get_system_root"
...
am: cbfeb7f6af
2018-11-30 14:31:35 -08:00
cbfeb7f6af
Merge "SYSTEM_ROOT -> get_system_root"
2018-11-30 22:07:24 +00:00
80dbb1d979
Merge "Update for long long -> off64_t for fstab.length" am: 1f66578d6f
...
am: 21197a7f2b
2018-11-30 09:01:41 -08:00
21197a7f2b
Merge "Update for long long -> off64_t for fstab.length"
...
am: 1f66578d6f
2018-11-30 08:57:37 -08:00
1f66578d6f
Merge "Update for long long -> off64_t for fstab.length"
2018-11-30 16:33:54 +00:00
45e505a4e9
Update for long long -> off64_t for fstab.length
...
Test: boot
Change-Id: I755a5dd48f1d5be2cbd8e494b9c405674b12cebb
2018-11-29 13:33:07 -08:00
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
2a0f71627e
Merge "ImageGenerator: Handle special characters in xml files" am: 697003dbce
...
am: f2099b7872
2018-11-29 10:51:16 -08:00
f2099b7872
Merge "ImageGenerator: Handle special characters in xml files"
...
am: 697003dbce
2018-11-29 10:46:08 -08:00
697003dbce
Merge "ImageGenerator: Handle special characters in xml files"
2018-11-29 18:28:44 +00:00
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
64cedfe780
Merge "ImageGenerator: switch to BreakIterator from icu library" am: 86936c46a8
...
am: 49ba6fc534
2018-11-28 10:50:35 -08:00
49ba6fc534
Merge "ImageGenerator: switch to BreakIterator from icu library"
...
am: 86936c46a8
2018-11-28 10:46:18 -08:00
86936c46a8
Merge "ImageGenerator: switch to BreakIterator from icu library"
2018-11-28 18:27:58 +00:00
6d43d2be43
Merge "make_f2fs: use -g android by default" am: 4cd38430d7
...
am: f8c230a072
2018-11-27 17:17:45 -08:00
0658beb8f7
Merge "Update README.md." am: c075d688fd
...
am: 096d3205b4
2018-11-27 17:14:35 -08:00
f8c230a072
Merge "make_f2fs: use -g android by default"
...
am: 4cd38430d7
2018-11-27 17:13:59 -08:00
096d3205b4
Merge "Update README.md."
...
am: c075d688fd
2018-11-27 17:10:35 -08:00
4cd38430d7
Merge "make_f2fs: use -g android by default"
2018-11-28 00:57:25 +00:00
c075d688fd
Merge "Update README.md."
2018-11-28 00:50:44 +00:00
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
942d09a99e
Merge "minui: GRSurface::Create() computes data_size on its own." am: a54b883607
...
am: 67a57dbed0
2018-11-27 15:43:46 -08:00
67a57dbed0
Merge "minui: GRSurface::Create() computes data_size on its own."
...
am: a54b883607
2018-11-27 15:39:44 -08:00
a54b883607
Merge "minui: GRSurface::Create() computes data_size on its own."
2018-11-27 23:21:50 +00:00
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
Treehugger Robot
Tom Cherry
Elliott Hughes
Yifan Hong
Tianjie Xu
Jaegeuk Kim