Commit Graph

6807 Commits

Author SHA1 Message Date
Tianjie Xu 74fa7cd1d9 Merge "Delete the dumpkey host tool"
am: 14d5540426

Change-Id: Ie3be5a201b8ef98ce936e9f0904c72667fa21dc0
2018-11-20 18:13:40 -08:00
Tianjie Xu f1cb8dbdee [automerger skipped] Merge "Import translations. DO NOT MERGE"
am: d01f664cae  -s ours

Change-Id: Ia12ae9d3a41efabfeb34adae7bddc21296bbcd0b
2018-11-20 18:09:29 -08:00
Tianjie Xu 14d5540426 Merge "Delete the dumpkey host tool" 2018-11-21 01:45:39 +00:00
Tianjie Xu d01f664cae Merge "Import translations. DO NOT MERGE" 2018-11-21 01:45:22 +00:00
Yifan Hong 5f16d61150 Merge "logical -> dynamic partitions."
am: b22bd959e5

Change-Id: I1a22ef028bd75ffd7595a378ef48451c2779d5ae
2018-11-16 15:56:38 -08:00
Treehugger Robot b22bd959e5 Merge "logical -> dynamic partitions." 2018-11-16 23:35:28 +00:00
Yifan Hong d17174c3e5 logical -> dynamic partitions.
Reflect a name change.
Test: boots
Test: boot into recovery
Bug: 119286600

Change-Id: I7c323f27574ce033b8fc1750aab00f7300c5cc84
2018-11-16 12:56:44 -08:00
Bill Yi 967d4ac73c Import translations. DO NOT MERGE
Change-Id: I1bd6d7f12c7bfffb7e022f09347a5be5a96766a3
Auto-generated-cl: translation import
2018-11-15 16:16:39 -08:00
Mark Salyzyn 838cac4798 Merge "switch to using android-base/file.h instead of android-base/test_utils.h"
am: 814c306106

Change-Id: I8a039d9fc8c602a44825d871b1b7800aa7754ffd
2018-11-15 08:09:56 -08:00
Treehugger Robot 814c306106 Merge "switch to using android-base/file.h instead of android-base/test_utils.h" 2018-11-15 15:59:45 +00:00
Josh Gao 421a39e271 Merge "minadbd: track adb C++ version change."
am: b67811dd49

Change-Id: I5ed644ad8dcd1929599520ccca11e5dd75f84db0
2018-11-15 01:01:40 -08:00
Josh Gao b67811dd49 Merge "minadbd: track adb C++ version change." 2018-11-15 08:48:11 +00:00
Tianjie Xu f565ebb45f Merge "Adjust the background text image width to reduce its size"
am: 4ef9cb27eb

Change-Id: I133fcc25bf6995f848ddb602a779fecc85eed67f
2018-11-14 22:01:17 -08:00
Tianjie Xu 4ef9cb27eb Merge "Adjust the background text image width to reduce its size" 2018-11-15 05:47:54 +00:00
Tianjie Xu b8564e1093 Adjust the background text image width to reduce its size
We can adjust the image width with respect to the maximum width of the
wrapped text. This will remove some black margins and reduce the final
size of the images, especially for those with short strings, e.g.
"recovery_error".

Also, add an option to centrally align the text; and fix a boundary
check in the recovery resource test.

Bug: 74397117
Test: Generate and check the image
Change-Id: Ib6cf61a9c99c4aeede16751dc0adfa23ce3f5424
2018-11-15 00:33:14 +00:00
Pirama Arumuga Nainar 30b4ad5c56 Merge "Use the non-LTO/PGO hwbinder in recovery_component_test"
am: 87e2fc3831

Change-Id: Ia0509a27e3bcf125b35c34f76b05a770b35151ab
2018-11-14 15:50:52 -08:00
Mark Salyzyn 8b54bc5e04 switch to using android-base/file.h instead of android-base/test_utils.h
Test: compile
Bug: 119313545
Change-Id: I664fb32522d01909c603d7b903475c4e9aea9223
2018-11-14 15:49:19 -08:00
Treehugger Robot 87e2fc3831 Merge "Use the non-LTO/PGO hwbinder in recovery_component_test" 2018-11-14 23:33:44 +00:00
Tianjie Xu 5faf4021c9 Merge "image generator: format the java file"
am: 860c82a66b

