Commit Graph

5798 Commits

Author SHA1 Message Date
Jaegeuk Kim d0e256b343 Merge "mkfs.f2fs: specify sector size for target image size" am: 81c3c4a319 am: fc0f970c93
am: 21293778f3

Change-Id: I9099fbc7cb2ee2fb8c7e633756622d36f4572248
2018-04-04 14:12:25 -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
Tao Bao 90336bc85e Merge "tests: Pick up testdata with LOCAL_TEST_DATA." am: 6b6c21af28 am: 8028dc1ce4
am: 08d3e83822

Change-Id: I53552e36aeb5fae30ff774d6e19d527e2c6000dc
2018-04-02 18:15:58 -07:00
Tianjie Xu 770ab63945 Merge "Do not skip the update installation if it's a retry" am: e566168c94 am: 2e0ac38d40
am: f533e4adfd

Change-Id: I04c2444eab73519440245e7e22ce7494d0d9085c
2018-04-02 17:52:44 -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 069e5c67ba Merge "Create the SystemUpdate activity class." am: c506482abc am: c974a1f404
am: 088fd03bb3

Change-Id: I869c40afb9ba0a35d48001398c2328afd43570d1
2018-04-02 18:58:35 +00: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
Tao Bao a9db24e7cb Merge "Move a few modules to Soong." am: d408a865af am: 47be7bcdba
am: 8c749a39bd

Change-Id: I806364c500bd8b66a81bedd95c9d4f867d382867
2018-04-02 18:19:39 +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 966fffcd17 Merge "Create folder for SystemUpdate sample app." am: f0e2811092 am: c6152041fd
am: 4e12cd95be

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

Change-Id: I8a5fd6e43bd53c6c1da8d23e94ee357a23ab3d69
2018-03-30 20:55:50 +00: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 9ce71aaa87 [automerger skipped] Merge "Specify a default module for TARGET_RECOVERY_UI_LIB." am: 9010493189 am: 1da2937623 -s ours
am: 2991503f86  -s ours

Change-Id: I9af5c16f0822fde7dd5e894b04e81b6a1cfb3dc0
2018-03-27 05:18:58 +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 7b493b064a Specify a default module for TARGET_RECOVERY_UI_LIB.
am: f7e8012be3

Change-Id: Ic0af23327cf51a17caeaee3cf3404de41fa42444
2018-03-27 02:57:11 +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 6028066638 [automerger skipped]Merge "Factor out a menu class for screen ui" am: 549695ae65 am: baf619c21c -s ours
am: d956b6328e  -s ours

Change-Id: I13394a33a4fa977b25fea69ada7fb786509b7ae8
2018-03-24 17:21:59 +00: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 cbb127a528 Factor out a menu class for screen ui
am: ba0460c981

Change-Id: I6a900b56a8a668afea11b18086120da0d8b78c98
2018-03-24 17:07:13 +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 f5a58b32bf Merge "update_verifier: Support verifying product partition." am: ab8d782bd4 am: 7ce215d3b9
am: 6dae8eb10f

Change-Id: I3da974717eb8a174b56ea7e79a4ddf9b8b25ae6e
2018-03-24 00:43:36 +00:00