Commit Graph

6558 Commits

Author SHA1 Message Date
Tao Bao cf60a44bd4 Drop the dependency on AB_OTA_UPDATER flag.
This shortens the gap between A/B and non-A/B builds, by replacing the
dependency on build-time flag with runtime detection instead. It also
allows building and testing both paths regardless of the target OTA
type.

The size increase to /sbin/recovery looks negligible (< 0.01%).
 - marlin: increased from 2084928 to 2085024;
 - angler: increased from 2084776 to 2084896.

Test: Run recovery_component_test on angler and marlin.
Test: Sideload an A/B OTA package on marlin.
Test: Sideload a non-A/B OTA package on angler.
Change-Id: I1d927d1ede9713fb42f73b4fe324aa5705ee6f99
2018-06-19 10:50:43 -07:00
Zhomart Mukhamejanov dd539f1821 Merge "updater_sample: run as a systemp app" am: 6b788b1848 am: bb1c6bf7cc
am: 014dfd5b7f

Change-Id: Ib556b0133a19d441c02b93f69d454bc9540e1c21
2018-06-19 09:26:50 -07:00
Zhomart Mukhamejanov 014dfd5b7f Merge "updater_sample: run as a systemp app" am: 6b788b1848
am: bb1c6bf7cc

Change-Id: I1a93d69597e255a0b290ac76f197f569fee1f2c8
2018-06-19 09:22:59 -07:00
Zhomart Mukhamejanov bb1c6bf7cc Merge "updater_sample: run as a systemp app"
am: 6b788b1848

Change-Id: Iddfce3b5302faa4489ee6c0ca9518f4acf39c75b
2018-06-19 09:18:04 -07:00
Zhomart Mukhamejanov 6b788b1848 Merge "updater_sample: run as a systemp app" 2018-06-19 16:11:49 +00:00
android-build-team Robot c408073eed Snap for 4848708 from 0c0a6dd512 to qt-release
Change-Id: I766c7f9ff8b141d66b5fe2c092b631a166e091da
2018-06-19 09:33:58 +00:00
Zhomart Mukhamejanov 0c0a6dd512 Merge "updater_sample: add proguard.flags" am: 5af63a45d9 am: 468ad1d965
am: 2cc87497c4

Change-Id: I121f04b84aa23259fb696bdf9dfe756ff87609a4
2018-06-18 17:26:37 -07:00
Zhomart Mukhamejanov 2cc87497c4 Merge "updater_sample: add proguard.flags" am: 5af63a45d9
am: 468ad1d965

Change-Id: Ib819331248fd0e799f3679f9663500cf897ca3b4
2018-06-18 17:17:33 -07:00
Zhomart Mukhamejanov 468ad1d965 Merge "updater_sample: add proguard.flags"
am: 5af63a45d9

Change-Id: I6221824507bf889f11ebab5aea10aaf2f9205a4a
2018-06-18 17:13:27 -07:00
Zhomart Mukhamejanov 5af63a45d9 Merge "updater_sample: add proguard.flags" 2018-06-19 00:04:44 +00:00
Tao Bao 0a883c18f6 updater: Defer the creation of the new data writer.
This avoids leaving the created new data writer thread unjoined, in the
presence of transfer list parsing errors, or the early exit case on
`total_blocks == 0`.

Also fix a minor issue when dumping the errno on pthread_create error
(pthread_create returns the error number, as opposed to setting errno).

Test: Run recovery_component_test on marlin.
Change-Id: Icfac27fef0c64736eb8c76264da73c223b4960cb
2018-06-18 13:00:43 -07:00
Zhomart Mukhamejanov 65dcf32274 updater_sample: add privileged system app docs
README.md: add instructions

Test: on device
Bug: 80250430
Change-Id: I2e04fdefda2b73d01dfa0a8e684542feb2ed6c61
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-06-18 10:31:18 -07:00
Zhomart Mukhamejanov 2d9ffb62a3 updater_sample: run as a systemp app
Android.mk: remove local tags, make privileged module
AndroidManifest.xml: add access cache filesystem

Test: on device
Test: junit4
Change-Id: I611970747b7b630520249dd53105b9a2f7f76355
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-06-18 10:29:47 -07:00
Zhomart Mukhamejanov aa7abc0359 updater_sample: add proguard.flags
Test: on device
Change-Id: Ia8582053b7330d06e618f2555332cfb2a89b3df8
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-06-18 10:16:19 -07:00
android-build-team Robot 16cda5abba Snap for 4842501 from ad22bcbf8d to qt-release
Change-Id: Ifd16f1bc84ad58e561139c838d1fa175a2371d85
2018-06-15 09:30:44 +00:00
Zhomart Mukhamejanov ad22bcbf8d Merge "updater_sample: add metadata mismatch error code" am: 9ed4b41478 am: c48f0b6923
am: d05624fbe0

Change-Id: I51408f698d934782441c8f75cefe3da390390f34
2018-06-14 10:30:51 -07:00
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
Tao Bao 76e8d999dc Merge "tests: Skip ScreenRecoveryUITest on gr_init failure." am: c53639d5e3 am: c7b4418a80
am: fb3b3e4031

Change-Id: Ibb9ab1541f701f839e9511d83cc0c53ef91043b5
2018-06-14 10:23:35 -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 26f86099af Merge "Revert "updater_sample: add proguard.flags"" am: ac752b3ed8 am: 888dae6c13
am: b0d7bee84d

Change-Id: I0cfc628e6735608fbc4c62dc150ebc05d470e133
2018-06-13 23:54:43 -07: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 c01c31104c Merge "screen_ui: Move the call to gr_init() into Init()." am: 4264ee890e am: 2a3c46a068
am: a17782bbf8

Change-Id: Ibbc31b3827bdb162b52e160e532e0989b0a15ad9
2018-06-13 21:20:32 -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 5b2d0884b3 Merge "screen_ui: Call gr_exit() from dtor." am: 4cd2cf96a0 am: 52a702181e
am: 109de7ba75

Change-Id: I9c97e98dcc60409e3605e42e1293ec1bd57391e9
2018-06-13 18:45:34 -07: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 a475967ba1 Merge "Recovery image is self-contained" am: 397e8f2279 am: 93ea306913
am: 26e8481fc8

Change-Id: I4869659f2282cca6fdd3cee0fd4fd92631d54821
2018-06-13 17:45:19 -07:00
Zhomart Mukhamejanov 53b1c46a0b Merge "updater_sample: add proguard.flags" am: 5ced47d120 am: 9b6a9aceae
am: 441f38e9e5

Change-Id: I08bd1360a9c7301c513110f00015d6f31314591e
2018-06-13 17:34:59 -07:00
Tao Bao 903a91f7f4 Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." am: 6dbdbbc8fe am: cc08655e65
am: e25dfa5fd0

Change-Id: I576a31b590fe7a2989fbac61f66f09c558132997
2018-06-13 17:06:43 -07: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