Commit Graph

7530 Commits

Author SHA1 Message Date
Tianjie Xu 223879ce4b Merge "Update_verifier: Remove the support for legacy text format CareMap" 2019-03-14 01:14:44 +00:00
xunchang aab4b829f4 Update_verifier: Remove the support for legacy text format CareMap
We have already switched to the protobuf format for new builds, and
the downgrade packages will require a data wipe. So it should be safe
to drop the support for text format.

This also helps to save the issue when users sideload a package with a
pending OTA, because the new CareMap contains the fingerprint of the
intended build.

Bug: 128536706
Test: unit tests pass, run update_verifier with legacy CareMap
Change-Id: I1c4d0e54ec591f16cc0a65dac76767725ff9e7c4
(cherry picked from commit aaa6103ae7)
2019-03-13 15:26:23 -07:00
Tianjie Xu 0a4de0865b Merge "Use the package class for wipe packages" am: 2a33682ef5 am: 682cd4fbc4
am: aac4903a64

Change-Id: Id5ebb2a7d8fdd0e4f14197bafce928479ee5943e
2019-03-12 23:15:54 -07:00
Tianjie Xu aac4903a64 Merge "Use the package class for wipe packages" am: 2a33682ef5
am: 682cd4fbc4

Change-Id: I2f85ee25631805263032e67ec35511b28c06640d
2019-03-12 22:43:55 -07:00
Tianjie Xu 682cd4fbc4 Merge "Use the package class for wipe packages"
am: 2a33682ef5

Change-Id: I443b7120d47083bdc31412bc2d49dd61be4ba848
2019-03-12 21:54:03 -07:00
Tianjie Xu 2a33682ef5 Merge "Use the package class for wipe packages" 2019-03-13 02:11:47 +00:00
xunchang 55e3d22223 Use the package class for wipe packages
The wipe package used to open the zip file directly from the content
string. Switch to use the interface from the new package class instead.

Bug: 127071893
Test: unit tests pass
Change-Id: I990e7f00c5148710722d17140bab2e343eea3b6b
2019-03-12 15:10:41 -07:00
Tao Bao 28e7cca4cb Merge "minui: Managed FDs with smart pointers." am: fc7a0dc3a2 am: 7b8303f072
am: 7d9780c822

Change-Id: I6a3ff3ce19dab36e7c8ffbb4d1c6bd4804b83a1e
2019-03-12 14:47:33 -07:00
Tao Bao 7d9780c822 Merge "minui: Managed FDs with smart pointers." am: fc7a0dc3a2
am: 7b8303f072

Change-Id: Ibf7bb5aec11fe3f236a15b2e30db43d09dc60e31
2019-03-12 14:43:31 -07:00
Tao Bao 7b8303f072 Merge "minui: Managed FDs with smart pointers."
am: fc7a0dc3a2

Change-Id: I0cddcea8559d8aa90db80be4a5f3ef5d667ad139
2019-03-12 14:23:25 -07:00
Tao Bao fc7a0dc3a2 Merge "minui: Managed FDs with smart pointers." 2019-03-12 21:05:41 +00:00
Tao Bao 96f1ee7cdb Merge "minui: Fix the wrong move of the callback." am: aefc9e3ba9 am: ea37122996
am: 8da3816e33

Change-Id: Idce21a2c0cb7c2fe5c3b35b7bb589e7b1e27b82d
2019-03-11 17:07:14 -07:00
Tao Bao 8da3816e33 Merge "minui: Fix the wrong move of the callback." am: aefc9e3ba9
am: ea37122996

Change-Id: I1b213b5c60621e47e63520659b81954b864ec960
2019-03-11 16:45:30 -07:00
Tao Bao ea37122996 Merge "minui: Fix the wrong move of the callback."
am: aefc9e3ba9

Change-Id: I2bdfb43f7d161de8cda635a48547db15ce05438c
2019-03-11 16:11:13 -07:00
Tao Bao 835bf09a14 minui: Managed FDs with smart pointers.
Also clean up a few variable names.

Test: Boot into recovery. Check key inputs.
Change-Id: I058475ac22f3db8523bd8aa30ccb61be1ef45559
2019-03-11 15:59:09 -07:00
Tao Bao aefc9e3ba9 Merge "minui: Fix the wrong move of the callback." 2019-03-11 22:51:50 +00:00
Tianjie Xu 650c1c0941 Merge "Create a wrapper class for update package" am: ba9965199a am: d4f28312dc
am: 5f0c7e0356

