Tao Bao
6f42a59e7d
Merge "minui: GRSurface manages data with std::unique_ptr."
...
am: 481613b35f
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
cf2a142c43
Merge changes If24c6b7c,I381b0103 am: 67b7e64034 am: aeda63b106
...
am: afad7170bb
2018-11-06 14:23:30 -08:00
Tao Bao
afad7170bb
Merge changes If24c6b7c,I381b0103 am: 67b7e64034
...
am: aeda63b106
2018-11-06 14:18:40 -08:00
Tao Bao
aeda63b106
Merge changes If24c6b7c,I381b0103
...
am: 67b7e64034
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
07b6112ae9
Merge "tests: Add a testcase for updater overrun while patching." am: d1f105a466 am: 5a47206ffb
...
am: e5df945d88
2018-11-06 11:47:18 -08:00
Tao Bao
e5df945d88
Merge "tests: Add a testcase for updater overrun while patching." am: d1f105a466
...
am: 5a47206ffb
2018-11-06 11:35:08 -08: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
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
3d855135fe
Merge "ui: Manage loaded resources with smart pointers." am: 06aea3a894 am: 18a5d529cd
...
am: 1c1fbe032a
2018-11-05 18:04:49 -08:00
Tao Bao
1c1fbe032a
Merge "ui: Manage loaded resources with smart pointers." am: 06aea3a894
...
am: 18a5d529cd
2018-11-05 18:01:43 -08:00
Tao Bao
18a5d529cd
Merge "ui: Manage loaded resources with smart pointers."
...
am: 06aea3a894
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
562440a8c9
Merge "updater: Error out on underrun during patching." am: a0404ecd16 am: 2a4e64a351
...
am: b3dbba59a2
2018-11-05 13:38:38 -08:00
Tao Bao
b3dbba59a2
Merge "updater: Error out on underrun during patching." am: a0404ecd16
...
am: 2a4e64a351
2018-11-05 13:32:18 -08:00
Tao Bao
2a4e64a351
Merge "updater: Error out on underrun during patching."
...
am: a0404ecd16
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
d5f00a0224
Merge "tests: Remove obsolete testdata files." am: f720da5317 am: e9f568e5e5
...
am: 2618f6a14f
2018-11-05 12:37:58 -08:00
Tao Bao
2618f6a14f
Merge "tests: Remove obsolete testdata files." am: f720da5317
...
am: e9f568e5e5
2018-11-05 12:30:11 -08:00
Tao Bao
e9f568e5e5
Merge "tests: Remove obsolete testdata files."
...
am: f720da5317
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 432918603fc3ef089dfa
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
59d0c1df0a
Merge "Make the text image readable under recovery" am: d84922216c am: d50aa4f4ee
...
am: 69067f1946
2018-11-04 23:06:54 -08:00
Tianjie Xu
69067f1946
Merge "Make the text image readable under recovery" am: d84922216c
...
am: d50aa4f4ee
2018-11-04 22:57:19 -08:00
Tianjie Xu
d50aa4f4ee
Merge "Make the text image readable under recovery"
...
am: d84922216c
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
9b21c7df08
Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev." am: f2a9152408 am: f0cf952082
...
am: adbdb9ee25
2018-11-02 15:31:28 -07:00
Tao Bao
adbdb9ee25
Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev." am: f2a9152408
...
am: f0cf952082
2018-11-02 15:26:24 -07:00
Tao Bao
f0cf952082
Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev."
...
am: f2a9152408
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
Tao Bao
35b01a2023
Merge "minui: Add GRSurface::Clone()." am: 948790fa4c am: 24b89ffd25
...
am: 7c103b8846
2018-11-01 19:43:59 -07:00
Tao Bao
7c103b8846
Merge "minui: Add GRSurface::Clone()." am: 948790fa4c
...
am: 24b89ffd25
2018-11-01 19:39:57 -07:00
Tao Bao
24b89ffd25
Merge "minui: Add GRSurface::Clone()."
...
am: 948790fa4c
2018-11-01 19:34:50 -07:00
Tao Bao
948790fa4c
Merge "minui: Add GRSurface::Clone()."
2018-11-02 02:11:10 +00:00
Tianjie Xu
22dd019aa5
Make the text image readable under recovery
...
Encode the width, height and locale of the localized image as pixels so
that recovery can locate the correct range of the image from a
concatenated png file.
Also address a few todoes including wrapping the CJK text, making a
catch-all type for all languages.
Test: view the generated image under locale test
Change-Id: Icd3997eb4e992e76ef72526787d64c406f606970
2018-11-01 15:57:31 -07:00
Tao Bao
63b59dcead
minui: Add GRSurface::Clone().
...
Clone() allows duplicating the image that's stored in the GRSurface.
Test: Run recovery_unit_test.
Change-Id: Ia50d507c6200f2de5f17143775de805247a60e1f
2018-11-01 12:14:46 -07:00
Tao Bao
deaf2662d7
Merge changes I69ce001a,I14514017,I8e67cda7 am: d2e1c0a981 am: 082adef0e0
...
am: 492e87a40b
2018-11-01 12:03:27 -07:00
Tao Bao
492e87a40b
Merge changes I69ce001a,I14514017,I8e67cda7 am: d2e1c0a981
...
am: 082adef0e0
2018-11-01 11:59:30 -07:00
Tao Bao
082adef0e0
Merge changes I69ce001a,I14514017,I8e67cda7
...
am: d2e1c0a981
2018-11-01 11:53:30 -07:00
Tao Bao
d2e1c0a981
Merge changes I69ce001a,I14514017,I8e67cda7
...
* changes:
minui: Remove the default and copy ctors for GRSurface.
minui: Refactor GRSurfaceAdf.
minui: Refactor GRSurfaceFbdev.
2018-11-01 18:37:33 +00:00
Tianjie Xu
23354167e8
Merge "Refactor the code to check the metadata" am: cbdcfc0038 am: 6ba8eb5248
...
am: ed7cbc2200
2018-11-01 10:50:13 -07:00
