Commit Graph

9577 Commits

Author SHA1 Message Date
big biff cbd8cc5e06 Merge "Add option to use ro.serialno for generating device id" into android-9.0 2018-12-24 01:45:46 +01:00
Vladimir Oltean 4780286346 prebuilt: resolve libext2_misc.so dependency for mke2fs
* Following error while running mke2fs in TWRP compiled in 8.1+ tree:
   libc: CANNOT LINK EXECUTABLE "mke2fs": library "libext2_misc.so" not found

Change-Id: I786f325229167dbd0d1d5f2a1ea95e9fe15a227e
Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
2018-12-23 05:57:20 +01:00
Tianjie Xu 81d8e2e4dd Merge "Add a horizontal line at the end of the graphic menu" am: fc0665c701 am: 095b6858dd
am: 2c08607e2b

Change-Id: Ifb475bfea51936e08a1f9629ad03772ec04f06ad
2018-12-21 11:24:01 -08:00
Tianjie Xu 2c08607e2b Merge "Add a horizontal line at the end of the graphic menu" am: fc0665c701
am: 095b6858dd

Change-Id: I7719a231cf36730e3a2998c9142cdf002c6e5dda
2018-12-21 11:15:58 -08:00
Tianjie Xu 095b6858dd Merge "Add a horizontal line at the end of the graphic menu"
am: fc0665c701

Change-Id: Idba56caeb2f002864ca2325fb5f130d3e25c2acc
2018-12-21 11:10:52 -08:00
Tianjie Xu fc0665c701 Merge "Add a horizontal line at the end of the graphic menu" 2018-12-21 19:00:47 +00:00
Ethan Yonker 6b3bdfd6fa Include weaver library in 9.0 trees
Change-Id: I0e05e29b43c748d7746dc70428a4eb7664b7d2d4
2018-12-21 11:54:57 -06:00
Tao Bao 955cf2404d Merge "Clean up the arg setup for exec(3)." am: f0c03e62a2 am: 1b94d3a35b
am: 96e1f45c5d

Change-Id: I757b93896adb730e5b4c44c976142cdd6de29c42
2018-12-20 14:57:27 -08:00
Tao Bao 96e1f45c5d Merge "Clean up the arg setup for exec(3)." am: f0c03e62a2
am: 1b94d3a35b

Change-Id: I0423c5476723a6d7e8687ae62d01dca24e256d41
2018-12-20 14:53:19 -08:00
Tao Bao c674dfb584 Use dynamically linked f2fs executables.
It also reduces the space cost for devices using f2fs (e.g. crosshatch).
/sbin/mkfs.f2fs   722560 => /system/bin/make_f2fs   49568
/sbin/sload.f2fs 1182456 => /system/bin/sload_f2fs 150032

Test: Build and boot recovery on crosshatch. Factory reset.
Test: Install a non-A/B OTA package that formats a f2fs partition.
Change-Id: Ibe70c8d91a1d07e1c78ff9eac19b1f7955800161
2018-12-20 14:47:11 -08:00
Tao Bao 1b94d3a35b Merge "Clean up the arg setup for exec(3)."
am: f0c03e62a2

Change-Id: I402eae7a950f10e3ceb99291db07e68dd91861e1
2018-12-20 14:36:02 -08:00
Tao Bao f0c03e62a2 Merge "Clean up the arg setup for exec(3)." 2018-12-20 22:10:07 +00:00
xunchang c7dbc735d2 Add a horizontal line at the end of the graphic menu
This is in line with the old behavior and the UI of TextMenu.

Bug: 121280655
Test: check the menu
Change-Id: I4b82b93187b2d02cfe5b31a9a8fb621d10dd5d8a
2018-12-20 11:36:55 -08:00
Tao Bao 3d69f0df96 Clean up the arg setup for exec(3).
Test: Build and boot into recovery on marlin. Factory reset.
Test: Build and install a non-A/B OTA that calls format.
Change-Id: I72416e775e237fc15ca5eff1036175a9eef43b76
2018-12-20 10:46:06 -08:00
Yifan Hong 26fee0f796 Merge changes from topic "vintf_object_recovery_mount" am: 82fc6ae5b8 am: cc6eb0ee44
am: 081c05f395