Change-Id: I2b15e4094cbb70a18ef80f2178beb3e8ac40fb43
2019-03-11 14:40:44 -07:00
Xin Li f107364495 [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: 6c54127462 -s ours am: c4c7abfb41 -s ours
am: dc19fd9217 -s ours
am skip reason: subject contains skip directive

Change-Id: I9dedee3a916469e533068daea27c2e77d4900d97
2019-03-11 14:14:58 -07:00
Tianjie Xu 5f0c7e0356 Merge "Create a wrapper class for update package" am: ba9965199a
am: d4f28312dc

Change-Id: I737fdd08ceea35db4158532cfa3a8a01fe5dbba7
2019-03-11 14:10:45 -07:00
Xin Li e818616ad4 [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 3399fdabf5 -s ours am: 645f73ac4b -s ours
am: c2fa178392 -s ours
am skip reason: subject contains skip directive

Change-Id: I7fdda6acb0d6ccdef6244cbcf2abe0ed6ae6d6db
2019-03-11 13:52:22 -07:00
Xin Li dc19fd9217 [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: 6c54127462 -s ours
am: c4c7abfb41 -s ours
am skip reason: subject contains skip directive

Change-Id: I762fa0a55e6c8eae15a32cdc2a03021735496b19
2019-03-11 13:25:16 -07:00
Tianjie Xu d4f28312dc Merge "Create a wrapper class for update package"
am: ba9965199a

Change-Id: I47c82792b37d0e720ab54876915c8aba288382c7
2019-03-11 13:13:57 -07:00
Xin Li c2fa178392 [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 3399fdabf5 -s ours
am: 645f73ac4b -s ours
am skip reason: subject contains skip directive

Change-Id: Ibf364dac68820722421ea8bd60a95c901a28eeeb
2019-03-11 13:07:01 -07:00
Tianjie Xu ba9965199a Merge "Create a wrapper class for update package" 2019-03-11 19:53:57 +00:00
Xin Li c4c7abfb41 [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
am: 6c54127462 -s ours
am skip reason: subject contains skip directive

Change-Id: I77cd31b071f61d3d010af29408c732134d9b7028
2019-03-11 12:52:32 -07:00
Xin Li 645f73ac4b [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
am: 3399fdabf5 -s ours
am skip reason: subject contains skip directive

Change-Id: I76691bb68b90c6cc4165c64b90daeb3bb71b77e1
2019-03-11 12:31:39 -07:00
Tao Bao dfdf63501e minui: Fix the wrong move of the callback.
The input_cb in ev_init() should be shared among the detected input
devices.

Test: Boot into recovery. Check key inputs.
Change-Id: I0315f6a23625bacedd333fefacbf4ac6797bc1fd
2019-03-11 12:07:11 -07:00
Treehugger Robot 6c54127462 Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" 2019-03-11 18:56:28 +00:00
xunchang f07ed2efeb Create a wrapper class for update package
Creates a new class handle the package in memory and package read from fd.
Define the new interface functions, and make approximate changes to the
verify and install functions.

Bug: 127071893
Test: unit tests pass, sideload a package
Change-Id: I66ab00654df92471184536fd147b237a86e9c5b5
2019-03-11 10:43:52 -07:00
Xin Li 3399fdabf5 DO NOT MERGE - Merge PPRL.190305.001 into master
Bug: 127812889
Change-Id: Ieceaef8b4dd56737a5836dd5e968b609cd084d36
2019-03-11 09:13:10 -07:00
Tianjie Xu de902a5f9b Merge "Add a new entry in wipe package to list all wipe partitions" am: a8969842ae am: de5ba7ab97
am: a4bd1404e6

Change-Id: Ie0e54c0f4d35cc0fd72eb2d86e5a16fd3b957300
2019-03-07 18:14:39 -08:00
Tianjie Xu a4bd1404e6 Merge "Add a new entry in wipe package to list all wipe partitions" am: a8969842ae
am: de5ba7ab97

Change-Id: Ifa7953e465954fc733688d4288a740022362be2a
2019-03-07 17:29:06 -08:00
Tianjie Xu de5ba7ab97 Merge "Add a new entry in wipe package to list all wipe partitions"
am: a8969842ae

Change-Id: I436eebb747d7474c5cae754e6c1d2f6ad0546b56
2019-03-07 16:51:46 -08:00
Tianjie Xu a8969842ae Merge "Add a new entry in wipe package to list all wipe partitions" 2019-03-07 22:14:43 +00:00
xunchang e0d991ceca Add a new entry in wipe package to list all wipe partitions
This gives us finer control over the partitions to wipe on the host
side.

Bug: 127492427
Test: unit tests pass, install a wipe package on sailfish
Change-Id: I612f8bac743a310f28e365b490ef388b278cfccb
2019-03-06 15:37:28 -08:00
Tao Bao 23cbb9a7de Merge "Use O_CLOEXEC at a few places." am: e3857ca43e am: 4e95d7503e
am: df2067d038

Change-Id: I92ca72988bb96ab0c17becc9d93d1ade30037c61
2019-03-01 16:22:07 -08:00
Tao Bao df2067d038 Merge "Use O_CLOEXEC at a few places." am: e3857ca43e
am: 4e95d7503e

Change-Id: Ic7a3d4af225abc0c21c76881b00efa7427ec2915
2019-03-01 16:18:06 -08:00
Tao Bao 4e95d7503e Merge "Use O_CLOEXEC at a few places."
am: e3857ca43e

Change-Id: If5b1622ca66d0722107bdac5daef1eda823cdf20
2019-03-01 16:14:07 -08:00
Treehugger Robot e3857ca43e Merge "Use O_CLOEXEC at a few places." 2019-03-02 00:04:26 +00:00
Tao Bao b549243b27 Use O_CLOEXEC at a few places.
Found these FDs unintentionally propagated into forked processes (e.g.
updater) during my local debugging. Use O_CLOEXEC to avoid that.

Test: Dump open FDs in updater process.
Test: Sideload a package on taimen (which uses framebuffer).
Test: Run graphics test on taimen.
Change-Id: I1fb65dd4a103c47d28b15973def9e9359c251ca3
2019-03-01 14:24:41 -08:00
Tao Bao b9cbb4d9e2 Merge "Use android::base::Pipe." am: 21cfc8b6f4 am: a04a7d89c2
am: 33bbeb40ce

Change-Id: Ifcbc4cd5923d82893c7428951955cb0cd4207a3a
2019-02-28 18:40:52 -08:00
Tao Bao 33bbeb40ce Merge "Use android::base::Pipe." am: 21cfc8b6f4
am: a04a7d89c2

Change-Id: Ibc0d9bc7766572901fa20a1d1acb8edd8f760a3c
2019-02-28 18:33:44 -08:00
Tao Bao a04a7d89c2 Merge "Use android::base::Pipe."
am: 21cfc8b6f4

Change-Id: Ic7c2cb62062710984fa3fbd5ed3c577cd84cd926
2019-02-28 18:29:35 -08:00
Treehugger Robot 21cfc8b6f4 Merge "Use android::base::Pipe." 2019-03-01 02:17:24 +00:00
Tao Bao 6fcd208db4 Use android::base::Pipe.
Also clean up the comments regarding updater/recovery protocol.

Test: Sideload a package on taimen. Check that /tmp/recovery.log
      contains the log from update_engine_sideload.
Test: Factory reset on taimen. Check that log file has the info from
      mke2fs.
Change-Id: If560269ce7007769fc85a63bd228813bdd75bebd
2019-02-28 15:53:28 -08:00
Zhomart Mukhamejanov 4be5562ae9 Merge "Updater updater_sample/README.md - build instructions." am: 52db3dc12e am: 2ee3614be3
am: 32bd2aa290

Change-Id: Ie988dd227283f3280466e7ad375ffc857ea6b679
2019-02-25 22:47:45 -08:00
Zhomart Mukhamejanov 32bd2aa290 Merge "Updater updater_sample/README.md - build instructions." am: 52db3dc12e
am: 2ee3614be3

Change-Id: I0849351afb0796f430b71263c250b2e721f665fd
2019-02-25 22:32:42 -08:00
Zhomart Mukhamejanov 2ee3614be3 Merge "Updater updater_sample/README.md - build instructions."
am: 52db3dc12e

Change-Id: I71784d07fc6952377c5a06116f2aa0850d613ee3
2019-02-25 20:57:58 -08:00
Zhomart Mukhamejanov 52db3dc12e Merge "Updater updater_sample/README.md - build instructions." 2019-02-26 04:00:52 +00:00
Zhomart Mukhamejanov 011b5bbc06 Updater updater_sample/README.md - build instructions.
Change-Id: Icbd577e3ceeec2766eca690b529b31f562df6fb2
Test: docs only
2019-02-25 16:19:55 -08:00