PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,219 Commits 1 Branch 0 Tags
687bb1872407f2480d2160aa40e044c28b0e2f41
Commit Graph
8219 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Baoandandroid-build-merger 687bb18724 Merge "tests: recovery_unit_test requires root." 
am: 15a381e52c

Change-Id: Ide2897a766d159126d9b0b38882f9cdde0ac2b9e
 2019-09-19 11:03:22 -07:00
Tao BaoandGerrit Code Review 15a381e52c Merge "tests: recovery_unit_test requires root." 2019-09-19 17:43:54 +00:00
Tao Bao dfb053e815 tests: recovery_unit_test requires root. 
Bug: 141272654
Test: TreeHugger (recovery_unit_test no longer fails)
Change-Id: I47cbee274e659e3d90be5a77b215466d2973c7d6
 2019-09-19 08:08:54 -07:00
Tao Baoandandroid-build-merger 41c46448a6 Merge "Update the instruction for building recovery image on Pixels." 
am: 2d6e8f2ea8

Change-Id: I4f009637f8a75996a43a400a5ceaed193e0e54ab
 2019-09-13 10:22:40 -07:00
Tobias Thiererandandroid-build-merger 97fee1c3b2 Merge "Link libcrypto dynamically for recovery unit tests." 
am: 54100d3348

Change-Id: I804ef56f77f28ce9e2d74b2227e7c26a3b6c22f2
 2019-09-13 10:18:28 -07:00
Tobias Thiererandandroid-build-merger a706ceec37 Merge "Set LOCAL_INJECT_BSSL_HASH for updater" 
am: 0af65d8c4a

Change-Id: I6db7618d1aaea087fe52a17aa3212b1b13b40a89
 2019-09-13 10:18:23 -07:00
Tao BaoandGerrit Code Review 2d6e8f2ea8 Merge "Update the instruction for building recovery image on Pixels." 2019-09-13 17:08:37 +00:00
Tobias ThiererandGerrit Code Review 54100d3348 Merge "Link libcrypto dynamically for recovery unit tests." 2019-09-13 16:56:06 +00:00
Tobias ThiererandGerrit Code Review 0af65d8c4a Merge "Set LOCAL_INJECT_BSSL_HASH for updater" 2019-09-13 16:56:06 +00:00
Pete Bentley 189d424ced Link libcrypto dynamically for recovery unit tests. 
Tested by running recovery_unit_test as described in
https://android.googlesource.com/platform/bootable/recovery/+/refs/heads/master/README.md

Attempted to build and boot a recovery image with the
same change to confirm it still works, but
m recoveryimage-nodeps
fails for me.

Bug: 140940227
Test: See above
Change-Id: I00545968a0e5684823e505f2ddbe7e993319b5d4
 2019-09-13 12:18:44 +01:00
Tao Bao 95656827dd Update the instruction for building recovery image on Pixels. 
Test: N/A
Change-Id: I14d7bba5b214cc0bf43d6294cff1b7dcbea72ee8
 2019-09-12 13:10:44 -07:00
David Andersonandandroid-build-merger 1074b8a539 Merge "Improve error messaging when bootcontrol HAL fails to load." 
am: 4878f6a31c

Change-Id: Ic9b5bacec378bd497d6d488b98dd1b224aa6e166
 2019-09-09 17:27:11 -07:00
David AndersonandGerrit Code Review 4878f6a31c Merge "Improve error messaging when bootcontrol HAL fails to load." 2019-09-10 00:09:07 +00:00
Xin Li b3b43be5d8 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
No content change.

Bug: 135460123
Change-Id: I70fc102e00f98edd34b59661c00a8abbe37a8f26
Merged-In: I8a2c42ff322242f08fd6601536c3f9ee50d0f633
 2019-09-08 12:42:27 -07:00
Steven Morelandandandroid-build-merger 02ea8f4969 Merge "Remove reference to libhwbinder_noltopgo." 
am: a44f947b6d

Change-Id: I8a2c42ff322242f08fd6601536c3f9ee50d0f633
 2019-09-06 11:13:36 -07:00
Steven MorelandandGerrit Code Review a44f947b6d Merge "Remove reference to libhwbinder_noltopgo." 2019-09-06 17:59:21 +00:00
David Andersonandandroid-build-merger 0c34ef807b Merge "boot_control: Don't allow current_slot_ to be -1." 
am: 9c0f102828

Change-Id: I28a50628ecdaf2a6f0ccf0e1a93cf9f70fa47ad0
 2019-09-05 16:41:07 -07:00
Colin Cross d81519400c Set LOCAL_INJECT_BSSL_HASH for updater 
updater is built in Make and statically links libcrypto,
so it needs to set LOCAL_INJECT_BSSL_HASH to make the FIPS self
test pass.

Bug: 137267623
Test: m checkbuild
Change-Id: Ib253c870090ac8026f5cbb005d6b0e935c73edd1
 2019-09-05 15:34:50 -07:00
Steven Moreland e4f1a781f5 Remove reference to libhwbinder_noltopgo. 
No longer needed.

Bug: 135558503
Test: build only
Change-Id: Ia1257513c6276cdb01604fbedb411e7412d02b84
 2019-09-05 14:29:23 -07:00
David AndersonandGerrit Code Review 9c0f102828 Merge "boot_control: Don't allow current_slot_ to be -1." 2019-09-05 20:21:47 +00:00
Xin LiandGerrit Code Review e0364db712 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:28 +00:00
David Anderson b18f153b12 Improve error messaging when bootcontrol HAL fails to load. 
Bug: N/A
Test: manual test
Change-Id: I6bf849dba4ae66353c44875ece30917283557327
 2019-09-04 18:12:35 -07: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 Andersonandandroid-build-merger 388d2a591c Merge "Make libboot_control vendor available." 
am: e3a35dc808

Change-Id: Ia5661bdf289cbff91faf629f6b746920b0299a8e
 2019-09-03 13:00:16 -07:00
David Andersonandandroid-build-merger 754e7fc190 Merge "Refactor boot_control into a separate library." 
am: eb35817830

Change-Id: I330e599f7a8bf2aed111186ec54886b4c21b071a
 2019-09-03 12:59:35 -07:00
David AndersonandGerrit Code Review e3a35dc808 Merge "Make libboot_control vendor available." 2019-09-03 19:36:59 +00:00
David AndersonandGerrit Code Review 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 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 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 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 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 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