f107364495
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: 6c54127462 -s ours am: c4c7abfb41 -s ours
...
am: dc19fd9217
2019-03-11 14:14:58 -07:00
e818616ad4
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 3399fdabf5 -s ours am: 645f73ac4b -s ours
...
am: c2fa178392
2019-03-11 13:52:22 -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
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
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
6c54127462
Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
2019-03-11 18:56:28 +00:00
3399fdabf5
DO NOT MERGE - Merge PPRL.190305.001 into master
...
Bug: 127812889
Change-Id: Ieceaef8b4dd56737a5836dd5e968b609cd084d36
2019-03-11 09:13:10 -07:00
de902a5f9b
Merge "Add a new entry in wipe package to list all wipe partitions" am: a8969842ae am: de5ba7ab97
...
am: a4bd1404e6
2019-03-07 18:14:39 -08: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
23cbb9a7de
Merge "Use O_CLOEXEC at a few places." am: e3857ca43e am: 4e95d7503e
...
am: df2067d038
2019-03-01 16:22:07 -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
b9cbb4d9e2
Merge "Use android::base::Pipe." am: 21cfc8b6f4 am: a04a7d89c2
...
am: 33bbeb40ce
2019-02-28 18:40:52 -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
4be5562ae9
Merge "Updater updater_sample/README.md - build instructions." am: 52db3dc12e am: 2ee3614be3
...
am: 32bd2aa290
2019-02-25 22:47:45 -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
965e5dafd3
Merge stage-aosp-master into pi-dev-plus-aosp
...
am: 3574ac5cff
2019-02-25 05:05:27 -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
fc9c0f4644
Merge "Add a logo to the fastbootd screen." am: d294935bf7 am: dbefca86b8
...
am: 2fc243eef3
2019-02-20 20:26:03 -08: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
0d853ddffd
[automerger skipped] Import translations. DO NOT MERGE am: fc8af23e97 -s ours
...
am: c3f22a4c2d
2019-02-16 12:17:03 -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
983e2d5718
Add a logo to the fastbootd screen.
...
fastbootd looks too much like recovery, even if you're carefully reading
the menu. It's not obvious the device is in a flashing mode, and it's
too tempting to reboot or unplug the device in this state.
As a first step, this patch adds a big red "fastbootd" logo so it's less
obviously in recovery mode.
Bug: 120429730
Test: manual test
Change-Id: I73359f1fdfdc0b1694993f760fe7f35c5713b24e
2019-02-11 19:22:03 -08:00
96a0f6e570
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: c98e5d4ad1 -s ours
...
am: da85ed8792
2019-02-11 19:07:13 -08:00
da85ed8792
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
am: c98e5d4ad1
2019-02-11 18:09:39 -08:00
c98e5d4ad1
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
Bug: 124234733
Change-Id: Ice617995cbe56d367124b3a3420a2caad300acb1
2019-02-11 15:54:16 -08:00
96f7786965
Snap for 5180536 from 8b508c984d to pi-platform-release
...
Change-Id: I18ffadbdab03199e33f4476135b95da658880541
2019-02-09 02:15:09 +00:00
fb064e7e38
Merge "Defer marking boot successful when checkpointing" am: 90edbb17f8 am: 5837eba8ed
...
am: a3c1e2052b
2019-02-07 18:18:48 -08:00
a3c1e2052b
Merge "Defer marking boot successful when checkpointing" am: 90edbb17f8
...
am: 5837eba8ed
2019-02-07 18:01:42 -08:00
5837eba8ed
Merge "Defer marking boot successful when checkpointing"
...
am: 90edbb17f8
2019-02-07 17:49:46 -08:00
90edbb17f8
Merge "Defer marking boot successful when checkpointing"
2019-02-08 01:40:54 +00:00
15f22bddfb
Defer marking boot successful when checkpointing
...
This moves actually marking the slot as successful to a later point
so that on devices with checkpointing enabled we can still roll back to
the previous version if we fail to boot to the point that the checkpoint
is marked as successful.
Test: When taking an update on a checkpoint enabled device, it
defers marking the slot as successful instead of directly
marking it. Visible in logs.
Bug: 123260515
Change-Id: I7ed3595c1b0904ddbfe20d1cad4f69ecbf1ea351
2019-02-07 13:26:05 -08:00
61fd028079
Merge "Recovery test: Fix an parameter issue in string construction" am: e13b39bbb1 am: 644e290d2d
...
am: 6c69b7515d
2019-02-05 17:15:15 -08:00
Xin Li
Treehugger Robot
Tianjie Xu
Tao Bao
Zhomart Mukhamejanov
David Anderson
Bill Yi
android-build-team Robot
Daniel Rosenberg