5a379607ad
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 5ac14106ff -s ours am: 6e3d8bed97 am: 584da181c5
...
am: 58c7edfedf
2019-08-26 12:37:57 -07:00
58c7edfedf
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 5ac14106ff -s ours am: 6e3d8bed97
...
am: 584da181c5
2019-08-26 11:26:32 -07:00
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
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
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
dc178d9737
Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 am: 41fd3c3ad9 am: 0df5805d21 am: 8f2745c31d
...
am: fc7e2911e8
2019-08-16 12:03:27 -07:00
fc7e2911e8
Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 am: 41fd3c3ad9 am: 0df5805d21
...
am: 8f2745c31d
2019-08-16 11:54:23 -07:00
8f2745c31d
Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 am: 41fd3c3ad9
...
am: 0df5805d21
2019-08-16 11:45:13 -07:00
0df5805d21
Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779
...
am: 41fd3c3ad9
2019-08-16 11:34:48 -07:00
41fd3c3ad9
Merge "updater: Fix build for new CreateLogicalPartition signature."
...
am: 18c3f78779
2019-08-16 11:24:53 -07:00
18c3f78779
Merge "updater: Fix build for new CreateLogicalPartition signature."
2019-08-16 17:41:22 +00:00
61fb1bbaf7
Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61 am: 9387e5cd61 am: 9f1625a115
...
am: 6718707817
2019-08-15 19:47:19 -07:00
6718707817
Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61 am: 9387e5cd61
...
am: 9f1625a115
2019-08-15 19:24:56 -07:00
9f1625a115
Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61
...
am: 9387e5cd61
2019-08-15 19:10:55 -07:00
9387e5cd61
Merge "Remove common.h" am: 899f7b5105
...
am: 03fd851f61
2019-08-15 18:59:51 -07:00
03fd851f61
Merge "Remove common.h"
...
am: 899f7b5105
2019-08-15 18:05:25 -07:00
899f7b5105
Merge "Remove common.h"
2019-08-16 00:24:41 +00:00
cbc7e79dd9
Merge "minui: Support input device hotplug in recovery mode." am: ecc208286f am: f934163f4c am: 9c9d845ae5 am: 15f088a2e6
...
am: 3b572fb15c
2019-08-15 16:59:47 -07:00
3b572fb15c
Merge "minui: Support input device hotplug in recovery mode." am: ecc208286f am: f934163f4c am: 9c9d845ae5
...
am: 15f088a2e6
2019-08-15 16:44:34 -07:00
15f088a2e6
Merge "minui: Support input device hotplug in recovery mode." am: ecc208286f am: f934163f4c
...
am: 9c9d845ae5
2019-08-15 16:34:32 -07:00
9c9d845ae5
Merge "minui: Support input device hotplug in recovery mode." am: ecc208286f
...
am: f934163f4c
2019-08-15 16:23:31 -07:00
f934163f4c
Merge "minui: Support input device hotplug in recovery mode."
...
am: ecc208286f
2019-08-15 16:13:31 -07:00
ecc208286f
Merge "minui: Support input device hotplug in recovery mode."
2019-08-15 22:43:30 +00:00
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
d3f582d1ef
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 1ba485fbde -s ours am: 2e3532fa96 am: 11a2fb92c2
...
am: 32ddaab773
2019-08-14 14:52:25 -07:00
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
32ddaab773
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 1ba485fbde -s ours am: 2e3532fa96
...
am: 11a2fb92c2
2019-08-14 14:07:47 -07:00
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
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
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
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
c19d76833a
Merge "bootloader_message: Remove global std::string" am: 7b87949ae1 am: 76d80ba102 am: 8946524a79 am: e858e2fe81
...
am: ecca6ec533
2019-08-07 19:28:56 -07:00
ecca6ec533
Merge "bootloader_message: Remove global std::string" am: 7b87949ae1 am: 76d80ba102 am: 8946524a79
...
am: e858e2fe81
2019-08-07 19:17:54 -07:00
e858e2fe81
Merge "bootloader_message: Remove global std::string" am: 7b87949ae1 am: 76d80ba102
...
am: 8946524a79
2019-08-07 19:07:51 -07:00
8946524a79
Merge "bootloader_message: Remove global std::string" am: 7b87949ae1
...
am: 76d80ba102
2019-08-07 18:56:48 -07:00
76d80ba102
Merge "bootloader_message: Remove global std::string"
...
am: 7b87949ae1
2019-08-07 18:47:47 -07:00
7b87949ae1
Merge "bootloader_message: Remove global std::string"
2019-08-08 01:24:29 +00:00
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
d4d5275616
Merge "Simulator: add the argument to keep the updated images" am: c34e4e7fb5 am: be3f56543e am: 112acdc043 am: 05fa10519d
...
am: 4375704cac
2019-07-31 17:46:05 -07:00
4375704cac
Merge "Simulator: add the argument to keep the updated images" am: c34e4e7fb5 am: be3f56543e am: 112acdc043
...
am: 05fa10519d
2019-07-31 17:10:56 -07:00
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
112acdc043
Merge "Simulator: add the argument to keep the updated images" am: c34e4e7fb5
...
am: be3f56543e
2019-07-31 16:33:59 -07:00
be3f56543e
Merge "Simulator: add the argument to keep the updated images"
...
am: c34e4e7fb5
2019-07-31 16:16:56 -07:00
c34e4e7fb5
Merge "Simulator: add the argument to keep the updated images"
2019-07-31 22:34:34 +00:00
60b242cfd5
Simulator: add the argument to keep the updated images
...
Add the command line option to select the work directory and save the
updated image files. Because some people might have interested in
getting updated images from an ota file.
Also, fix a minor issue that the destination of package_extract_file
needs to be updated if it's a block device. Otherwise, an unintended
file may be extracted in the callers' directory.
Test: run simulation, run unit tests
Change-Id: Ic6a7db0580bc1748d6e080102e4654da4e41fd8c
2019-07-30 17:11:35 -07:00
3fb65450b3
Merge "Create a new function to return the help message for menu" am: 5d9f963e4e am: b25d741563 am: c234be1655 am: a89bb37a4c
...
am: 1c7a5d8421
2019-07-26 11:53:31 -07:00
1c7a5d8421
Merge "Create a new function to return the help message for menu" am: 5d9f963e4e am: b25d741563 am: c234be1655
...
am: a89bb37a4c
2019-07-26 11:43:34 -07:00
a89bb37a4c
Merge "Create a new function to return the help message for menu" am: 5d9f963e4e am: b25d741563
...
am: c234be1655
2019-07-26 11:33:27 -07:00
c234be1655
Merge "Create a new function to return the help message for menu" am: 5d9f963e4e
...
am: b25d741563
2019-07-26 11:22:24 -07:00
b25d741563
Merge "Create a new function to return the help message for menu"
...
am: 5d9f963e4e
2019-07-26 11:13:22 -07:00
Xin Li
Yifan Hong
Tianjie Xu
Tao Bao
Xihua Chen
David Anderson
Vic Yang
Treehugger Robot