Commit Graph

5760 Commits

Author SHA1 Message Date
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
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 4e12cd95be Merge "Create folder for SystemUpdate sample app." am: f0e2811092
am: c6152041fd

Change-Id: I48ec477c7e4bc0dea32bfe89032fefee75d30c16
2018-03-31 15:48:35 +00: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 34f593b84c Merge "Remove the obsolete mkfont.c and font_10x18.h" am: 8b9faa0008
am: dea56f6531

Change-Id: Ib41259ebcdb59e9ceb58cc641b6ecb1a137fdc63
2018-03-30 17:58:37 +00: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 2991503f86 [automerger skipped] Merge "Specify a default module for TARGET_RECOVERY_UI_LIB." am: 9010493189
am: 1da2937623  -s ours

Change-Id: I1bebe4afbcc4e47860f13c82cea5bfc18e90ca7a
2018-03-27 04:46:34 +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
Tao Bao f7e8012be3 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
(cherry picked from commit 73fd036be8c7563423be0c3adbd4205c4f1bc2f5)
2018-03-26 15:26:34 -07:00
Tianjie Xu d956b6328e [automerger skipped]Merge "Factor out a menu class for screen ui" am: 549695ae65
am: baf619c21c  -s ours

Change-Id: Ifad3c7245cbf8770825f1ca3919ccd9169bf5f18
2018-03-24 17:14:24 +00: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
Tianjie Xu 5fe5eb67ef Factor out a menu class for screen ui
Also consolidate the duplicate codes to draw the menu in ScreenRecoveryUI
and WearRecoveryUI. This helps us to support text icons as menu in the
future.

Bug: 74397117
Test: Check the menu under recovery on bullhead and a wear device.
Change-Id: Iba9b646c3828670f0e78a7e07d1a94a44e96bb0b
Merged-In: Iba9b646c3828670f0e78a7e07d1a94a44e96bb0b
2018-03-23 23:57:29 -07:00
Tianjie Xu ba0460c981 Factor out a menu class for screen ui
Also consolidate the duplicate codes to draw the menu in ScreenRecoveryUI
and WearRecoveryUI. This helps us to support text icons as menu in the
future.

Bug: 74397117
Test: Check the menu under recovery on bullhead and a wear device.
Change-Id: Iba9b646c3828670f0e78a7e07d1a94a44e96bb0b
(cherry picked from commit 2b3f80068e)
2018-03-24 01:20:10 +00:00
Tao Bao 6dae8eb10f Merge "update_verifier: Support verifying product partition." am: ab8d782bd4
am: 7ce215d3b9

Change-Id: Iee7aef0972893e6921842a1adebb5ab69411279f
2018-03-23 23:32:47 +00:00
Tao Bao 4ca9f2dfe5 update_verifier: Support verifying product partition.
am: 454d8cb805

Change-Id: If2bed415b3e0683355656956c7d64633402faafa
2018-03-23 23:17:40 +00:00
Tao Bao 7ce215d3b9 Merge "update_verifier: Support verifying product partition."
am: ab8d782bd4

Change-Id: Ic82da883b35d70cdd3f28e299fd2bc6fa4a4108a
2018-03-23 23:11:04 +00:00
Treehugger Robot ab8d782bd4 Merge "update_verifier: Support verifying product partition." 2018-03-23 22:53:55 +00:00
Tao Bao 454d8cb805 update_verifier: Support verifying product partition.
We have added the support for building /product partition in build
system (the CL in [1]), where /product is an optional partition that
contains system files. This CL adds the matching support if /product
needs to be verified during A/B OTA (i.e. listed in care_map file).

[1]: commit b7735d81054002961b681f4bdf296d4de2701135,
https://android-review.googlesource.com/c/platform/build/+/598454

Bug: 63974895
Test: Run update_verifier test on walleye.
Change-Id: Ia1c35e9583b8e66c98a4495b1f81a5ea7e65036f
(cherry picked from commit ec2e8c6c1e)
2018-03-23 13:27:53 -07:00
Tao Bao ec2e8c6c1e update_verifier: Support verifying product partition.
We have added the support for building /product partition in build
system (the CL in [1]), where /product is an optional partition that
contains system files. This CL adds the matching support if /product
needs to be verified during A/B OTA (i.e. listed in care_map file).

[1]: commit b7735d81054002961b681f4bdf296d4de2701135,
https://android-review.googlesource.com/c/platform/build/+/598454

Bug: 63974895
Test: Run update_verifier test on walleye.
Change-Id: Ia1c35e9583b8e66c98a4495b1f81a5ea7e65036f
2018-03-23 11:41:32 -07:00
Jaegeuk Kim 327ff66b03 Merge "f2fs: support f2fs by setting unmovable bit for package file" am: 28dcad554c
am: a0e2a1aa8b

