Commit Graph

8324 Commits

Author SHA1 Message Date
David Anderson 0019bdf79c Merge "Refactor boot_control into a separate library." am: eb35817830 am: 754e7fc190 am: 6bf93864ce am: ef2ec5f840
am: 7e7a01662a

Change-Id: I0fbdf1f21100e97fd686426ad46d6179273e3c08
2019-09-03 13:27:45 -07:00
David Anderson 7e7a01662a Merge "Refactor boot_control into a separate library." am: eb35817830 am: 754e7fc190 am: 6bf93864ce
am: ef2ec5f840

Change-Id: I32efd5cf67f2cc4fc3d09f1de061630135c119d0
2019-09-03 13:22:45 -07:00
David Anderson ef2ec5f840 Merge "Refactor boot_control into a separate library." am: eb35817830 am: 754e7fc190
am: 6bf93864ce

Change-Id: I457a7ca44f1c1f1cccbebff693ab5adb7c022768
2019-09-03 13:13:33 -07:00
David Anderson 6bf93864ce Merge "Refactor boot_control into a separate library." am: eb35817830
am: 754e7fc190

Change-Id: I9e8d4489984de6cf0dcc96fcec8b81722966797d
2019-09-03 13:06:29 -07:00
David Anderson 754e7fc190 Merge "Refactor boot_control into a separate library."
am: eb35817830

Change-Id: I330e599f7a8bf2aed111186ec54886b4c21b071a
2019-09-03 12:59:35 -07:00
David Anderson eb35817830 Merge "Refactor boot_control into a separate library." 2019-09-03 19:33:22 +00: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 809177c32c [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bc7898323c -s ours am: b3aeafddca am: 8fb95b5ae3
am: 483637a524 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib3e1a41f90719bb4cc34a385f285db9d82cb9cd0
2019-08-26 13:23:14 -07:00
Xin Li 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 -s ours
am skip reason: subject contains skip directive

Change-Id: I14d10451f3192fc444359e52d91e16616fde3249
2019-08-26 12:37:57 -07:00
Xin Li 483637a524 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bc7898323c -s ours am: b3aeafddca
am: 8fb95b5ae3

Change-Id: Ieb922cc0dcc8e2d973fa5b09bb20c3a3e8e7eb9a
2019-08-26 12:20:15 -07:00
Xin Li 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 Li 8fb95b5ae3 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bc7898323c -s ours
am: b3aeafddca

Change-Id: Id759775f6eb82eb580f30c0fba9de8ad07e095a0
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 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibce509308710e29ac01e64d5a3194460d69eabc1
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

Change-Id: I59a5ac4213c90a360aa8621513df0d8711b4eb93
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 -s ours
am skip reason: subject contains skip directive

Change-Id: I2f78ea8d7588dafe0bee2a4cab198f4b02395b15
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 dc178d9737 Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 am: 41fd3c3ad9 am: 0df5805d21 am: 8f2745c31d
am: fc7e2911e8

Change-Id: I71c001f8a08f4d6bdedd26898321390e4a3e7d3c
2019-08-16 12:03:27 -07:00
Yifan Hong 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 Hong 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 Hong 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 Hong 41fd3c3ad9 Merge "updater: Fix build for new CreateLogicalPartition signature."
am: 18c3f78779

Change-Id: Id0deb6160cf5b1bd04c99081a766df412a26e7f5
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 61fb1bbaf7 Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61 am: 9387e5cd61 am: 9f1625a115
am: 6718707817

Change-Id: I7e26523515a6e7e28842716b98c3e332e62d1cac
2019-08-15 19:47:19 -07:00
Tianjie Xu 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 Xu 9f1625a115 Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61
am: 9387e5cd61

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

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

Change-Id: Ic5b9e24cb87ef292f5d8e53de485e44e455f3185
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 cbc7e79dd9 Merge "minui: Support input device hotplug in recovery mode." am: ecc208286f am: f934163f4c am: 9c9d845ae5 am: 15f088a2e6
am: 3b572fb15c

Change-Id: Ie6aa64535346bbf8b3c4c30478ac3029ef158951
2019-08-15 16:59:47 -07:00
Tao Bao 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 Bao 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 Bao 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 Bao f934163f4c Merge "minui: Support input device hotplug in recovery mode."
am: ecc208286f

Change-Id: Ic20b0a1459e3b77413ec6b5869b184272a559284
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
Xin Li 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 -s ours
am skip reason: subject contains skip directive

Change-Id: I9273b8e72df12b02a322d17633fcd432f1530f16
2019-08-14 14:52:25 -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 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 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

Change-Id: I081ef878951db254170e2d9a7b72c0eacb36a66a
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 -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 Yang c19d76833a Merge "bootloader_message: Remove global std::string" am: 7b87949ae1 am: 76d80ba102 am: 8946524a79 am: e858e2fe81
am: ecca6ec533

Change-Id: I54e76f694fbac10008970dd6e327956a9b684b1d
2019-08-07 19:28:56 -07:00
Vic Yang 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 Yang 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 Yang 8946524a79 Merge "bootloader_message: Remove global std::string" am: 7b87949ae1
am: 76d80ba102

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

Change-Id: I9a374505c325b041876bc7d659d5b211a6d50ca3
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