16cda5abba
Snap for 4842501 from ad22bcbf8d to qt-release
...
Change-Id: Ifd16f1bc84ad58e561139c838d1fa175a2371d85
2018-06-15 09:30:44 +00:00
ad22bcbf8d
Merge "updater_sample: add metadata mismatch error code" am: 9ed4b41478 am: c48f0b6923
...
am: d05624fbe0
2018-06-14 10:30:51 -07:00
d05624fbe0
Merge "updater_sample: add metadata mismatch error code" am: 9ed4b41478
...
am: c48f0b6923
2018-06-14 10:26:18 -07:00
76e8d999dc
Merge "tests: Skip ScreenRecoveryUITest on gr_init failure." am: c53639d5e3 am: c7b4418a80
...
am: fb3b3e4031
2018-06-14 10:23:35 -07:00
c48f0b6923
Merge "updater_sample: add metadata mismatch error code"
...
am: 9ed4b41478
2018-06-14 10:22:44 -07:00
fb3b3e4031
Merge "tests: Skip ScreenRecoveryUITest on gr_init failure." am: c53639d5e3
...
am: c7b4418a80
2018-06-14 10:17:44 -07:00
9ed4b41478
Merge "updater_sample: add metadata mismatch error code"
2018-06-14 17:15:58 +00:00
c7b4418a80
Merge "tests: Skip ScreenRecoveryUITest on gr_init failure."
...
am: c53639d5e3
2018-06-14 10:12:54 -07:00
c53639d5e3
Merge "tests: Skip ScreenRecoveryUITest on gr_init failure."
2018-06-14 17:03:06 +00:00
26f86099af
Merge "Revert "updater_sample: add proguard.flags"" am: ac752b3ed8 am: 888dae6c13
...
am: b0d7bee84d
2018-06-13 23:54:43 -07:00
b0d7bee84d
Merge "Revert "updater_sample: add proguard.flags"" am: ac752b3ed8
...
am: 888dae6c13
2018-06-13 23:50:21 -07:00
888dae6c13
Merge "Revert "updater_sample: add proguard.flags""
...
am: ac752b3ed8
2018-06-13 23:46:28 -07:00
ac752b3ed8
Merge "Revert "updater_sample: add proguard.flags""
2018-06-14 06:37:10 +00:00
c02fb99e1d
Revert "updater_sample: add proguard.flags"
...
This reverts commit 8c3af4aa8c
2018-06-14 06:35:18 +00:00
51f16ec76d
tests: Skip ScreenRecoveryUITest on gr_init failure.
...
It addresses the ScreenRecoveryUITest failures on gce targets which
don't have any graphics backend. Probing for all backend devices in
tests could work, but would duplicate codes. This CL relies on the
result of gr_init().
As a side effect, it may give false negatives if gr_init() is supposed
to work but silently broken. But such issues are beyond
ScreenRecoveryUITest's concern, which should be captured by the tests
for minui or graphics backends instead.
Fixes: 79616356
Test: Run recovery_unit_test on marlin.
Test: Run recovery_unit_test on gce.
Change-Id: I121aacc61c8a614447509506057ecfd8d86163e4
2018-06-13 23:28:21 -07:00
c01c31104c
Merge "screen_ui: Move the call to gr_init() into Init()." am: 4264ee890e am: 2a3c46a068
...
am: a17782bbf8
2018-06-13 21:20:32 -07:00
a17782bbf8
Merge "screen_ui: Move the call to gr_init() into Init()." am: 4264ee890e
...
am: 2a3c46a068
2018-06-13 21:17:06 -07:00
2a3c46a068
Merge "screen_ui: Move the call to gr_init() into Init()."
...
am: 4264ee890e
2018-06-13 21:12:35 -07:00
4264ee890e
Merge "screen_ui: Move the call to gr_init() into Init()."
2018-06-14 04:03:24 +00:00
5b2d0884b3
Merge "screen_ui: Call gr_exit() from dtor." am: 4cd2cf96a0 am: 52a702181e
...
am: 109de7ba75
2018-06-13 18:45:34 -07:00
109de7ba75
Merge "screen_ui: Call gr_exit() from dtor." am: 4cd2cf96a0
...
am: 52a702181e
2018-06-13 18:40:22 -07:00
52a702181e
Merge "screen_ui: Call gr_exit() from dtor."
...
am: 4cd2cf96a0
2018-06-13 18:37:20 -07:00
4cd2cf96a0
Merge "screen_ui: Call gr_exit() from dtor."
2018-06-14 01:27:30 +00:00
a475967ba1
Merge "Recovery image is self-contained" am: 397e8f2279 am: 93ea306913
...
am: 26e8481fc8
2018-06-13 17:45:19 -07:00
53b1c46a0b
Merge "updater_sample: add proguard.flags" am: 5ced47d120 am: 9b6a9aceae
...
am: 441f38e9e5
2018-06-13 17:34:59 -07:00
903a91f7f4
Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." am: 6dbdbbc8fe am: cc08655e65
...
am: e25dfa5fd0
2018-06-13 17:06:43 -07:00
26e8481fc8
Merge "Recovery image is self-contained" am: 397e8f2279
...
am: 93ea306913
2018-06-13 17:05:54 -07:00
441f38e9e5
Merge "updater_sample: add proguard.flags" am: 5ced47d120
...
am: 9b6a9aceae
2018-06-13 16:56:47 -07:00
e25dfa5fd0
Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." am: 6dbdbbc8fe
...
am: cc08655e65
2018-06-13 16:56:27 -07:00
93ea306913
Merge "Recovery image is self-contained"
...
am: 397e8f2279
2018-06-13 16:40:33 -07:00
9b6a9aceae
Merge "updater_sample: add proguard.flags"
...
am: 5ced47d120
2018-06-13 16:40:14 -07:00
cc08655e65
Merge "minui: Add constness to GRSurface* in gr_get_{width,height}."
...
am: 6dbdbbc8fe
2018-06-13 16:38:04 -07:00
ba4edb3e82
screen_ui: Move the call to gr_init() into Init().
...
gr_init() does general initialization works, in addition to loading font
file. InitTextParams() handles text related works.
Also check the font initialization result before using, as gr_init()
would ignore font initialization failures.
Test: recovery_unit_test on marlin.
Test: Boot into recovery. Run graphics test.
Change-Id: I12da22dfe8d13448cfbc83dbc51cd96f23c2deee
2018-06-13 16:18:46 -07:00
ebee98df6f
updater_sample: add metadata mismatch error code
...
Update util/UpdateEngineErrorCodes.java
Test: n/a
Change-Id: I7250b1198b1d5ff0e38b7d4effe61eebd114a44f
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
2018-06-13 16:18:38 -07:00
60ac622245
screen_ui: Call gr_exit() from dtor.
...
ScreenRecoveryUI calls gr_init() during Init(), and should release any
allocated resource upon destructing. It's a no-op to call gr_exit() if
gr_init() was not called or didn't finish successfully.
Test: recovery_unit_test on marlin.
Test: Boot into recovery. Run graphics test.
Change-Id: Ib9632170174cdacd51d382f23c8daf6a9bc59f7a
2018-06-13 16:17:53 -07:00
397e8f2279
Merge "Recovery image is self-contained"
2018-06-13 23:14:29 +00:00
5ced47d120
Merge "updater_sample: add proguard.flags"
2018-06-13 23:11:54 +00:00
6dbdbbc8fe
Merge "minui: Add constness to GRSurface* in gr_get_{width,height}."
2018-06-13 22:55:47 +00:00
9f4263346b
minui: Add constness to GRSurface* in gr_get_{width,height}.
...
Also free gr_font in gr_exit(), as it's owned by minui.
Test: mmma -j bootable/recovery system/core/healthd
Test: recovery_unit_test on marlin
Test: Boot into recovery. Run graphics test.
Change-Id: I00457bb97ed3dc95ef5aad493827fb5a62a258dc
2018-06-13 13:24:58 -07:00
8c3af4aa8c
updater_sample: add proguard.flags
...
Test: junit
Change-Id: I0175271935fdd87dd49ad9936d0e1b550d164e05
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
2018-06-13 09:53:29 -07:00
faac23bd8d
Snap for 4832164 from 821d03bb6f to qt-release
...
Change-Id: I9fd99a9272e7ec02135be6d4b3b97bfd50eac6f9
2018-06-10 09:30:33 +00:00
821d03bb6f
Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." am: 0eb10b382a am: 941d3ab754
...
am: e2777de4b0
2018-06-09 09:04:43 -07:00
e2777de4b0
Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." am: 0eb10b382a
...
am: 941d3ab754
2018-06-09 05:28:40 -07:00
e6a3f9e91a
Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master am: d8a411c90a
...
am: d320d12235
2018-06-09 05:16:46 -07:00
44e8b33826
Snap for 4831764 from 4fed385c6c to qt-release
...
Change-Id: Ib64064bd6a6102210f1fd3bb1f064698594dd721
2018-06-09 09:32:03 +00:00
d320d12235
Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master
...
am: d8a411c90a
2018-06-09 01:45:12 -07:00
941d3ab754
Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()."
...
am: 0eb10b382a
2018-06-08 16:50:38 -07:00
d8a411c90a
Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master
2018-06-08 23:09:59 +00:00
0eb10b382a
Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()."
2018-06-08 23:01:59 +00:00
4fed385c6c
Merge "updater: Remove the redundant check on line count." am: 4a8f5ec06d am: 165a197cdf
...
am: 73ab0d12ce
2018-06-08 12:56:03 -07:00
android-build-team Robot
Zhomart Mukhamejanov
Tao Bao
Ian Pedowitz
Treehugger Robot
Jiyong Park
Xin Li