Commit Graph

5548 Commits

Author SHA1 Message Date
Tao Bao
ea70fd7d1d Merge "applypatch: Dump patch info on mismatching patching result."
am: d2c32b281b

Change-Id: Ib43606f5fcd9e238b16b70b6dd519bb38a780dd3
2018-04-19 14:43:48 -07:00
Tao Bao
d2c32b281b Merge "applypatch: Dump patch info on mismatching patching result." 2018-04-19 21:33:30 +00:00
Tao Bao
4f83430471 applypatch: Dump patch info on mismatching patching result.
After splitting the previously flaky
ApplyPatchModesTest#PatchModeEmmcTarget tests,
PatchModeEmmcTargetWithMultiplePatches now becomes the sole victim. This
CL dumps additional info to narrow down the cause.

Bug: 67849209
Test: `recovery_component_test` on marlin.
Test: It dumps additional info after using corrupt bonus.file.
Change-Id: Ic5436de457cc882a51d03f49d5cee70077f7d3df
2018-04-19 12:46:22 -07:00
Zhomart Mukhamejanov
11e31203a6 Merge "Add sample_updater style check to PREUPLOAD.cfg"
am: 73e6644777

Change-Id: I5acb461de5e0af89ffc903363711d9bb0dc05bc1
2018-04-17 18:02:30 -07:00
Zhomart Mukhamejanov
73e6644777 Merge "Add sample_updater style check to PREUPLOAD.cfg" 2018-04-18 00:52:20 +00:00
Zhomart Mukhamejanov
0e007e8edc Add sample_updater style check to PREUPLOAD.cfg
Test: N/A
Change-Id: I13f4295a85d50c0a63cac5680e7a3200b0e6c909
2018-04-17 16:09:31 -07:00
Tao Bao
9adbc572a3 Merge "tests: Move ResourcesTest into component test."
am: 07d0032def

Change-Id: I1e6576ab1ae5eacc70b2cabba8d11b78fbdd88d5
2018-04-16 17:13:38 -07:00
Treehugger Robot
07d0032def Merge "tests: Move ResourcesTest into component test." 2018-04-17 00:00:00 +00:00
Chih-Hung Hsieh
dd2277a9bd Merge "Disable lld where it fails."
am: 0c8eea86f9

Change-Id: I28871cb18da2825e4e6f951fc95debd6dc7225ae
2018-04-16 11:45:09 -07:00
Tao Bao
6b28f05c5b tests: Move ResourcesTest into component test.
Although the tests were initially written for checking the validity of
the text images, it doesn't hurt to run them continuously as part of the
component test (recovery_manual_test requires reboots during the run,
due to the nature of the tests of recovery-{refresh,persist}). This also
allows detecting breaking changes to libminui or libpng.

There's a catch that the ResourcesTest won't be triggered via `atest`,
as the res-* testdata won't be picked up via AndroidTest.xml. Explored
a few options but not addressing that in this CL:
- `atest` is not fully working in AOSP yet (missing support in
  tools/tradefederation/core/atest/atest.py).
- `atest` doesn't allow specifying the testdata with path in the 'push'
  option.
- It won't fail the test run though, as ResourcesTest will skip the
  tests automatically when it finds no text image file.
- APCT and manual `adb sync data` are not affected, and I don't see an
  active user of `atest` other than a tool for manual test invocation.
- Unrelated to this CL, `atest` doesn't seem to work well with
  recovery_component_test or recovery_unit_test while we have both of
  them in one AndroidTest.xml. It randomly triggers only one of them,
  despite of the given test name. When splitting AndroidTest.xml into
  two, it tends to pick up the wrong testdata subdir and gives wrong
  results.

