Commit Graph
8197 Commits
Author SHA1 Message Date
Xin Liandandroid-build-merger 58c7edfedf [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 5ac14106ff -s ours am: 6e3d8bed97
am: 584da181c5

Change-Id: I6a0b183150727d3ebc1ff2a9b48fe6b9ff69df3c
2019-08-26 11:26:32 -07:00
Xin Liandandroid-build-merger 584da181c5 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 5ac14106ff -s ours
am: 6e3d8bed97

Change-Id: I59a5ac4213c90a360aa8621513df0d8711b4eb93
2019-08-23 21:17:12 -07:00
Xin Liandandroid-build-merger 6e3d8bed97 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
am: 5ac14106ff -s ours
am skip reason: subject contains skip directive

Change-Id: I2f78ea8d7588dafe0bee2a4cab198f4b02395b15
2019-08-23 20:25:20 -07: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 Hongandandroid-build-merger fc7e2911e8 Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 am: 41fd3c3ad9 am: 0df5805d21
am: 8f2745c31d

Change-Id: I8060efa434110b8c53661cda43f6e2a781ff7551
2019-08-16 11:54:23 -07:00
Yifan Hongandandroid-build-merger 8f2745c31d Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 am: 41fd3c3ad9
am: 0df5805d21

Change-Id: Ib90ad40cbe99ebe0154ea439e0560d8e5bd109b8
2019-08-16 11:45:13 -07:00
Yifan Hongandandroid-build-merger 0df5805d21 Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779
am: 41fd3c3ad9

Change-Id: Iea08b41ba9c710f7394e8e0bf5ac34cd9dd50490
2019-08-16 11:34:48 -07:00
Yifan Hongandandroid-build-merger 41fd3c3ad9 Merge "updater: Fix build for new CreateLogicalPartition signature."
am: 18c3f78779

Change-Id: Id0deb6160cf5b1bd04c99081a766df412a26e7f5
2019-08-16 11:24:53 -07:00
Yifan HongandGerrit Code Review 18c3f78779 Merge "updater: Fix build for new CreateLogicalPartition signature." 2019-08-16 17:41:22 +00:00
Tianjie Xuandandroid-build-merger 6718707817 Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61 am: 9387e5cd61
am: 9f1625a115

Change-Id: I49abe7e4b856e8acca573b6c510884f5f9092d64
2019-08-15 19:24:56 -07:00
Tianjie Xuandandroid-build-merger 9f1625a115 Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61
am: 9387e5cd61

Change-Id: Ia6abd2750228e98662f04b241489285b7dcb9eb5
2019-08-15 19:10:55 -07:00
Tianjie Xuandandroid-build-merger 9387e5cd61 Merge "Remove common.h" am: 899f7b5105
am: 03fd851f61

Change-Id: I810c6fb8a57b9ce3283d15f10d29cb0848a200c5
2019-08-15 18:59:51 -07:00
Tianjie Xuandandroid-build-merger 03fd851f61 Merge "Remove common.h"
am: 899f7b5105

Change-Id: Ic5b9e24cb87ef292f5d8e53de485e44e455f3185
2019-08-15 18:05:25 -07:00
Tianjie XuandGerrit Code Review 899f7b5105 Merge "Remove common.h" 2019-08-16 00:24:41 +00:00
Tao Baoandandroid-build-merger 3b572fb15c Merge "minui: Support input device hotplug in recovery mode." am: ecc208286f am: f934163f4c am: 9c9d845ae5
am: 15f088a2e6

Change-Id: I901ceba1cfff2f51c6eec4255bad8129560b95d2
2019-08-15 16:44:34 -07:00
Tao Baoandandroid-build-merger 15f088a2e6 Merge "minui: Support input device hotplug in recovery mode." am: ecc208286f am: f934163f4c
am: 9c9d845ae5

Change-Id: I09fb6f4a0a38d5330a65319c52580e548d0f9111
2019-08-15 16:34:32 -07:00
Tao Baoandandroid-build-merger 9c9d845ae5 Merge "minui: Support input device hotplug in recovery mode." am: ecc208286f
am: f934163f4c

Change-Id: I485d8d39465c0f8d224e5e13fc50964ffca2e890
2019-08-15 16:23:31 -07:00
Tao Baoandandroid-build-merger f934163f4c Merge "minui: Support input device hotplug in recovery mode."
am: ecc208286f

Change-Id: Ic20b0a1459e3b77413ec6b5869b184272a559284
2019-08-15 16:13:31 -07:00
Tao BaoandGerrit Code Review 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 ChenandTao Bao 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 Liandandroid-build-merger 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

Change-Id: I418d00fd604cb0c0775043a798eb147801c62af9
2019-08-14 14:07:47 -07:00
Xin Liandandroid-build-merger 11a2fb92c2 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 1ba485fbde -s ours
am: 2e3532fa96

Change-Id: I081ef878951db254170e2d9a7b72c0eacb36a66a
2019-08-14 13:42:56 -07:00
Xin Liandandroid-build-merger 2e3532fa96 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
am: 1ba485fbde -s ours
am skip reason: subject contains skip directive

Change-Id: I5048c3ee10b89fc2b94ad9b89a1c17d4a705b786
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 Yangandandroid-build-merger ecca6ec533 Merge "bootloader_message: Remove global std::string" am: 7b87949ae1 am: 76d80ba102 am: 8946524a79
am: e858e2fe81

Change-Id: If5764dd98d9b45186628f32e7e3a7b470118af23
2019-08-07 19:17:54 -07:00
Vic Yangandandroid-build-merger e858e2fe81 Merge "bootloader_message: Remove global std::string" am: 7b87949ae1 am: 76d80ba102
am: 8946524a79

Change-Id: I65d24597138563a61bc259246e5940948afb1158
2019-08-07 19:07:51 -07:00
Vic Yangandandroid-build-merger 8946524a79 Merge "bootloader_message: Remove global std::string" am: 7b87949ae1
am: 76d80ba102

Change-Id: I5d8cdd458d17129656424e8e09ca52578a5f6c53
2019-08-07 18:56:48 -07:00
Vic Yangandandroid-build-merger 76d80ba102 Merge "bootloader_message: Remove global std::string"
am: 7b87949ae1

Change-Id: I9a374505c325b041876bc7d659d5b211a6d50ca3
2019-08-07 18:47:47 -07:00
Treehugger RobotandGerrit Code Review 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 Xuandandroid-build-merger 4375704cac Merge "Simulator: add the argument to keep the updated images" am: c34e4e7fb5 am: be3f56543e am: 112acdc043
am: 05fa10519d

Change-Id: I52c6c2af873ddf005bcb4897e677f92b7302b2f5
2019-07-31 17:10:56 -07:00
Tianjie Xuandandroid-build-merger 05fa10519d Merge "Simulator: add the argument to keep the updated images" am: c34e4e7fb5 am: be3f56543e
am: 112acdc043

Change-Id: I259f6627b736f979884d1797734562266e44981f
2019-07-31 16:49:02 -07:00
Tianjie Xuandandroid-build-merger 112acdc043 Merge "Simulator: add the argument to keep the updated images" am: c34e4e7fb5
am: be3f56543e

Change-Id: Icec27b83fa9dc557fe47c1646867ce453d38c76b
2019-07-31 16:33:59 -07:00
Tianjie Xuandandroid-build-merger be3f56543e Merge "Simulator: add the argument to keep the updated images"
am: c34e4e7fb5

Change-Id: Idb86f6ee1b5a99c626150acaa86d8152b2a8ba99
2019-07-31 16:16:56 -07:00
Tianjie XuandGerrit Code Review c34e4e7fb5 Merge "Simulator: add the argument to keep the updated images" 2019-07-31 22:34:34 +00:00
Tianjie Xu 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
Tianjie Xuandandroid-build-merger 1c7a5d8421 Merge "Create a new function to return the help message for menu" am: 5d9f963e4e am: b25d741563 am: c234be1655
am: a89bb37a4c

Change-Id: I077384fda0680a73eaa7462773c9144d6d7fc0e2
2019-07-26 11:43:34 -07:00
Tianjie Xuandandroid-build-merger a89bb37a4c Merge "Create a new function to return the help message for menu" am: 5d9f963e4e am: b25d741563
am: c234be1655

Change-Id: Iaa37ebadb460835f94d22eb5771359b10b3eb018
2019-07-26 11:33:27 -07:00
Tianjie Xuandandroid-build-merger c234be1655 Merge "Create a new function to return the help message for menu" am: 5d9f963e4e
am: b25d741563

Change-Id: I3391b38b54596fa08001c39214ebcc98e87285cc
2019-07-26 11:22:24 -07:00
Tianjie Xuandandroid-build-merger b25d741563 Merge "Create a new function to return the help message for menu"
am: 5d9f963e4e

Change-Id: I216097c1aea8ae73999ad9b880dd6898a3c94def
2019-07-26 11:13:22 -07:00
Tianjie XuandGerrit Code Review 5d9f963e4e Merge "Create a new function to return the help message for menu" 2019-07-26 17:39:20 +00:00
Tianjie Xu e5032219fe Create a new function to return the help message for menu
Then we can override this function in the device specific recovery ui;
and allow customizing the help message.

Bug: 137965958
Test: Check the menu on sailfish
Change-Id: I09f23166f4205c5edf6c62eb42c8ada0fa710b26
2019-07-25 13:22:03 -07:00
Tianjie Xuandandroid-build-merger 0ea09ffbe2 Merge "Clean up some global variables in common.h" am: 80c405f692 am: 168ce56022 am: 6f8e0ede72
am: 984dc5c263

Change-Id: I5df6ce9f82a0535c844b9474dbe57dc4e6e9e316
2019-07-24 18:19:26 -07:00
Tianjie Xuandandroid-build-merger 984dc5c263 Merge "Clean up some global variables in common.h" am: 80c405f692 am: 168ce56022
am: 6f8e0ede72

Change-Id: If07039b9393d328d88520cf56c95d7727bda5dc3
2019-07-24 17:57:11 -07:00
Tianjie Xuandandroid-build-merger 6f8e0ede72 Merge "Clean up some global variables in common.h" am: 80c405f692
am: 168ce56022

Change-Id: I7bc150fa572bc9709263feefcd12f786f4393d15
2019-07-24 17:37:03 -07:00
Tianjie Xuandandroid-build-merger 168ce56022 Merge "Clean up some global variables in common.h"
am: 80c405f692

Change-Id: Id50b466efaed118a6e7d1bac71c95000822be855
2019-07-24 17:26:53 -07:00
Tianjie XuandGerrit Code Review 80c405f692 Merge "Clean up some global variables in common.h" 2019-07-24 22:45:32 +00:00
Tianjie Xu 164c60a4f3 Clean up some global variables in common.h
Some global variables are only used for recovery.cpp and
recovery_main.cpp, remove them from common.h and handle their usage
accordingly. Variables include:
static constexpr int kRecoveryApiVersion;
extern struct selabel_handle* sehandle;
extern RecoveryUI* ui;
extern bool has_cache;
bool is_ro_debuggable();

Test: unit tests pass, boot into recovery mode and run graphic tests
Change-Id: If83a005786c9b38412731da97aaf85af69a3b917
2019-07-24 11:36:03 -07:00