Zhomart Mukhamejanov
4be5562ae9
Merge "Updater updater_sample/README.md - build instructions." am: 52db3dc12e am: 2ee3614be3
...
am: 32bd2aa290
2019-02-25 22:47:45 -08:00
Zhomart Mukhamejanov
32bd2aa290
Merge "Updater updater_sample/README.md - build instructions." am: 52db3dc12e
...
am: 2ee3614be3
2019-02-25 22:32:42 -08:00
Zhomart Mukhamejanov
2ee3614be3
Merge "Updater updater_sample/README.md - build instructions."
...
am: 52db3dc12e
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
Xin Li
965e5dafd3
Merge stage-aosp-master into pi-dev-plus-aosp
...
am: 3574ac5cff
2019-02-25 05:05:27 -08:00
Xin Li
3574ac5cff
Merge stage-aosp-master into pi-dev-plus-aosp
...
Bug: 126125118
Change-Id: Ib376a93e85883804b7b75085a21683452e1609d3
2019-02-25 00:27:11 -08:00
Xin Li
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
David Anderson
fc9c0f4644
Merge "Add a logo to the fastbootd screen." am: d294935bf7 am: dbefca86b8
...
am: 2fc243eef3
2019-02-20 20:26:03 -08:00
David Anderson
2fc243eef3
Merge "Add a logo to the fastbootd screen." am: d294935bf7
...
am: dbefca86b8
2019-02-20 20:22:05 -08:00
David Anderson
dbefca86b8
Merge "Add a logo to the fastbootd screen."
...
am: d294935bf7
2019-02-20 20:18:05 -08:00
David Anderson
d294935bf7
Merge "Add a logo to the fastbootd screen."
2019-02-21 04:07:29 +00:00
Xin Li
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
Bill Yi
0d853ddffd
[automerger skipped] Import translations. DO NOT MERGE am: fc8af23e97 -s ours
...
am: c3f22a4c2d
2019-02-16 12:17:03 -08:00
Bill Yi
c3f22a4c2d
[automerger skipped] Import translations. DO NOT MERGE
...
am: fc8af23e97
2019-02-16 12:12:05 -08:00
Bill Yi
fc8af23e97
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie357c8e7a6445223a5a657cd0e96ded4689837f6
2019-02-16 01:07:42 -08:00
David Anderson
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
Xin Li
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
Xin Li
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
Xin Li
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
android-build-team Robot
96f7786965
Snap for 5180536 from 8b508c984d to pi-platform-release
...
Change-Id: I18ffadbdab03199e33f4476135b95da658880541
2019-02-09 02:15:09 +00:00
Daniel Rosenberg
fb064e7e38
Merge "Defer marking boot successful when checkpointing" am: 90edbb17f8 am: 5837eba8ed
...
am: a3c1e2052b
2019-02-07 18:18:48 -08:00
Daniel Rosenberg
a3c1e2052b
Merge "Defer marking boot successful when checkpointing" am: 90edbb17f8
...
am: 5837eba8ed
2019-02-07 18:01:42 -08:00
Daniel Rosenberg
5837eba8ed
Merge "Defer marking boot successful when checkpointing"
...
am: 90edbb17f8
2019-02-07 17:49:46 -08:00
Daniel Rosenberg
90edbb17f8
Merge "Defer marking boot successful when checkpointing"
2019-02-08 01:40:54 +00:00
Daniel Rosenberg
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
Tianjie Xu
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
Tianjie Xu
6c69b7515d
Merge "Recovery test: Fix an parameter issue in string construction" am: e13b39bbb1
...
am: 644e290d2d
2019-02-05 17:11:14 -08:00
Tianjie Xu
644e290d2d
Merge "Recovery test: Fix an parameter issue in string construction"
...
am: e13b39bbb1
2019-02-05 17:07:13 -08:00
Tianjie Xu
e13b39bbb1
Merge "Recovery test: Fix an parameter issue in string construction"
2019-02-06 00:53:25 +00:00
xunchang
7b08a5a6eb
Recovery test: Fix an parameter issue in string construction
...
The intended string constructor is supposed be
basic_string(size_type count, CharT ch). But the parameter is
accidentally reversed when calling the constructor in install_test.
Test: A failed unit test pass
Change-Id: Id9765bfa7d2368ff0d7fbeea45c9c8357864e060
2019-02-05 12:44:53 -08:00
Bill Yi
25bfb1bea9
Import translations. DO NOT MERGE
...
Change-Id: Id46b7b2d7bf8f9fe1edd9bb90cc0e3d279f3472c
Auto-generated-cl: translation import
2019-02-01 21:22:54 -08:00
Tom Cherry
0be4406e3c
Merge "Add android::fs_mgr namespace for new Fstab code" am: 990807a95f am: 9594188eea
...
am: 5217b136a6
2019-01-31 12:22:29 -08:00
Tom Cherry
5217b136a6
Merge "Add android::fs_mgr namespace for new Fstab code" am: 990807a95f
...
am: 9594188eea
2019-01-31 12:05:27 -08:00
Tom Cherry
9594188eea
Merge "Add android::fs_mgr namespace for new Fstab code"
...
am: 990807a95f
2019-01-31 11:50:09 -08:00
Tom Cherry
990807a95f
Merge "Add android::fs_mgr namespace for new Fstab code"
2019-01-31 19:35:54 +00:00
Tom Cherry
72a114a3e1
Add android::fs_mgr namespace for new Fstab code
...
Also add libfstab dependencies where needed. Previously the
`typedef struct FstabEntry Volume;` line served to both define a
`struct FstabEntry` as well as alias Volume to it. With the new
namespace for android::fs_mgr::FstabEntry, `struct FstabEntry` isn't
compatible anymore, so we need to alias Volume to the real
android::fs_mgr::FstabEntry.
In doing so, we need to include <fstab/fstab.h> and this requires
libfstab as a library, which a few modules did not have before.
Test: treehugger
Change-Id: I655209a0efb304b3e0568db0748bd5cf7cecbdb7
2019-01-31 09:00:40 -08:00
Tianjie Xu
89b92c1217
Merge "Fix potential size overflow in blockimg.cpp" am: 9a54dd3bf9 am: cc025b2b4a
...
am: d8063b0af4
2019-01-29 16:07:52 -08:00
Tianjie Xu
d8063b0af4
Merge "Fix potential size overflow in blockimg.cpp" am: 9a54dd3bf9
...
am: cc025b2b4a
2019-01-29 15:52:19 -08:00
Tianjie Xu
cc025b2b4a
Merge "Fix potential size overflow in blockimg.cpp"
...
am: 9a54dd3bf9
2019-01-29 15:33:54 -08:00
Tianjie Xu
9a54dd3bf9
Merge "Fix potential size overflow in blockimg.cpp"
2019-01-29 23:08:58 +00:00
Suren Baghdasaryan
794b981823
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency""" am: 5342de92e0 -s ours am: 2b8e48240e -s ours
...
am: 61130815a1
2019-01-25 09:40:04 -08:00
Suren Baghdasaryan
61130815a1
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency""" am: 5342de92e0 -s ours
...
am: 2b8e48240e
2019-01-25 09:28:07 -08:00
Suren Baghdasaryan
2b8e48240e
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency"""
...
am: 5342de92e0
2019-01-25 09:18:11 -08:00
Suren Baghdasaryan
5342de92e0
Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency"""
2019-01-25 17:09:02 +00:00
Suren Baghdasaryan
0ca607c4cd
DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency""
...
This reverts commit 9ce1d14ef6
2019-01-25 05:43:59 +00:00
Suren Baghdasaryan
985070ed98
[automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency"" am: 7548e0d6fa -s ours am: 56d6cf2c94 -s ours
...
am: d631ac484d
2019-01-23 23:27:19 -08:00
Suren Baghdasaryan
d631ac484d
[automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency"" am: 7548e0d6fa -s ours
...
am: 56d6cf2c94
2019-01-23 23:14:43 -08:00
Suren Baghdasaryan
56d6cf2c94
[automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency""
...
am: 7548e0d6fa
2019-01-23 23:05:33 -08:00
Suren Baghdasaryan
7548e0d6fa
Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency""
2019-01-24 06:57:55 +00:00
