PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,343 Commits 1 Branch 0 Tags
07911574249f637df015bca00998ec0c0f7c56db
Commit Graph

7343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianjie Xu 0791157424 Merge "Show wipe data confirmation text in recovery mode" am: c456aab7e2 am: 608acc9ca2 
am: 9d59cecdf9

Change-Id: I7d67ab6601b3756ef59ca034446d2fa27ed125af
 2018-12-11 16:19:08 -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
Bill Yi 6e186a155f [automerger skipped] Import translations. DO NOT MERGE am: 00ab5cd4f7 -s ours 
am: b15357267f  -s ours

Change-Id: I06cacb795cfaca029e65e1d593b290efa57c32b9
 2018-12-11 15:59:49 -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 a6a0031a0c [automerger skipped] Import translations. DO NOT MERGE 
am: 2f6ed69b53  -s ours

Change-Id: Idfa442e3aeeea9866bd38c7b18ae8311c5051368
 2018-12-11 14:50:30 -08: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 a96d2db281 Merge "tests: Temporarily disable ScreenRecoveryUITest tests." am: ceab300864 am: f68cf7c34f 
am: 073815431d

Change-Id: If6e7e107ed257f756315b0990214b4396d3cf35d
 2018-12-07 08:49:14 -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 c2d87abbe2 Merge changes Id946ab1c,Ifacd01d6 am: 5de42a592a am: 211fe93f19 
am: b69ddfd904

Change-Id: I330b5b3f7064e66ceeff067d1eb7cd88c66b6d59
 2018-12-06 10:14:14 -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 e6f2b1eb92 Merge "Move some small users of fstab to new C++ Fstab" am: 62040c53e0 am: 94b3574440 
am: c4bd945988

Change-Id: I4327822aedf8ed0d728c628796c125118e1e8f76
 2018-12-04 17:06:25 -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 713313d8ed Merge "C++17 is the default now." am: 8fc15c02bd am: 9f909492c0 
am: 4d371e77e1

Change-Id: Ib647755e7a1d69bf60368605a28c7aedb5bf39c7
 2018-12-03 15:07:03 -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 84e9e60b0f Merge "Fix ensure_path_mounted_at for fsck_unshare_blocks" am: a37aa092c7 am: ec6d0626f4 
am: 7cd9030196

Change-Id: Idf3f1debec141803cd821ba22b3ea036c3daf938
 2018-11-30 22:31:39 -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 e633849dc9 Merge "ImageGenerator: ignore the duplicate locales" am: 7846823125 am: af36438170 
am: f502a8c979

Change-Id: I9768e7f3ced5464feea8cfac6f2e16d646de0a31
 2018-11-30 20:29:20 -08: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 07add44f94 Merge "SYSTEM_ROOT -> get_system_root" am: cbfeb7f6af am: fe00ae099c 
am: 0a53c37bce

Change-Id: If663408b4bcae5113403cbf06fe0d076bbc510f3
 2018-11-30 14:45:09 -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 319a6fe190 Merge "Update for long long -> off64_t for fstab.length" am: 1f66578d6f am: 21197a7f2b 
am: 80dbb1d979

Change-Id: Ibcd8149344937845e3a43a301f72fc44643910a6
 2018-11-30 09:05:42 -08: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