Commit Graph

7309 Commits

Author SHA1 Message Date
android-build-team Robot f70b25caf7 Snap for 5130089 from f560a89470 to qt-release
Change-Id: Ief9e3885b0de8c0fc2690612272852958f77d96c
2018-11-14 04:07:21 +00:00
Bill Yi f560a89470 Import translations. DO NOT MERGE
Change-Id: I1bd6d7f12c7bfffb7e022f09347a5be5a96766a3
Auto-generated-cl: translation import
2018-11-13 08:09:37 -08:00
android-build-team Robot 2a4f016c4b Snap for 5124112 from 42ccdcd337 to qt-release
Change-Id: I481f9365799fc2830fc4cd4ca61e1cd87ea59e95
2018-11-11 04:08:45 +00:00
Tao Bao 42ccdcd337 Merge "Check and dump the signal info for killed updater." am: 02a945556e am: d409598e08
am: 14153976cd

Change-Id: I29e46974664cd6414969e31f85445d39ccae8ca4
2018-11-08 15:55:39 -08:00
Tao Bao 14153976cd Merge "Check and dump the signal info for killed updater." am: 02a945556e
am: d409598e08

Change-Id: I68eb65526a9eae4c087f944a6d417454fa8c3141
2018-11-08 15:29:40 -08: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 0c295babc7 Merge "minui: GRSurface manages data with std::unique_ptr." am: 481613b35f am: 6f42a59e7d
am: c194bbf665

Change-Id: I593df7f70e74ef872c725675bc8569858ff6b6f0
2018-11-08 10:05:23 -08:00
Tao Bao c194bbf665 Merge "minui: GRSurface manages data with std::unique_ptr." am: 481613b35f
am: 6f42a59e7d

Change-Id: Ifb25cb998b7a241e1e3dbea14939267ac3bc7899
2018-11-08 10:00:21 -08: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
android-build-team Robot e9f345b00e Snap for 5115169 from cf2a142c43 to qt-release
Change-Id: I629c4c2b300727717eeaf4c45a2ffa4cb6ced37f
2018-11-07 04:00:49 +00:00
Tao Bao cf2a142c43 Merge changes If24c6b7c,I381b0103 am: 67b7e64034 am: aeda63b106
am: afad7170bb

Change-Id: I1f715c5de7c19514c5f9b5d62014bcf5ddb80598
2018-11-06 14:23:30 -08:00
Tao Bao afad7170bb Merge changes If24c6b7c,I381b0103 am: 67b7e64034
am: aeda63b106

Change-Id: Ib0e206f27aa4f6cacb0e67cb7dc18cf3660872ba
2018-11-06 14:18:40 -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 07b6112ae9 Merge "tests: Add a testcase for updater overrun while patching." am: d1f105a466 am: 5a47206ffb
am: e5df945d88

Change-Id: Ieb6672fa729018e865b8dcc93e3a27cc192a3d8a
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

Change-Id: Iafa684f40e6c9ce3577e0cbb70203d41f442285f
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

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
android-build-team Robot 104b7a3e62 Snap for 5112637 from 562440a8c9 to qt-release
Change-Id: Ia85e5f890c6789256d7aa99f40df54f555a1c852
2018-11-06 04:09:03 +00:00
Tao Bao 3d855135fe Merge "ui: Manage loaded resources with smart pointers." am: 06aea3a894 am: 18a5d529cd
am: 1c1fbe032a

Change-Id: I280190845ffce33562bd54889cde74e59ef25644
2018-11-05 18:04:49 -08:00
Tao Bao 1c1fbe032a Merge "ui: Manage loaded resources with smart pointers." am: 06aea3a894
am: 18a5d529cd

Change-Id: I6249fc282220935c344a45f30332a7cfbb6beb8f
2018-11-05 18:01:43 -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 562440a8c9 Merge "updater: Error out on underrun during patching." am: a0404ecd16 am: 2a4e64a351
am: b3dbba59a2

Change-Id: I2cfbe1222a3560879e069369019ff50e45de699f
2018-11-05 13:38:38 -08:00
Tao Bao b3dbba59a2 Merge "updater: Error out on underrun during patching." am: a0404ecd16
am: 2a4e64a351

Change-Id: Ic99cb0f723f874fd9efbf35da3f5de154f998a2d
2018-11-05 13:32:18 -08: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 d5f00a0224 Merge "tests: Remove obsolete testdata files." am: f720da5317 am: e9f568e5e5
am: 2618f6a14f

Change-Id: Ib20bd16894411eb74c5df61c194c3fdd584d13cc
2018-11-05 12:37:58 -08:00
Tao Bao 2618f6a14f Merge "tests: Remove obsolete testdata files." am: f720da5317
am: e9f568e5e5

Change-Id: I7de210eb8643049cc9befde01d67d91d4cd09cc4
2018-11-05 12:30:11 -08: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 59d0c1df0a Merge "Make the text image readable under recovery" am: d84922216c am: d50aa4f4ee
am: 69067f1946

Change-Id: I3ed6dc0ce70a8b859bd703cd7a322ee899f8e647
2018-11-04 23:06:54 -08:00
Tianjie Xu 69067f1946 Merge "Make the text image readable under recovery" am: d84922216c
am: d50aa4f4ee

Change-Id: Ibb747b3b9248c246a991caf0e80e13449787a602
2018-11-04 22:57:19 -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
android-build-team Robot 6f94208430 Snap for 5110273 from 9b21c7df08 to qt-release
Change-Id: Ifb0d4c2fc75603a97f4b95d808bc7ac450e32f61
2018-11-04 03:08:47 +00:00
Tao Bao 9b21c7df08 Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev." am: f2a9152408 am: f0cf952082
am: adbdb9ee25

Change-Id: I977fca1590ac32948db55f7d6139dfa16911c2fa
2018-11-02 15:31:28 -07:00
Tao Bao adbdb9ee25 Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev." am: f2a9152408
am: f0cf952082

Change-Id: I3a9e992985f357a844780fcbf6e8a742e42e51b1
2018-11-02 15:26:24 -07: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