Test: Run recovery_manual_test and recovery_component_test on marlin.
Change-Id: I3a237499a7770356e14085674bc8b9cb4551db85
2018-04-16 11:29:06 -07:00
Treehugger Robot
0c8eea86f9 Merge "Disable lld where it fails." 2018-04-16 18:25:33 +00:00
Chih-Hung Hsieh
83847e6ed9 Disable lld where it fails.
Bug: 77543887
Test: make checkbuild and boot
Change-Id: I4134a8eec592dac347c84cc7dc3f9f99f27bc50c
2018-04-16 09:39:07 -07:00
Tao Bao
c41aba80b7 Merge "Expose PngHandler via resources.h."
am: 3c8fdf3274

Change-Id: I2a120d4250bfb0c32129fd3409c7f1c13f28c20a
2018-04-14 16:08:47 -07:00
Josh Gao
959f010f7b Merge "minadbd: track signature change of service_to_fd."
am: 5ac8cfe1ed

Change-Id: I6e308545ecfcf992f649cf24a8967acf58cea432
2018-04-14 15:55:39 -07:00
Treehugger Robot
3c8fdf3274 Merge "Expose PngHandler via resources.h." 2018-04-14 01:04:35 +00:00
Treehugger Robot
5ac8cfe1ed Merge "minadbd: track signature change of service_to_fd." 2018-04-14 00:43:33 +00:00
Josh Gao
570b08b790 minadbd: track signature change of service_to_fd.
Bug: http://b/37066218
Bug: http://b/71898863
Test: treehugger
Change-Id: I5f2b14c65cff8d41dd3230d78b87e3e27e489bf6
2018-04-13 16:10:34 -07:00
Tao Bao
3d0cd1d036 Expose PngHandler via resources.h.
As a private header for testing purpose. PngHandler additionally loads a
given filename if the one with '/res/images' prefix is not available. It
also provides color_type/bit_depth that are parsed from the PNG file.

This allows reusing the same code for the ResourcesTest (renamed from
ResourceTest).

Test: Run recovery_manual_test on marlin.
Change-Id: I3f939d79a1cb1b83a899847dbe2d51bde15d16d8
2018-04-13 15:25:50 -07:00
Tianjie Xu
8982db6ae1 Merge "Remove the old log files if cache space is insufficient for OTA"
am: 0b3e25719d

Change-Id: I345fe6a906c71776de63a7c782e4ed4b1050c8c0
2018-04-13 13:33:21 -07:00
Tianjie Xu
0b3e25719d Merge "Remove the old log files if cache space is insufficient for OTA" 2018-04-13 20:23:37 +00:00
Tianjie Xu
d5fbcc1ba9 Remove the old log files if cache space is insufficient for OTA
We set the limit of the max stash size to 80% of cache size. But the
cache space can still be insufficient for the update if the log files
occupy a large chunk of /cache. So remove the old logs for now to make
room for the update.

Bug: 77528881
Test: unit tests pass
Change-Id: Ia8bcb0ace11f8164ad9290bfb360e08e31d282cb
2018-04-13 11:33:47 -07:00
Jaegeuk Kim
70ac7ea78f Merge "install: mkfs.f2fs: specify sector size for target image size"
am: ea8a6a9af2

Change-Id: I0effdb5d30cc496d55e2bb722404e07bcd2561e3
2018-04-04 23:56:49 -07:00
Treehugger Robot
ea8a6a9af2 Merge "install: mkfs.f2fs: specify sector size for target image size" 2018-04-05 06:48:17 +00:00
Jaegeuk Kim
fc66f3fbc6 install: mkfs.f2fs: specify sector size for target image size
The total sectors that we want to format is used in different meanings from
various users. This notifies its size based on 512 bytes explicitly.

Bug: 76407663
Change-Id: I20687b40a1733d3b459a45f8b64a338c37a7bc95
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-04-04 21:16:19 -07:00
Jaegeuk Kim
fc0f970c93 Merge "mkfs.f2fs: specify sector size for target image size"
am: 81c3c4a319

Change-Id: Iad81bcd6bb6c078d85cd22dc04bafdf0330fc505
2018-04-04 13:56:22 -07:00
Treehugger Robot
81c3c4a319 Merge "mkfs.f2fs: specify sector size for target image size" 2018-04-04 20:44:28 +00:00
Jaegeuk Kim
f139bb4c56 mkfs.f2fs: specify sector size for target image size
The total sectors that we want to format is used in different meanings from
various users. This notifies its size based on 4096 bytes explicitly.