Change-Id: Iee9c359a05a5a05aa55a2e7bede184b3d5f9ed98
2018-11-14 12:08:47 -08:00
Pirama Arumuga Nainar b3339ddc6b Use the non-LTO/PGO hwbinder in recovery_component_test
Bug: http://b/119560349
Bug: http://b/112277682

Currently, any binary links in a PGO-enabled static library also needs
to opt into PGO.  With b/119560349, this should be done automatically by
the build system.  Until then, use the non-PGO version of libhwbinder in
recovery_component_test.

Test: m ANDROID_PGO_INSTRUMENT=all
Change-Id: Ic6e44c1cb6d6f13e60e11a46fd7e5ef54238942b
2018-11-14 11:42:23 -08:00
Tianjie Xu 860c82a66b Merge "image generator: format the java file" 2018-11-14 19:10:38 +00:00
Josh Gao 9828dc14cb minadbd: track adb C++ version change.
adb is going to start using shiny new C++17 features like
std::optional in headers that minadbd includes.

Test: mma
Change-Id: I7eb100c48abbf2364d6ff5f30aa223480e2466a6
2018-11-13 14:19:04 -08:00
Tianjie Xu b97f7e5343 image generator: format the java file
Format the file with google-java-format --aosp. This makes the presubmit
hook happy.

Bug: 74397117
Test: mma
Change-Id: Ie342ed11449414b63f2d1ae781023e940b136bcb
2018-11-13 20:29:16 +00:00
Tao Bao d409598e08 Merge "Check and dump the signal info for killed updater."
am: 02a945556e

Change-Id: Id32aae22bebfac4863af2c3bd2999105f545c11d
2018-11-08 15:25:30 -08:00
Treehugger Robot 02a945556e Merge "Check and dump the signal info for killed updater." 2018-11-08 22:57:47 +00:00
Tao Bao 6f42a59e7d Merge "minui: GRSurface manages data with std::unique_ptr."
am: 481613b35f

Change-Id: I3bf0fc74f23b7c36a7a34888aaf7151b22d950d9
2018-11-08 09:47:59 -08:00
Tao Bao 481613b35f Merge "minui: GRSurface manages data with std::unique_ptr." 2018-11-08 17:31:40 +00:00
Tao Bao e7b775ca2c Check and dump the signal info for killed updater.
WEXITSTATUS only gives meaningful value if WIFEXITED is true. So we may
see a slightly confusing message of "E:Error in /path/to/package (Status
0)" for a killed updater process (e.g. updater calling abort(3)). This
CL dumps the signal number for such a case.

Test: abort() in child process. Check the output.
Change-Id: I72e6654a6499d65155085de658062efb9f1e36ac
2018-11-07 15:25:30 -08:00
Tao Bao 9cf163e673 minui: GRSurface manages data with std::unique_ptr.
Test: Run recovery_unit_test on marlin.
Test: `Run graphics test` on taimen.
Change-Id: I34bd862049900b0030f2840a92a7fa3e02fa2c10
2018-11-07 14:36:45 -08:00
Tao Bao aeda63b106 Merge changes If24c6b7c,I381b0103
am: 67b7e64034

Change-Id: Ic244772b104a3e96dc9f929b9e8f405a97d6f346
2018-11-06 14:11:19 -08:00
Tao Bao 67b7e64034 Merge changes If24c6b7c,I381b0103
* changes:
  image_generator: Fix the warnings on import order.
  Add tools/ to the style-checking path.
2018-11-06 22:04:50 +00:00
Tao Bao 529bb742b7 image_generator: Fix the warnings on import order.
[platform/bootable/recovery] tools/image_generator/ImageGenerator.java:36: Wrong order for java.util.StringTokenizer import. Use Ctrl+Shift+O (Eclipse) or Ctrl+Alt+O (Intellij) to sort imports. https://source.android.com/setup/code-style#order-import-statementsERRORS:
[platform/bootable/recovery] tools/image_generator/ImageGenerator.java:43: Wrong order for org.apache.commons.cli.CommandLine import. Use Ctrl+Shift+O (Eclipse) or Ctrl+Alt+O (Intellij) to sort imports. https://source.android.com/setup/code-style#order-import-statementsERRORS:
[platform/bootable/recovery] tools/image_generator/ImageGenerator.java:50: Extra separation in import group before 'org.w3c.dom.Document'