Change-Id: Ia3de886ae5a7eb7a0549b224bc0c031501f688dc
2018-12-19 15:26:20 -08:00
Yifan Hong a256631c4d Move parts of roots.cpp to libfs_mgr am: 0f339e27bb am: 6e232ed3ce
am: a15b8d368d

Change-Id: I829c7d19393c181a37923620c05561e46f089060
2018-12-19 15:26:05 -08:00
Yifan Hong 081c05f395 Merge changes from topic "vintf_object_recovery_mount" am: 82fc6ae5b8
am: cc6eb0ee44

Change-Id: I8cf4a096c15d6ec8fc9239807c1b0fa698c25d36
2018-12-19 14:34:41 -08:00
Yifan Hong a15b8d368d Move parts of roots.cpp to libfs_mgr am: 0f339e27bb
am: 6e232ed3ce

Change-Id: I0bee9493d0fe53fe4fd5150b9e81b295eefb4f70
2018-12-19 14:34:21 -08:00
Yifan Hong cc6eb0ee44 Merge changes from topic "vintf_object_recovery_mount"
am: 82fc6ae5b8

Change-Id: I68751cdd1601bac85f4d76de18fb6d2896cb6fa9
2018-12-19 14:27:38 -08:00
Yifan Hong 6e232ed3ce Move parts of roots.cpp to libfs_mgr
am: 0f339e27bb

Change-Id: I8e933cf6fb5361735d51a387102417c2885ee816
2018-12-19 14:27:21 -08:00
Yifan Hong 82fc6ae5b8 Merge changes from topic "vintf_object_recovery_mount"
* changes:
  roots.cpp: convert to C++ Fstab
  Move parts of roots.cpp to libfs_mgr
2018-12-19 22:19:52 +00:00
Yifan Hong 0f339e27bb Move parts of roots.cpp to libfs_mgr
Move some mounting functionalities to libfs_mgr.

Test: run recovery tests

Bug: 118634720
Bug: 113182233

Change-Id: Ie59376664a744992429f0262ec96d13a1aed30f9
2018-12-18 15:57:29 -08:00
Yifan Hong d81b8e3d77 roots.cpp: convert to C++ Fstab
Convert code to use C++ Fstab struct and C++ std::strings.

Bug: 62292478
Bug: 118634720
Test: boots
Change-Id: Ibdc1df5831bc885d7c1574419f41af026e49a137
2018-12-18 15:57:29 -08:00
Zhomart Mukhamejanov faf656f3a7 Merge "Add verification before downloading whole package" am: 2e7393dbde am: e84953e9aa
am: d09708940c

Change-Id: Iffa2427f16444a1d51231caa35f26ae8961439fe
2018-12-17 22:45:34 -08:00
Zhomart Mukhamejanov d09708940c Merge "Add verification before downloading whole package" am: 2e7393dbde
am: e84953e9aa

Change-Id: I71194f48fb58883ab3b64371c4cf9042bf6f84bb
2018-12-17 22:35:27 -08:00
Zhomart Mukhamejanov e84953e9aa Merge "Add verification before downloading whole package"
am: 2e7393dbde

Change-Id: Ib85a3b957d0350122fa7f004f8f7e66667cde742
2018-12-17 22:31:24 -08:00
Zhomart Mukhamejanov 2e7393dbde Merge "Add verification before downloading whole package" 2018-12-18 06:19:59 +00:00
Zhomart Mukhamejanov 7b49244f04 [automerger skipped] Merge "Add PrepareUpdateService." am: 2e33cbeb20 am: 1811a6b734
am: c244b509ff  -s ours

Change-Id: I50fe80fb1eb62325c3c9d9410f5c247108fbf1ca
2018-12-17 14:37:37 -08:00
Zhomart Mukhamejanov c244b509ff Merge "Add PrepareUpdateService." am: 2e33cbeb20
am: 1811a6b734