Bug: 76407663
Change-Id: I3392646648264ad1ca78e4b87240edc9385a0cc4
Reported-by: katao@xiaomi.com
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-04-04 09:14:14 -07:00
Tao Bao
8028dc1ce4 Merge "tests: Pick up testdata with LOCAL_TEST_DATA."
am: 6b6c21af28

Change-Id: Ic66820300efe764cbdeb78daa77ddf7c01c8460f
2018-04-03 00:20:09 +00:00
Treehugger Robot
6b6c21af28 Merge "tests: Pick up testdata with LOCAL_TEST_DATA." 2018-04-03 00:03:34 +00:00
Tianjie Xu
2e0ac38d40 Merge "Do not skip the update installation if it's a retry"
am: e566168c94

Change-Id: I4dde882ce9a1013c0cc371a56981cef5c7f28a29
2018-04-02 23:44:51 +00:00
Tianjie Xu
e566168c94 Merge "Do not skip the update installation if it's a retry" 2018-04-02 23:34:22 +00:00
Tao Bao
9d91e89831 tests: Pick up testdata with LOCAL_TEST_DATA.
Also push the testdata in AndroidTest.xml for `atest`.

LOCAL_TEST_DATA was added in commit [1], which ships testdata next to
native tests.

With this CL,
 1) manually sync-ing via `adb sync` and running tests with `adb shell`
    keep working.
 2) both of 32- and 64-bit recovery_{unit,component}_test now work in
    APCT continuous tests. Note that 64-bit tests were failing
    previously in APCT, due to missing testdata.
 3) `atest recovery_unit_test` works, as the testdata gets pushed to
    /data/local/tmp.

[1] commit d07ba4e2a625a8f000d042c1953adb612bccbbe2 in
https://android-review.googlesource.com/c/platform/build/+/312567.

Bug: 77320514
Test: Build recovery_{unit,component,manual}_test. Setup the test via
      `adb sync data`. Run both of 32- and 64-bit versions on device.
Test: Build and run recovery_host_test on host, for both of 32- and
      64-bit versions.
Test: `atest recovery_component_test`
Change-Id: Ie54037726043a3a659a80030b83db1f8c1de318d
2018-04-02 14:14:29 -07:00
Tianjie Xu
a6f49bd952 Do not skip the update installation if it's a retry
We used to skip the update installation if the battery doesn't reach the
threshold or the boot reason is in blacklist. Afterwards, we just cleared
the BCB and reboot/shutdown the device. However, this leaves the device
in a brick state if the update is a retry; because a subsequent reboot
won't resume the update after the BCB gets cleared.

This CL skips the battery and bootreason check on retries. An alternative
solution is to conduct the check and shutdown the device without clearing the
BCB on INSTALL_SKIPPED; but users who don't have context may reboot the
device manually anyway.

Bug: 65288661
Test: Trigger the INSTALL_SKIPPED with insufficient battery, and check
the behavior with retry_count.

Change-Id: I0bd8ae9cee0e35aeeec3df469a78cec9ee1b8db8
2018-04-02 13:32:02 -07:00
Jiachen Zhao
c974a1f404 Merge "Create the SystemUpdate activity class."
am: c506482abc

Change-Id: I805982a1600f12f0b6e23f9c5a1bafc620ac0e2d
2018-04-02 18:17:05 +00:00
Tao Bao
47be7bcdba Merge "Move a few modules to Soong."
am: d408a865af

Change-Id: I2f02b1ae3c4f3a2895fe49261072f2fd987cc370
2018-04-02 18:10:14 +00:00
Jiachen Zhao
c506482abc Merge "Create the SystemUpdate activity class." 2018-04-02 17:40:45 +00:00
Treehugger Robot
d408a865af Merge "Move a few modules to Soong." 2018-04-02 16:05:37 +00:00
Jiachen Zhao
f39362e184 Create the SystemUpdate activity class.
Test: tested sample app with sideloading.