Test: `mmma -j bootable/recovery`
Test: `repo upload` no longer gives warnings.
Change-Id: If24c6b7ca33b9223b3e326a48885c24c35b5fa68
2018-11-06 11:34:31 -08:00
Tao Bao 5a47206ffb Merge "tests: Add a testcase for updater overrun while patching."
am: d1f105a466

Change-Id: Ib3ca6768dc8abea7b251e5c47d1b6952144981a0
2018-11-06 11:28:05 -08:00
Tao Bao 6394a73713 Add tools/ to the style-checking path.
Test: Touch a Java file in tools/. `repo upload` gives warnings.
Change-Id: I381b01038d8a0c0e90817e383ca5323908fdd592
2018-11-06 11:27:13 -08:00
Tao Bao d1f105a466 Merge "tests: Add a testcase for updater overrun while patching." 2018-11-06 19:16:44 +00:00
Tao Bao 3cb3c524f6 tests: Add a testcase for updater overrun while patching.
For any patching command, the resulting data should always exactly fill
up the given target range.

Test: Run recovery_component_test on marlin.
Change-Id: Ib3cc1fc5c11094e2eab3fe370753db51c7c4135c
2018-11-05 20:47:53 -08:00
Tao Bao 18a5d529cd Merge "ui: Manage loaded resources with smart pointers."
am: 06aea3a894

Change-Id: I2ca8a20ee76d743bbf5cb7f2956de1497b343de2
2018-11-05 17:55:38 -08:00
Treehugger Robot 06aea3a894 Merge "ui: Manage loaded resources with smart pointers." 2018-11-06 01:37:37 +00:00
Tao Bao 2a4e64a351 Merge "updater: Error out on underrun during patching."
am: a0404ecd16

Change-Id: Iad188c1bf399b9ac753d82621d2dd5122f1979be
2018-11-05 13:29:12 -08:00
Tao Bao a0404ecd16 Merge "updater: Error out on underrun during patching." 2018-11-05 21:17:25 +00:00
Tao Bao e9f568e5e5 Merge "tests: Remove obsolete testdata files."
am: f720da5317

Change-Id: I436b49a2275e125c3f7d8962c4b4105623c960bc
2018-11-05 12:25:38 -08:00
Tao Bao f720da5317 Merge "tests: Remove obsolete testdata files." 2018-11-05 20:09:03 +00:00
Tao Bao da409fb8d6 ui: Manage loaded resources with smart pointers.
Test: Run recovery_unit_test on marlin.
Test: `Run graphics test` on marlin.
Change-Id: I8239c3d9fb288f80ee11f615402768ff8ef8ecd0
2018-11-05 10:15:59 -08:00
Tao Bao 81ef508bd8 tests: Remove obsolete testdata files.
testdata/jarsigned.zip and testdata/unsigned.zip became dead since
commit 432918603f ("Refactor existing
tests to use gtest").

testdata/patch.bsdiff became dead when applypatch/applypatch.sh was
deleted (commit c3ef089dfa).

Test: Run recovery_unit_test and recovery_component_test.
Change-Id: Ie1a7f8850878593fcb7d4554759a539271ffb207
2018-11-05 09:10:11 -08:00
Tao Bao a2cff952cf updater: Error out on underrun during patching.
Test: Run recovery_component_test on marlin.
Change-Id: If23baf42aeacb48500edabc2eadd2e7119a848da
2018-11-05 08:55:11 -08:00
Tianjie Xu d50aa4f4ee Merge "Make the text image readable under recovery"
am: d84922216c

Change-Id: Ie503be8af3d70e0c7cfa1646b47e35832c34e717
2018-11-04 22:52:47 -08:00
Tianjie Xu d84922216c Merge "Make the text image readable under recovery" 2018-11-05 06:41:55 +00:00
Tao Bao f0cf952082 Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev."
am: f2a9152408

Change-Id: Ib53ef3c08f14f815769cd4cb72ba0303183abc1f
2018-11-02 15:17:20 -07:00
Treehugger Robot f2a9152408 Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev." 2018-11-02 22:09:39 +00:00
Tao Bao f65d48bb5a minui: Use android::base::unique_fd in MinuiBackendFbdev.
Test: mmma -j bootable/recovery
Test: `Run graphics test` on taimen.
Change-Id: I5b25cafbd0107943606a87f0619242cf950174ac
2018-11-02 09:35:08 -07:00