David Anderson
569f587afd
Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 am: 0c34ef807b
...
am: 185013413e
2019-09-05 16:59:02 -07:00
David Anderson
185013413e
Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828
...
am: 0c34ef807b
2019-09-05 16:51:48 -07:00
David Anderson
0c34ef807b
Merge "boot_control: Don't allow current_slot_ to be -1."
...
am: 9c0f102828
2019-09-05 16:41:07 -07:00
David Anderson
9c0f102828
Merge "boot_control: Don't allow current_slot_ to be -1."
2019-09-05 20:21:47 +00:00
Xin Li
42c411dbbc
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: e0364db712 -s ours
...
am: 8bb31dbab7
2019-09-05 11:32:10 -07:00
Xin Li
8bb31dbab7
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
...
am: e0364db712
2019-09-05 11:20:06 -07:00
Xin Li
e0364db712
Merge "DO NOT MERGE - Merge Android 10 into master"
2019-09-05 16:53:28 +00:00
David Anderson
643ddd99df
boot_control: Don't allow current_slot_ to be -1.
...
If the HAL is run on a non-A/B device, it does not fail gracefully; it
will segfault because the current_slot is -1 and methods do not protect
against this. Instead, have Init() fail if we can't determine the
current slot.
Bug: 130078382
Test: vts tests
Change-Id: I2d3094518a842b1a764427d2da9d46781a9f26da
2019-09-04 18:12:23 -07:00
Xin Li
007ac2d5fb
DO NOT MERGE - Merge Android 10 into master
...
Bug: 139893257
Change-Id: Id844b347e95335800502d9b5aeb15e18aabd29e1
2019-09-04 13:32:49 -07:00
David Anderson
b9e7f63370
Merge "Make libboot_control vendor available." am: e3a35dc808 am: 388d2a591c
...
am: bda485070c
2019-09-03 13:14:21 -07:00
David Anderson
ef2ec5f840
Merge "Refactor boot_control into a separate library." am: eb35817830 am: 754e7fc190
...
am: 6bf93864ce
2019-09-03 13:13:33 -07:00
David Anderson
bda485070c
Merge "Make libboot_control vendor available." am: e3a35dc808
...
am: 388d2a591c
2019-09-03 13:07:06 -07:00
David Anderson
6bf93864ce
Merge "Refactor boot_control into a separate library." am: eb35817830
...
am: 754e7fc190
2019-09-03 13:06:29 -07:00
David Anderson
388d2a591c
Merge "Make libboot_control vendor available."
...
am: e3a35dc808
2019-09-03 13:00:16 -07:00
David Anderson
754e7fc190
Merge "Refactor boot_control into a separate library."
...
am: eb35817830
2019-09-03 12:59:35 -07:00
David Anderson
e3a35dc808
Merge "Make libboot_control vendor available."
2019-09-03 19:36:59 +00:00
David Anderson
eb35817830
Merge "Refactor boot_control into a separate library."
2019-09-03 19:33:22 +00:00
David Anderson
f771484f4e
Make libboot_control vendor available.
...
Bug: 138861550
Test: builds
Change-Id: Ib745b59931c6258073e47b00def84c9157df90a7
2019-08-30 10:21:00 -07:00
David Anderson
8108e2513f
Refactor boot_control into a separate library.
...
This extracts the implementation of boot_control into a new library,
libboot_control. The bootctrl.default module now wraps this library.
This refactoring will allow us to re-use the same implementation in
HIDL.
Bug: 138861550
Test: mm bootctrl.default
Change-Id: Ic0558da3c2d8e6f5ebec63a497825c24b51623b7
2019-08-30 10:20:59 -07:00
Xin Li
8fb95b5ae3
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bc7898323c -s ours
...
am: b3aeafddca
2019-08-24 01:33:50 -07:00
Xin Li
b3aeafddca
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
...
am: bc7898323c
2019-08-23 21:39:14 -07:00
Xin Li
584da181c5
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 5ac14106ff -s ours
...
am: 6e3d8bed97
2019-08-23 21:17:12 -07:00
Xin Li
6e3d8bed97
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
...
am: 5ac14106ff
2019-08-23 20:25:20 -07:00
Xin Li
bc7898323c
DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
...
Bug: 139893257
Change-Id: Ibe6f21e2e0fd3a6626674595e4950d6adaff40fb
2019-08-23 06:44:50 +00:00
Xin Li
5ac14106ff
DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
...
Bug: 139893257
Change-Id: I3192a663f542955f012bcdcc42774624cc9e1891
2019-08-23 06:42:00 +00:00
Yifan Hong
8f2745c31d
Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 am: 41fd3c3ad9
...
am: 0df5805d21
2019-08-16 11:45:13 -07:00
Yifan Hong
0df5805d21
Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779
...
am: 41fd3c3ad9
2019-08-16 11:34:48 -07:00
Yifan Hong
41fd3c3ad9
Merge "updater: Fix build for new CreateLogicalPartition signature."
...
am: 18c3f78779
2019-08-16 11:24:53 -07:00
Yifan Hong
18c3f78779
Merge "updater: Fix build for new CreateLogicalPartition signature."
2019-08-16 17:41:22 +00:00
Tianjie Xu
9f1625a115
Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61
...
am: 9387e5cd61
2019-08-15 19:10:55 -07:00
Tianjie Xu
9387e5cd61
Merge "Remove common.h" am: 899f7b5105
...
am: 03fd851f61
2019-08-15 18:59:51 -07:00
Tianjie Xu
03fd851f61
Merge "Remove common.h"
...
am: 899f7b5105
2019-08-15 18:05:25 -07:00
Tianjie Xu
899f7b5105
Merge "Remove common.h"
2019-08-16 00:24:41 +00:00
Tao Bao
15f088a2e6
Merge "minui: Support input device hotplug in recovery mode." am: ecc208286f am: f934163f4c
...
am: 9c9d845ae5
2019-08-15 16:34:32 -07:00
Tao Bao
9c9d845ae5
Merge "minui: Support input device hotplug in recovery mode." am: ecc208286f
...
am: f934163f4c
2019-08-15 16:23:31 -07:00
Tao Bao
f934163f4c
Merge "minui: Support input device hotplug in recovery mode."
...
am: ecc208286f
2019-08-15 16:13:31 -07:00
Tao Bao
ecc208286f
Merge "minui: Support input device hotplug in recovery mode."
2019-08-15 22:43:30 +00:00
Tianjie Xu
b63a2215b5
Remove common.h
...
Additionally kill the global variable: reason, stage; move them to a
separate BootState class instead. Vendor specific recovery code will
need to call getters from Device() class to access these variables.
Bug: 137705917
Test: unit tests pass, boot sailfish into recovery, code search and no
code includes common.h in vendor specific recovery.
Change-Id: Ia50a5ea951212c25548562f29cc9cf78505b5e34
2019-08-15 13:40:16 -07:00
Xihua Chen
a7952ac141
minui: Support input device hotplug in recovery mode.
...
In the old code, the recovery only enumerated the input devices at the
startup, and read the input events from these devices.
So if a USB input device is probed after the recovery startup, then the
recovery can't read the events from this device.
This patch use inotify to monitor /dev/input for new added input
device, then support input device hotplug in recovery mode.
Bug: 111847510
Test: can use USB keyboard hotplugged in recovery mode
Change-Id: I7e7dcbd619d3c66a2f40a43418f5dac6a50c859e
Signed-off-by: Liu Shuo A <shuo.a.liu@intel.com >
Signed-off-by: Ming Tan <ming.tan@intel.com >
2019-08-14 14:18:58 -07:00
Xin Li
11a2fb92c2
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 1ba485fbde -s ours
...
am: 2e3532fa96
2019-08-14 13:42:56 -07:00
Xin Li
2e3532fa96
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
am: 1ba485fbde
2019-08-14 13:17:52 -07:00
David Anderson
3cbd7ae687
updater: Fix build for new CreateLogicalPartition signature.
...
Bug: 135752105
Test: mm libupdater_device
Change-Id: I9dc6dc1e9112177ee5c0a96b8969dc3dc02d95f2
2019-08-14 12:32:55 -07:00
Xin Li
1ba485fbde
DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
Bug: 134405016
Change-Id: I98da75f9e4ab07527759b5cc372e14e1f79f2498
2019-08-14 11:35:07 -07:00
Vic Yang
e858e2fe81
Merge "bootloader_message: Remove global std::string" am: 7b87949ae1 am: 76d80ba102
...
am: 8946524a79
2019-08-07 19:07:51 -07:00
Vic Yang
8946524a79
Merge "bootloader_message: Remove global std::string" am: 7b87949ae1
...
am: 76d80ba102
2019-08-07 18:56:48 -07:00
Vic Yang
76d80ba102
Merge "bootloader_message: Remove global std::string"
...
am: 7b87949ae1
2019-08-07 18:47:47 -07:00
Treehugger Robot
7b87949ae1
Merge "bootloader_message: Remove global std::string"
2019-08-08 01:24:29 +00:00
Vic Yang
e94b64ae86
bootloader_message: Remove global std::string
...
A global std::string, even if not used, pollutes the bss section
unnecessarily. Since this object is only there for testing, make it
std::optional<std::string>, which is constexpr constructible.
Bug: 138856262
Test: Along with a fix in fs_mgr, see that the bss section for
libbootloader_message.so is now clean on cuttlefish for several
processes.
Change-Id: I6df837dded88d979ffe14d5b2770b120bcf87341
2019-08-07 14:12:36 -07:00
Tianjie Xu
05fa10519d
Merge "Simulator: add the argument to keep the updated images" am: c34e4e7fb5 am: be3f56543e
...
am: 112acdc043
2019-07-31 16:49:02 -07:00
Tianjie Xu
112acdc043
Merge "Simulator: add the argument to keep the updated images" am: c34e4e7fb5
...
am: be3f56543e
2019-07-31 16:33:59 -07:00