Change-Id: I0d1661cea57c706b4981a4cda9f9b69fdeb69292
2018-03-31 17:45:21 -07:00
Jiachen Zhao
c6152041fd Merge "Create folder for SystemUpdate sample app."
am: f0e2811092

Change-Id: Ia3b487a5e373cb4f92d07013a2bf161d4cdab5d0
2018-03-31 15:42:00 +00:00
Jiachen Zhao
f0e2811092 Merge "Create folder for SystemUpdate sample app." 2018-03-31 15:28:18 +00:00
Jiachen Zhao
051b968d7b Create folder for SystemUpdate sample app.
Test: no functional changes.

Change-Id: I2e8c654086ca49063c59ae0529e190323c84d6ad
2018-03-30 18:22:36 -07:00
Tianjie Xu
dea56f6531 Merge "Remove the obsolete mkfont.c and font_10x18.h"
am: 8b9faa0008

Change-Id: I4a12317a654effad6e9525982644ef84156bff28
2018-03-30 17:53:01 +00:00
Tianjie Xu
8b9faa0008 Merge "Remove the obsolete mkfont.c and font_10x18.h" 2018-03-30 17:38:37 +00:00
Tianjie Xu
55a2c4eaae Remove the obsolete mkfont.c and font_10x18.h
The font_10x18.h is used as a fall back for fonts if the
$(recovery_font) under bootable/recovery/fonts failed to reload. This
font looks very small on the screen and we haven't used it in a while.
Plus, fonts in header doesn't have many benefits if we support only
ascii characters. So we decide to remove this header along with the mkfont.c
that generates the header.

For reference, here's the steps to use mkfont:
1. Generate a picture of fonts with apps on host
2. Open the pic with GIMP
3. Export the pic as '.c' file, and rename it into '.h' file
4. Compile the generated '.h' file with mkfont.c

Bug: 76420958
Test: build and check the recovery menu on angler
Change-Id: I6c108aa43a07bf4994115ef764275bd84df725e1
2018-03-30 06:42:35 +00:00
Tao Bao
1da2937623 Merge "Specify a default module for TARGET_RECOVERY_UI_LIB."
am: 9010493189

Change-Id: Id44f823329e40a58416c2f02cc029295e66a2898
2018-03-27 04:40:33 +00:00
Tao Bao
d2f2ad6a3c Move a few modules to Soong.
libmounts
librecovery_ui_default
librecovery_ui_wear
librecovery_ui_vr
libverifier
recovery-persist
recovery-refresh

They are all trivially converted.

Test: mmma -j bootable/recovery
Change-Id: Id783b3eec32bd15e74f42df17053732db5666675
2018-03-26 21:35:41 -07:00
Treehugger Robot
9010493189 Merge "Specify a default module for TARGET_RECOVERY_UI_LIB." 2018-03-27 04:28:44 +00:00
Tao Bao
f6d25962bb Specify a default module for TARGET_RECOVERY_UI_LIB.
This aligns the logic between {default,wear,vr}_device.cpp. They all
implement their default make_device() functions, but using different
RecoveryUI variants.

This CL creates a new module librecovery_ui_default that uses
ScreenRecoveryUI, which serves as the default value for
TARGET_RECOVERY_UI_LIB.

Test: lunch aosp_{angler,marlin,dragon,walleye}-userdebug;
      `mmma -j bootable/recovery` respectively.
Change-Id: I6755b09d96e4809bb1c17142895fe1cad95e5a02
Merged-In: I6755b09d96e4809bb1c17142895fe1cad95e5a02
2018-03-26 19:45:06 -07:00
Tianjie Xu
baf619c21c Merge "Factor out a menu class for screen ui"
am: 549695ae65

Change-Id: I926b85b2fecec7e7d21e30b5f21aa7996b641c7f
2018-03-24 17:06:47 +00:00
Tianjie Xu
549695ae65 Merge "Factor out a menu class for screen ui" 2018-03-24 16:53:26 +00:00