PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,250 Commits 1 Branch 0 Tags
d05624fbe03d1b831aebe37bd5cd08047bfa0df1
Commit Graph

6250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhomart Mukhamejanov d05624fbe0 Merge "updater_sample: add metadata mismatch error code" am: 9ed4b41478 
am: c48f0b6923

Change-Id: I8ddbff9a22fc79707a09658e3e9049c367871ea9
 2018-06-14 10:26:18 -07:00
Zhomart Mukhamejanov c48f0b6923 Merge "updater_sample: add metadata mismatch error code" 
am: 9ed4b41478

Change-Id: I8873a4bff0dcfaa17acce762df5687c5ebe4aa96
 2018-06-14 10:22:44 -07:00
Tao Bao fb3b3e4031 Merge "tests: Skip ScreenRecoveryUITest on gr_init failure." am: c53639d5e3 
am: c7b4418a80

Change-Id: I537e815e7b3ead2f31e8031642f6e8583028b0e0
 2018-06-14 10:17:44 -07:00
Zhomart Mukhamejanov 9ed4b41478 Merge "updater_sample: add metadata mismatch error code" 2018-06-14 17:15:58 +00:00
Tao Bao c7b4418a80 Merge "tests: Skip ScreenRecoveryUITest on gr_init failure." 
am: c53639d5e3

Change-Id: Ia0c825cc4a74c8f6d06f09eb3ac8cdade60fc427
 2018-06-14 10:12:54 -07:00
Tao Bao c53639d5e3 Merge "tests: Skip ScreenRecoveryUITest on gr_init failure." 2018-06-14 17:03:06 +00:00
Ian Pedowitz b0d7bee84d Merge "Revert "updater_sample: add proguard.flags"" am: ac752b3ed8 
am: 888dae6c13

Change-Id: I0ce9c1daf2761d72b99a7f996b661f0646308efc
 2018-06-13 23:50:21 -07:00
Ian Pedowitz 888dae6c13 Merge "Revert "updater_sample: add proguard.flags"" 
am: ac752b3ed8

Change-Id: I3a309959425ca71c22643229a6e32151408e8cb5
 2018-06-13 23:46:28 -07:00
Ian Pedowitz ac752b3ed8 Merge "Revert "updater_sample: add proguard.flags"" 2018-06-14 06:37:10 +00:00
Ian Pedowitz c02fb99e1d Revert "updater_sample: add proguard.flags" 
This reverts commit 8c3af4aa8c.

Reason for revert: Broke Master

Change-Id: I37bceeea630fb7db39efa25d03ababe3d84cdfbf
 2018-06-14 06:35:18 +00:00
Tao Bao 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
Tao Bao a17782bbf8 Merge "screen_ui: Move the call to gr_init() into Init()." am: 4264ee890e 
am: 2a3c46a068

Change-Id: I862f4d9f90154ac626125ceae49c6bb233b0af03
 2018-06-13 21:17:06 -07:00
Tao Bao 2a3c46a068 Merge "screen_ui: Move the call to gr_init() into Init()." 
am: 4264ee890e

Change-Id: Ibc9c227d25a0b67ccfc97cf075de9314a2732c71
 2018-06-13 21:12:35 -07:00
Tao Bao 4264ee890e Merge "screen_ui: Move the call to gr_init() into Init()." 2018-06-14 04:03:24 +00:00
Tao Bao 109de7ba75 Merge "screen_ui: Call gr_exit() from dtor." am: 4cd2cf96a0 
am: 52a702181e

Change-Id: I217c53f19e894b9d0cde6b20a7345c779002a578
 2018-06-13 18:40:22 -07:00
Tao Bao 52a702181e Merge "screen_ui: Call gr_exit() from dtor." 
am: 4cd2cf96a0

Change-Id: Ib3fba135cfcb1345d17a22b6ba12d03728ebd4c8
 2018-06-13 18:37:20 -07:00
Treehugger Robot 4cd2cf96a0 Merge "screen_ui: Call gr_exit() from dtor." 2018-06-14 01:27:30 +00:00
Jiyong Park 26e8481fc8 Merge "Recovery image is self-contained" am: 397e8f2279 
am: 93ea306913

Change-Id: Idf0067a0b9de29a47859bd1fa722830592ba7d0e
 2018-06-13 17:05:54 -07:00
Zhomart Mukhamejanov 441f38e9e5 Merge "updater_sample: add proguard.flags" am: 5ced47d120 
am: 9b6a9aceae

Change-Id: I91bef0b518749bf0f0f6cfb30bc9287d3876bef0
 2018-06-13 16:56:47 -07:00
Tao Bao e25dfa5fd0 Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." am: 6dbdbbc8fe 
am: cc08655e65

Change-Id: I69c2e87bc26206cce717dc8e0e8f7661f4ca71a1
 2018-06-13 16:56:27 -07:00
Jiyong Park 93ea306913 Merge "Recovery image is self-contained" 
am: 397e8f2279

Change-Id: Ieb43e946cb694635b3b4aad91e7874f87ae39b47
 2018-06-13 16:40:33 -07:00