Change-Id: Ibaf4cb155fe3f7043c53d070e4e05ee3c33b6721
2018-12-17 14:33:35 -08:00
Zhomart Mukhamejanov 1811a6b734 Merge "Add PrepareUpdateService."
am: 2e33cbeb20

Change-Id: I5f62286c5454ab5e44d73e99daad3345c1841024
2018-12-17 14:29:31 -08:00
Zhomart Mukhamejanov c18d488658 Add verification before downloading whole package
UpdateEngine has a feature that verifies
payload without downloading the whole update package.

If UpdateEngine detects invalid payload,
the sample app aborts the update.

No JUnit tests, because it accesses files on the
device and migrating tests to robolectric
is not worth for this sample app.

Bug: 77150191
Test: device
Change-Id: Ib8ce73508a02cf5fdcb326d8ba46c1d05ed5efe5
2018-12-17 14:24:25 -08:00
Zhomart Mukhamejanov 2e33cbeb20 Merge "Add PrepareUpdateService." 2018-12-17 22:19:25 +00:00
Nick Kralevich cc2879d8b6 Merge "use epoll_create1" am: a8d712ec50 am: 649d2d35dc
am: 78f126e5a2

Change-Id: Ia00a035f2d671baabba7c1a2ed89b703e2241c2a
2018-12-17 14:13:29 -08:00
Nick Kralevich 78f126e5a2 Merge "use epoll_create1" am: a8d712ec50
am: 649d2d35dc

Change-Id: I3067b7381fca78ea7ed862f81dee9efac2f69f1b
2018-12-17 14:05:25 -08:00
Tao Bao 4b93ac7427 Merge "applypatch: Fix comparison of integers of different signs." am: dfbdaf3f1d am: acdb8d8d18
am: b78c30c394

Change-Id: I370318961621b8ffb8d5bb53e5d0b991dfc0808d
2018-12-17 14:01:34 -08:00
Nick Kralevich 649d2d35dc Merge "use epoll_create1"
am: a8d712ec50

Change-Id: I9ddf1a6a059db39ad79d45915f43d9ef6cc456a9
2018-12-17 14:01:26 -08:00
Treehugger Robot a8d712ec50 Merge "use epoll_create1" 2018-12-17 21:57:27 +00:00
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
Zhomart Mukhamejanov bc07775393 Add PrepareUpdateService.
It's moved from PrepareStreamingService intent service.
Now PrepareUpdateService takes an UpdateConfig and
builds PayloadSpec for UpdateEngine for both streaming
and non-streaming update.

It allows us to do all preparations in intent service's
thread, without blocking UI.

We will also add checksum verification to
PrepareUpdateService.

Test: device, junit
Bug: 77150191
Change-Id: I15c0bc58e3238bea6ea1c4f13063575e2def89c1
Merged-In: Iea69acd9aa41e17538c26aff60f7598093ca7744
2018-12-17 10:56:28 -08: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
Nick Kralevich 39c53c8ac9 use epoll_create1
epoll_create leaks file descriptors. Use epoll_create1(EPOLL_CLOEXEC)
instead.

Bug: 120983106
Test: compiles and boots
Change-Id: I91f213ebb2dd05330dd25ec1ca1fec59b611e7f2
2018-12-17 08:51:38 -08:00
Zhomart Mukhamejanov 75f4073baf Add PrepareUpdateService.
It's moved from PrepareStreamingService intent service.
Now PrepareUpdateService takes an UpdateConfig and
builds PayloadSpec for UpdateEngine for both streaming
and non-streaming update.

It allows us to do all preparations in intent service's
thread, without blocking UI.

We will also add checksum verification to
PrepareUpdateService.

Test: device, junit
Bug: 77150191
Change-Id: Iea69acd9aa41e17538c26aff60f7598093ca7744
2018-12-14 15:07:22 -08:00
koushik panuganti d5c7fb5e6e Migrate bootable/recovery to androidx.test
See go/jetpack-test-android-migration

Test: make checkbuild
Change-Id: I0740a2205e6b3893ba292cd841592ea85071eefb
2018-12-12 11:29:34 -08:00
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