Commit Graph

6294 Commits

Author SHA1 Message Date
Tao Bao 33cfd108ca Merge "updater: Check the number of args in Command::Parse." am: 95b8d2b064
am: 42f96e5516

Change-Id: I112be68943872b9398e49367b350112e4eebcdfd
2018-06-25 20:46:12 -07:00
Tao Bao 42f96e5516 Merge "updater: Check the number of args in Command::Parse."
am: 95b8d2b064

Change-Id: Ic78e44cdca8a1c394f63b99efdcfecea8a3fdd71
2018-06-25 20:42:01 -07:00
Tao Bao 28811678ef Merge "updater: Add Command parsing codes." am: afc2962e60
am: e6604307f6

Change-Id: I5d741703be298395a5dcc9c5ca646f063f740c42
2018-06-25 20:39:11 -07:00
Tao Bao 95b8d2b064 Merge "updater: Check the number of args in Command::Parse." 2018-06-26 03:37:03 +00:00
Tao Bao e6604307f6 Merge "updater: Add Command parsing codes."
am: afc2962e60

Change-Id: I24cc3beca7c75786cbfad37ab273139fd2d1ca2f
2018-06-25 20:36:08 -07:00
Tao Bao afc2962e60 Merge "updater: Add Command parsing codes." 2018-06-26 03:30:52 +00:00
Tao Bao 92f339372c updater: Check the number of args in Command::Parse.
Additionally checks for excess args when parsing ERASE, FREE, NEW, STASH
and ZERO. Note that the check for MOVE, BSDIFF, IMGDIFF has been covered
in Command::ParseTargetInfoAndSourceInfo.

Test: Run recovery_unit_test on marlin.
Change-Id: Ic8bc9b7a8dcf98f1f8db2e259607564508726857
2018-06-25 13:39:33 -07:00
Tao Bao 6a7e4af7c6 updater: Add Command parsing codes.
The added codes are not used in the updater yet. The switch will happen
in subsequent CLs.

Test: Run recovery_unit_test and recovery_component_test on marlin.
Change-Id: I1ae8a233280f02c2171b43ef028bdccdacb39c59
2018-06-25 13:39:29 -07:00
Tao Bao d9f532e7a2 Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string." am: b4181566f9
am: 839c40513a

Change-Id: Ib729d49068b0ce6ff80941102023b3e2688abe59
2018-06-25 07:47:41 -07:00
Tao Bao 839c40513a Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string."
am: b4181566f9

Change-Id: I9fb25b58eaa23443d24c3d6ed75d52ac96c7788f
2018-06-25 07:44:17 -07:00
Tao Bao b4181566f9 Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string." 2018-06-25 14:35:03 +00:00
Tao Bao 2141a760cc Merge "applypatch: Move to libbase logging." am: bd76709827
am: 513c7fb9e0

Change-Id: I61d0940efcc1e3fffb1d2c9dc6d6c484a4eb545e
2018-06-24 10:59:37 -07:00
Tao Bao 513c7fb9e0 Merge "applypatch: Move to libbase logging."
am: bd76709827

Change-Id: I64fb20c45acf418040d65176c7c3c478e6c716f1
2018-06-24 10:56:16 -07:00
Treehugger Robot bd76709827 Merge "applypatch: Move to libbase logging." 2018-06-24 17:47:21 +00:00
Jiyong Park 4a9c02ed3a Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition" am: 9b5d4ea20f
am: 681ae40d41

Change-Id: Idecfbea8725d9a0145d9acc17959a59d730ccc3c
2018-06-20 15:30:03 -07:00
Jiyong Park 681ae40d41 Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition"
am: 9b5d4ea20f