Change-Id: I970e5c063b180dd2fe263768da7835c2a6be5986
2018-03-22 22:04:24 +00:00
Jaegeuk Kim a0e2a1aa8b Merge "f2fs: support f2fs by setting unmovable bit for package file"
am: 28dcad554c

Change-Id: I384f340e4828489861f1c71d5a78501088e83794
2018-03-22 21:56:50 +00:00
Jaegeuk Kim 28dcad554c Merge "f2fs: support f2fs by setting unmovable bit for package file" 2018-03-22 21:40:44 +00:00
Jaegeuk Kim b6e6ee7587 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
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-03-22 12:10:08 -07:00
Tao Bao 210f83b537 tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test.
am: d26f95287a  -s ours

Change-Id: Id1f3d58c9c042b7e553f9b6a6d3fc9b534ed699c
2018-03-21 04:09:07 +00:00
Tao Bao 58cbc132c0 Merge "tests: Split ApplyPatchModesTest.PatchModeEmmcTarget." am: e0b05ba553
am: 40bfff9159

Change-Id: Ib00d162d764fbeb8df6839d560f40ff940522a65
2018-03-20 20:09:02 +00:00
Tao Bao 40bfff9159 Merge "tests: Split ApplyPatchModesTest.PatchModeEmmcTarget."
am: e0b05ba553

Change-Id: I364efba52bcd866f0ab1970a67df6c828c01e0f6
2018-03-20 20:03:33 +00:00
Treehugger Robot e0b05ba553 Merge "tests: Split ApplyPatchModesTest.PatchModeEmmcTarget." 2018-03-20 19:56:04 +00:00
Tao Bao e3499f902e tests: Split ApplyPatchModesTest.PatchModeEmmcTarget.
We have been seeing flakiness in continuous test, but unable to
reproduce locally. Break it down into smaller units to narrow down the
cause.

Bug: 67849209
Test: Run recovery_component_test on marlin.
Change-Id: Ia24b0c5d137bad27d502575fcd18d3ca9c9828b6
2018-03-20 10:38:17 -07:00
Tao Bao d26f95287a tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test.
/system/bin/applypatch on device is expected to work with bsdiff based
recovery-from-boot patch automatically. Adding a test to ensure that's
always the case.

Bug: 72731506
Test: Run recovery_component_test on marlin.
Change-Id: I56283cd3ce7cf0215cc3bb3619b206fa01d552c4
Merged-In: I56283cd3ce7cf0215cc3bb3619b206fa01d552c4
(cherry picked from commit d612b23dfd)
2018-03-20 11:38:16 +08:00
Yifan Hong 3a44daa7d6 recovery: add libhidl-gen-utils depedency
am: 91b48f9161  -s ours

Change-Id: I9382220ddfd68b9a43c8150eff1ebe18eee63267
2018-03-13 21:18:17 +00:00
Yifan Hong 91b48f9161 recovery: add libhidl-gen-utils depedency
introduced as a depedency to libvintf.

Test: builds
Bug: 73556059
Change-Id: Ia51ba81ef462879481dcacb80d9ea9ea35e8b0bb
Merged-In: Ia51ba81ef462879481dcacb80d9ea9ea35e8b0bb
2018-03-13 10:56:51 -07:00
Tao Bao bda3d90ae5 Merge "tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test." am: 3537a2659e
am: 20d9c8ea5a

Change-Id: I06046d1c6b4c85ba4040692759a39951c01fd557
2018-03-13 16:09:19 +00:00
Tao Bao 20d9c8ea5a Merge "tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test."
am: 3537a2659e

Change-Id: I34a71d1a294bad5dd110be63a9d5a0cf746c8491
2018-03-13 16:02:47 +00:00
Treehugger Robot 3537a2659e Merge "tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test." 2018-03-13 15:48:33 +00:00
Tao Bao d612b23dfd tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test.
/system/bin/applypatch on device is expected to work with bsdiff based
recovery-from-boot patch automatically. Adding a test to ensure that's
always the case.

Bug: 72731506
Test: Run recovery_component_test on marlin.
Change-Id: I56283cd3ce7cf0215cc3bb3619b206fa01d552c4
2018-03-12 21:21:41 -07:00
Yifan Hong 584c52a0a1 Merge "recovery: add libhidl-gen-utils depedency" am: fc39f3ffd7
am: da5bb13507

Change-Id: I9811a65335a51006593a332f276deddf1bbf1864
2018-03-12 21:13:58 +00:00
Yifan Hong da5bb13507 Merge "recovery: add libhidl-gen-utils depedency"
am: fc39f3ffd7

Change-Id: I059487aa0a6e1d569bb59f088670082987dc1fb6
2018-03-12 21:07:58 +00:00