Zhomart Mukhamejanov 9b6a9aceae Merge "updater_sample: add proguard.flags" 
am: 5ced47d120

Change-Id: Ib5d900fa689fe391148b6da6dc6c0e14d94f6119
 2018-06-13 16:40:14 -07:00
Tao Bao cc08655e65 Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." 
am: 6dbdbbc8fe

Change-Id: I21e6912c33464647b490b6baeea7bf52f2f457af
 2018-06-13 16:38:04 -07:00
Tao Bao 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
Zhomart Mukhamejanov 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
Tao Bao 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
Treehugger Robot 397e8f2279 Merge "Recovery image is self-contained" 2018-06-13 23:14:29 +00:00
Zhomart Mukhamejanov 5ced47d120 Merge "updater_sample: add proguard.flags" 2018-06-13 23:11:54 +00:00
Tao Bao 6dbdbbc8fe Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." 2018-06-13 22:55:47 +00:00
Tao Bao 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
Zhomart Mukhamejanov 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
Tao Bao e2777de4b0 Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." am: 0eb10b382a 
am: 941d3ab754

Change-Id: I2f6b30d6a7698dbde35cbaec6be835cd493c1b29
 2018-06-09 05:28:40 -07:00
Xin Li d320d12235 Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master 
am: d8a411c90a

Change-Id: Ifc15b0365a972264e00e49325106ddca7072c1c9
 2018-06-09 01:45:12 -07:00
Tao Bao 941d3ab754 Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." 
am: 0eb10b382a

Change-Id: I0bba5a09ac62b7c152d22d72f0432868008592cc
 2018-06-08 16:50:38 -07:00
Xin Li 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
Tao Bao 0eb10b382a Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." 2018-06-08 23:01:59 +00:00
Tao Bao 4a13508f0b updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3(). 
Test: Run recovery_component_test on marlin.
Change-Id: I93afca891c5c9c1a351c907b023cd20c4704a66a
 2018-06-08 12:53:31 -07:00
Tao Bao 73ab0d12ce Merge "updater: Remove the redundant check on line count." am: 4a8f5ec06d 
am: 165a197cdf

Change-Id: Ifd6cda9da86575fd8036a0322fa3456c8d4d5147
 2018-06-08 12:48:07 -07:00
Tao Bao 165a197cdf Merge "updater: Remove the redundant check on line count." 
am: 4a8f5ec06d

Change-Id: Iabb63de552d823305fd6330d9819d5ec32718ebc
 2018-06-08 12:44:00 -07:00
Tao Bao 4a8f5ec06d Merge "updater: Remove the redundant check on line count." 2018-06-08 19:29:45 +00:00
Xin Li b5c2c714f0 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master 
Bug: 79597307
Change-Id: Iaf450edb8262cef5465f06309556ab24a08222b4
 2018-06-08 11:06:44 -07:00
Zhomart Mukhamejanov c54885f8a1 Merge "updater_sample: update README.md" am: 1cb7222784 
am: fc824cb998

Change-Id: If5ec06c7974cf6c174ce812e49b20d6dc67c1181
 2018-06-07 18:07:06 -07:00
Zhomart Mukhamejanov 31b517c510 Merge "updater_sample: fix payload spec tests" am: 684d7216e6 
am: 7c8e5b6ee8

Change-Id: I2a413794f315f53000f937760595d5ba99c1755f
 2018-06-07 17:25:33 -07:00
Zhomart Mukhamejanov fc824cb998 Merge "updater_sample: update README.md" 
am: 1cb7222784

Change-Id: I4347b45f3d0abc9fa93bc70b42ec6df94be595e4
 2018-06-07 16:39:05 -07:00
Zhomart Mukhamejanov 7c8e5b6ee8 Merge "updater_sample: fix payload spec tests" 
am: 684d7216e6

Change-Id: I2aac8aa24dd5d4287010ea2b8e70828671858864
 2018-06-07 16:38:08 -07:00
Zhomart Mukhamejanov 1cb7222784 Merge "updater_sample: update README.md" 2018-06-07 22:50:09 +00:00
Zhomart Mukhamejanov ec33e4504c updater_sample: update README.md 
Test: n/a
Change-Id: I0b488ca9fe628c3614c203ab9264175f291f49db
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
 2018-06-07 22:49:22 +00:00
Zhomart Mukhamejanov 684d7216e6 Merge "updater_sample: fix payload spec tests" 2018-06-07 22:49:14 +00:00
Zhomart Mukhamejanov 8a6a86a101 updater_sample: fix payload spec tests 
Test: junit4
Change-Id: Ia2f7475cfba01a65486bb0e5d0f3976304ca0969
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
 2018-06-07 12:07:20 -07:00
Tao Bao ffede3e8d9 updater: Remove the redundant check on line count. 
Test: recovery_component_test on marlin.
Change-Id: I2ac2bd47469d1aec8a97a8c4ed0fe80ffd65c95b
 2018-06-07 10:43:24 -07:00