Change-Id: I017a76c320f29baff3183b0156c1fdf2deed66bf
2018-06-20 15:24:29 -07:00
Treehugger Robot 9b5d4ea20f Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition" 2018-06-20 22:16:21 +00:00
Tao Bao 8dc704930b applypatch: {Load,Save}FileContents and ParseSha1 take std::string.
Test: mmma -j bootable/recovery
Test: Run recovery_component_test on marlin.
Change-Id: Ifcf244346a88dac833d91b169a4c2aee1fe677f1
2018-06-20 13:21:16 -07:00
Tao Bao 859bfc5659 applypatch: Move to libbase logging.
Test: mmma -j bootable/recovery
Test: Run recovery_component_test on marlin.
Change-Id: I3a4e32eb2c1e231c6690a50571edc66341b8d50a
2018-06-20 13:19:25 -07:00
Tao Bao 8d1ba1d939 Merge "applypatch: Clean up the function comments." am: 24e1321bc3
am: d4c1045d4e

Change-Id: Ib4cd5fca20313f7cf70c209119e5f8f4fdba19ef
2018-06-20 09:32:38 -07:00
Tao Bao ba98704a01 Merge "updater: Defer the creation of the new data writer." am: ddc81680e6
am: ae3e472a43

Change-Id: Ic1e698621b8f32e78bc24c00d85e4bb760f1d782
2018-06-20 09:32:19 -07:00
Tao Bao d4c1045d4e Merge "applypatch: Clean up the function comments."
am: 24e1321bc3

Change-Id: I5115b9450bc7c40009c3bbf2dd6fbffc9cbfd82c
2018-06-20 09:28:39 -07:00
Tao Bao ae3e472a43 Merge "updater: Defer the creation of the new data writer."
am: ddc81680e6

Change-Id: Ibfcc5b765103b41316549ee45636ebf4c377cf84
2018-06-20 09:28:19 -07:00
Tao Bao 24e1321bc3 Merge "applypatch: Clean up the function comments." 2018-06-20 16:26:02 +00:00
Tao Bao ddc81680e6 Merge "updater: Defer the creation of the new data writer." 2018-06-20 16:20:46 +00:00
Jiyong Park 69364fe553 e2fsdroid and mke2fs are dynamic executable in recovery partition
The two utilities are now converted to dynamic executables as shared
libraries are supported in recovery mode.

As part of the conversion, their location has moved from /sbin to
/system/bin. Reflect the change in the program 'recovery'

Bug: 79146551
Test: adb reboot recovery, and select 'Wipe data/factory reset'. The
data partition is formatted and there is no selinux denial.

Change-Id: Ie7cfc4c50ab1e6767e4a5170533ccf826ec7d7f3
2018-06-20 14:24:05 +09:00
Zhomart Mukhamejanov 00c7308d92 Merge "updater_sample: add privileged system app docs" am: 4a2c2d8102
am: 9b4d364409

Change-Id: I70fa5842b37337b0461626395769ab0d0664510b
2018-06-19 19:19:24 -07:00
Zhomart Mukhamejanov 9b4d364409 Merge "updater_sample: add privileged system app docs"
am: 4a2c2d8102

Change-Id: If55faff049dccc585b0dc1db6c4b795d7b93ea9e
2018-06-19 19:14:52 -07:00
Zhomart Mukhamejanov 4a2c2d8102 Merge "updater_sample: add privileged system app docs" 2018-06-20 02:05:50 +00:00
Tao Bao 155771bafa applypatch: Clean up the function comments.
Also two minor changes (other than renaming some parameters):
 - Added constness to the first parameter of FindMatchingPatch();
 - Declared WriteToPartition() as static.

Bug: 110106408
Test: mmma -j bootable/recovery
Change-Id: I388958c944a23ce4a38a757ce2249f6a89dd4f03
2018-06-19 16:33:50 -07:00
Tao Bao 63cc0a7ff9 Merge "Drop the dependency on AB_OTA_UPDATER flag." am: 9fb0d89583
am: a855c33880

Change-Id: Iff00ea3ff120b4261406aa956e982d76f1be0f78
2018-06-19 13:08:37 -07:00
Tao Bao a855c33880 Merge "Drop the dependency on AB_OTA_UPDATER flag."
am: 9fb0d89583

Change-Id: Id57bbf9ba9d8e4fe905dc183f0655f1b24db89fd
2018-06-19 13:05:24 -07:00
Tao Bao 9fb0d89583 Merge "Drop the dependency on AB_OTA_UPDATER flag." 2018-06-19 19:43:43 +00:00
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 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
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
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