9d35593f89
Merge "update_verifier: Add some missing #include's." am: 05f9a8e100
...
am: 6105a6fb6e
2019-03-13 19:29:38 -07:00
6105a6fb6e
Merge "update_verifier: Add some missing #include's."
...
am: 05f9a8e100
2019-03-13 19:25:35 -07:00
05f9a8e100
Merge "update_verifier: Add some missing #include's."
2019-03-14 02:10:18 +00:00
c89c394b46
update_verifier: Add some missing #include's.
...
<stdint.h> for uint8_t; <stdlib.h> for free(3); <thread> for
std::thread.
Test: mmma -j bootable/recovery
Test: Run unit tests on crosshatch.
Change-Id: Id99b29b3d514f4e453983599c8b1aa6b0fab4ef8
2019-03-13 15:45:39 -07:00
aac4903a64
Merge "Use the package class for wipe packages" am: 2a33682ef5
...
am: 682cd4fbc4
2019-03-12 22:43:55 -07:00
682cd4fbc4
Merge "Use the package class for wipe packages"
...
am: 2a33682ef5
2019-03-12 21:54:03 -07:00
2a33682ef5
Merge "Use the package class for wipe packages"
2019-03-13 02:11:47 +00:00
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
7d9780c822
Merge "minui: Managed FDs with smart pointers." am: fc7a0dc3a2
...
am: 7b8303f072
2019-03-12 14:43:31 -07:00
7b8303f072
Merge "minui: Managed FDs with smart pointers."
...
am: fc7a0dc3a2
2019-03-12 14:23:25 -07:00
fc7a0dc3a2
Merge "minui: Managed FDs with smart pointers."
2019-03-12 21:05:41 +00:00
8da3816e33
Merge "minui: Fix the wrong move of the callback." am: aefc9e3ba9
...
am: ea37122996
2019-03-11 16:45:30 -07:00
ea37122996
Merge "minui: Fix the wrong move of the callback."
...
am: aefc9e3ba9
2019-03-11 16:11:13 -07:00
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
aefc9e3ba9
Merge "minui: Fix the wrong move of the callback."
2019-03-11 22:51:50 +00:00
5f0c7e0356
Merge "Create a wrapper class for update package" am: ba9965199a
...
am: d4f28312dc
2019-03-11 14:10:45 -07:00
dc19fd9217
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: 6c54127462 -s ours
...
am: c4c7abfb41
2019-03-11 13:25:16 -07:00
d4f28312dc
Merge "Create a wrapper class for update package"
...
am: ba9965199a
2019-03-11 13:13:57 -07:00
c2fa178392
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 3399fdabf5 -s ours
...
am: 645f73ac4b
2019-03-11 13:07:01 -07:00
ba9965199a
Merge "Create a wrapper class for update package"
2019-03-11 19:53:57 +00:00
c4c7abfb41
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
...
am: 6c54127462
2019-03-11 12:52:32 -07:00
645f73ac4b
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
...
am: 3399fdabf5
2019-03-11 12:31:39 -07:00
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
6c54127462
Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
2019-03-11 18:56:28 +00:00
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
3399fdabf5
DO NOT MERGE - Merge PPRL.190305.001 into master
...
Bug: 127812889
Change-Id: Ieceaef8b4dd56737a5836dd5e968b609cd084d36
2019-03-11 09:13:10 -07:00
a4bd1404e6
Merge "Add a new entry in wipe package to list all wipe partitions" am: a8969842ae
...
am: de5ba7ab97
2019-03-07 17:29:06 -08:00
de5ba7ab97
Merge "Add a new entry in wipe package to list all wipe partitions"
...
am: a8969842ae
2019-03-07 16:51:46 -08:00
a8969842ae
Merge "Add a new entry in wipe package to list all wipe partitions"
2019-03-07 22:14:43 +00:00
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
df2067d038
Merge "Use O_CLOEXEC at a few places." am: e3857ca43e
...
am: 4e95d7503e
2019-03-01 16:18:06 -08:00
4e95d7503e
Merge "Use O_CLOEXEC at a few places."
...
am: e3857ca43e
2019-03-01 16:14:07 -08:00
e3857ca43e
Merge "Use O_CLOEXEC at a few places."
2019-03-02 00:04:26 +00:00
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
33bbeb40ce
Merge "Use android::base::Pipe." am: 21cfc8b6f4
...
am: a04a7d89c2
2019-02-28 18:33:44 -08:00
a04a7d89c2
Merge "Use android::base::Pipe."
...
am: 21cfc8b6f4
2019-02-28 18:29:35 -08:00
21cfc8b6f4
Merge "Use android::base::Pipe."
2019-03-01 02:17:24 +00:00
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
32bd2aa290
Merge "Updater updater_sample/README.md - build instructions." am: 52db3dc12e
...
am: 2ee3614be3
2019-02-25 22:32:42 -08:00
2ee3614be3
Merge "Updater updater_sample/README.md - build instructions."
...
am: 52db3dc12e
2019-02-25 20:57:58 -08:00
52db3dc12e
Merge "Updater updater_sample/README.md - build instructions."
2019-02-26 04:00:52 +00:00
011b5bbc06
Updater updater_sample/README.md - build instructions.
...
Change-Id: Icbd577e3ceeec2766eca690b529b31f562df6fb2
Test: docs only
2019-02-25 16:19:55 -08:00
3574ac5cff
Merge stage-aosp-master into pi-dev-plus-aosp
...
Bug: 126125118
Change-Id: Ib376a93e85883804b7b75085a21683452e1609d3
2019-02-25 00:27:11 -08:00
d429ddca6b
Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master
2019-02-21 07:04:42 +00:00
2fc243eef3
Merge "Add a logo to the fastbootd screen." am: d294935bf7
...
am: dbefca86b8
2019-02-20 20:22:05 -08:00
dbefca86b8
Merge "Add a logo to the fastbootd screen."
...
am: d294935bf7
2019-02-20 20:18:05 -08:00
d294935bf7
Merge "Add a logo to the fastbootd screen."
2019-02-21 04:07:29 +00:00
6b72e3f03b
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
Bug: 120848293
Change-Id: I4ac749387dca39a09e96ea5588b651d06728033b
2019-02-20 16:17:20 -08:00
c3f22a4c2d
[automerger skipped] Import translations. DO NOT MERGE
...
am: fc8af23e97
2019-02-16 12:12:05 -08:00
fc8af23e97
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie357c8e7a6445223a5a657cd0e96ded4689837f6
2019-02-16 01:07:42 -08:00
Tao Bao
Treehugger Robot
Tianjie Xu
Xin Li
Zhomart Mukhamejanov
David Anderson
Bill Yi