Commit Graph

5805 Commits

Author SHA1 Message Date
Tao Bao 488e2c1e84 Merge "Expose PngHandler via resources.h." am: 3c8fdf3274
am: c41aba80b7

Change-Id: Iabf5238f7f150ab721d402b7c4ab6efd77430a11
2018-04-14 16:23:39 -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 3d59e50db5 Merge "minadbd: track signature change of service_to_fd." am: 5ac8cfe1ed
am: 959f010f7b

Change-Id: If8f891253b4bef9e7264f28cdd79108c3e4d8d42
2018-04-14 16:03:26 -07:00
Josh Gao 4c997ef293 Merge "minadbd: track signature change of service_to_fd." into pi-dev
am: eacb9c0697

Change-Id: I863f450cffc2c86b0f2c4a5bdf3b9958355a5dea
2018-04-14 15:55:40 -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 eacb9c0697 Merge "minadbd: track signature change of service_to_fd." into pi-dev 2018-04-14 15:33:14 +00:00
Treehugger Robot 3c8fdf3274 Merge "Expose PngHandler via resources.h." 2018-04-14 01:04:35 +00:00
Josh Gao 84c82a8142 minadbd: track signature change of service_to_fd.
Bug: http://b/37066218
Bug: http://b/71898863
Test: treehugger
Change-Id: I5f2b14c65cff8d41dd3230d78b87e3e27e489bf6
(cherry picked from commit 570b08b790)
2018-04-13 17:49:10 -07: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 a1d89277dd Merge "Remove the old log files if cache space is insufficient for OTA" am: 0b3e25719d
am: 8982db6ae1

Change-Id: I2d4aa22d3d77add42a99cfdf8610e172640d40a9
2018-04-13 13:37:23 -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 ae53bb66ca Merge "recovery: enable fsverity feature bit" into pi-dev
am: 257dd337da

Change-Id: I1a7ebb46cdcb32952d4033916b19f41ba91a4689
2018-04-10 21:07:28 -07:00
TreeHugger Robot 257dd337da Merge "recovery: enable fsverity feature bit" into pi-dev 2018-04-11 03:59:58 +00:00
Pirama Arumuga Nainar 9e76ce0ad6 Use the non-LTO, non-PGO version of libhwbinder
am: 2ca4a403e7

Change-Id: Ic2cf355dd9faa2ed1c04f2673a41974df2c9f4a9
2018-04-10 11:29:27 -07:00
Pirama Arumuga Nainar 2ca4a403e7 Use the non-LTO, non-PGO version of libhwbinder
Bug: http://b/77320844

Android.mk doesn't have support for PGO either.  This causes linker
error (about missing __llvm_profile symbols) in the PGO-instrumentation
enabled builds in the release branch.

Test: m ANDROID_PGO_INSTRUMENT=ALL
Change-Id: Ib5dfdea88073bd95da2cd02e92c85bfffcca80d6
2018-04-09 17:43:25 +00:00
Yi Kong bbb5b84c51 Merge "Use non-LTO variant of libhwbinder" into pi-dev
am: 7fdb6355e4

Change-Id: Ib78dee41815c782e0377d2e1fcb3754010ec8bb2
2018-04-06 13:36:38 -07:00
TreeHugger Robot 7fdb6355e4 Merge "Use non-LTO variant of libhwbinder" into pi-dev 2018-04-06 20:25:02 +00:00
Jaegeuk Kim 2e5dc84d51 recovery: enable fsverity feature bit
Bug: 74604441
Bug 67380979
Change-Id: Iab1cc9aef356f0ddf6e2491578a2bd53009182ce
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-04-06 10:17:47 -07:00
Jaegeuk Kim deb83911b0 install: mkfs.f2fs: specify sector size for target image size
am: 1224544806

Change-Id: If7019ce86b3936534bb9db6d33135c3c9d3028fd
2018-04-05 10:20:24 -07:00
Jaegeuk Kim 975cecfeec Merge "install: mkfs.f2fs: specify sector size for target image size" am: ea8a6a9af2
am: 70ac7ea78f

Change-Id: Iac2bc863bbca439de0df116c6b4a026744ca228b
2018-04-05 00:03:51 -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 16b428c71a [automerger skipped] f2fs: support f2fs by setting unmovable bit for package file
am: 848f227eea  -s ours

Change-Id: Id41502973521789f22aff6fe7a63602a67c75833
2018-04-04 22:20:55 -07: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 1224544806 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:14:01 -07:00
Jaegeuk Kim 848f227eea f2fs: support f2fs by setting unmovable bit for package file
This enables to use uncrypt for f2fs update-on-reboot.
It requires kernel patch named:
    "f2fs: add an ioctl to disable GC for specific file"

If any operation fails during uncrypt, please delete package file as soon as
possible, and create the file again to move forward. IOWs, don't leave the
package file for a long time.

Bug: 70309376
Bug: 30170612
Change-Id: I3b4233e7da756f107be35364521699deaf2e7139
Merged-In: I3b4233e7da756f107be35364521699deaf2e7139
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-04-04 19:28:15 -07:00
Jaegeuk Kim 66bb1f3743 [automerger skipped] mkfs.f2fs: specify sector size for target image size
am: 4358262b75  -s ours

Change-Id: I5671b3decf3d6d712b46ca6b7c1ea432edb147a0
2018-04-04 16:48:48 -07:00
Jaegeuk Kim 4358262b75 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
Merged-In: I3392646648264ad1ca78e4b87240edc9385a0cc4
Reported-by: katao@xiaomi.com
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-04-04 14:26:23 -07:00
Jaegeuk Kim 21293778f3 Merge "mkfs.f2fs: specify sector size for target image size" am: 81c3c4a319
am: fc0f970c93

Change-Id: I6c7065aeb42a4a9b4593e75ecfdb723c9971d37d
2018-04-04 14:01:54 -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
Yi Kong 10b3faa10d Use non-LTO variant of libhwbinder
... as a workaround for build system does not currently infer non-LTO
usage from Android.mk.

Test: m
Bug: 77320844
Change-Id: I6e9954b895051cc20408a30d0761e164e4c5bfd9
2018-04-03 12:45:45 -07:00
Tao Bao 08d3e83822 Merge "tests: Pick up testdata with LOCAL_TEST_DATA." am: 6b6c21af28
am: 8028dc1ce4

Change-Id: I9d6258917eb02d8d6ba8215489cef87e5974efc0
2018-04-03 00:25:40 +00: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 f533e4adfd Merge "Do not skip the update installation if it's a retry" am: e566168c94
am: 2e0ac38d40

Change-Id: I6d9407a9a445643086caf2fd56cfbf7518524c0f
2018-04-02 23:49:58 +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 088fd03bb3 Merge "Create the SystemUpdate activity class." am: c506482abc
am: c974a1f404

Change-Id: I81d10926a3aab3a5b25c64ac7975f46fc1615ec3
2018-04-02 18:30:51 +00: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 8c749a39bd Merge "Move a few modules to Soong." am: d408a865af
am: 47be7bcdba

Change-Id: Iba006e5a0df67382f258d1ba60728f4c54003360
2018-04-02 18:14:21 +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