Tianjie Xu
216e31cd8e
Merge "Stop setting usb config from recovery init script" am: 6105aa1a4a
...
am: 4e0d813e39
2019-11-07 11:22:06 -08:00
Tianjie Xu
4e0d813e39
Merge "Stop setting usb config from recovery init script"
...
am: 6105aa1a4a
2019-11-07 11:14:55 -08:00
Tianjie Xu
6105aa1a4a
Merge "Stop setting usb config from recovery init script"
2019-11-07 18:25:07 +00:00
Tom Cherry
0a19ef8cb6
Stop setting usb config from recovery init script
...
We used to set sys.usb.config to adb in the init script. And the purpose
is to start adbd. This is a duplicate of code because we always check and
reset the usb config in recovery_main.
Test: check adbd starts
Change-Id: I6e2842ff8aebf6ccf3bd3f2ae85323899a2b9de4
2019-11-06 23:04:36 -08:00
David Anderson
1caaf16379
Merge "bootloader_message: Carve out space reserved for system." am: 8243388d57
...
am: bf23ee57e4
2019-11-05 14:37:27 -08:00
David Anderson
bf23ee57e4
Merge "bootloader_message: Carve out space reserved for system."
...
am: 8243388d57
2019-11-05 14:31:27 -08:00
David Anderson
8243388d57
Merge "bootloader_message: Carve out space reserved for system."
2019-11-05 22:16:16 +00:00
Tianjie Xu
845bf488cb
Merge "Start adbd in user mode if bootloader is unlocked" am: b65dd9cb0c
...
am: e5288e6b69
2019-11-05 14:07:27 -08:00
Tianjie Xu
e5288e6b69
Merge "Start adbd in user mode if bootloader is unlocked"
...
am: b65dd9cb0c
2019-11-05 14:00:48 -08:00
Tianjie Xu
b65dd9cb0c
Merge "Start adbd in user mode if bootloader is unlocked"
2019-11-05 21:37:07 +00:00
David Anderson
4ff4cbdd6c
bootloader_message: Carve out space reserved for system.
...
This reduces the wipe space from 32K to 16K. The wipe space is now
at the 16K-32K region. The 32K-64K region is now "system space", to
complement the vendor space, for generic AOSP usage.
Bug: 139156011
Test: manual test
Change-Id: I1474bfa65a5f21049ab64ec0aee2f4585b55f60f
2019-11-04 15:57:04 -08:00
Xin Li
50a5d5da7e
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
am: 547b9dc313
2019-10-31 13:13:41 -07:00
Xin Li
547b9dc313
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
Bug: 142003500
Change-Id: I551bae56668132a81bba652e01d7f8851f41a604
2019-10-30 11:46:28 -07:00
Tianjie Xu
7d5c341962
Start adbd in user mode if bootloader is unlocked
...
During automatic tests, we sometimes want to reboot the device out of
the rescue party remotely. And per http://go/recovery-adb-access , one
option is to start adbd in user build if the device has an unlocked
bootloader. This should not add more surface of attack. Because verified
boot is off with the unlocked bootloader, and the user can always flash
a custom recovery image that always starts adbd.
Bug: 141247819
Test: check adbd doesn't start in user build, unlock bootloader, and
check adbd starts.
Change-Id: I851746245f862cb4dfb01e6c3ad035f2c9f9ccec
2019-10-30 10:26:56 -07:00
Xin Li
450fdc6943
[automerger skipped] Merge Coral/Flame into AOSP master am: c73a97c6ee -s ours am: 5854abbb43 -s ours
...
am: 341e99e9b4cf6b4dce12
2019-10-26 22:16:07 -07:00
Xin Li
341e99e9b4
[automerger skipped] Merge Coral/Flame into AOSP master am: c73a97c6ee -s ours
...
am: 5854abbb43cf6b4dce12
2019-10-26 22:10:12 -07:00
Xin Li
5854abbb43
[automerger skipped] Merge Coral/Flame into AOSP master
...
am: c73a97c6eecf6b4dce12
2019-10-26 21:59:40 -07:00
Xin Li
c73a97c6ee
Merge Coral/Flame into AOSP master
...
Bug: 141248619
Change-Id: If019c780684a841a87d49dcf55a6f2cfd638f69b
Merged-In: Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c
2019-10-25 10:27:44 -07:00
Josh Gao
8128a47d72
Merge "Use adbd_system_binaries to track adbd's dependencies." am: e52af1a4cc am: cf6b4dce12
...
am: d7ec9f7267
2019-10-24 14:45:04 -07:00
Josh Gao
d7ec9f7267
Merge "Use adbd_system_binaries to track adbd's dependencies." am: e52af1a4cc
...
am: cf6b4dce12
2019-10-24 14:39:01 -07:00
Josh Gao
cf6b4dce12
Merge "Use adbd_system_binaries to track adbd's dependencies."
...
am: e52af1a4cc
2019-10-24 14:31:07 -07:00
Josh Gao
e52af1a4cc
Merge "Use adbd_system_binaries to track adbd's dependencies."
2019-10-24 20:29:25 +00:00
George Burgess IV
67cce21e5d
Merge "bootable: leak less memory" am: 19073f2067 am: 37395747a8
...
am: 5026bd6047
2019-10-23 17:36:04 -07:00
George Burgess IV
5026bd6047
Merge "bootable: leak less memory" am: 19073f2067
...
am: 37395747a8
2019-10-23 17:29:00 -07:00
George Burgess IV
37395747a8
Merge "bootable: leak less memory"
...
am: 19073f2067
2019-10-23 17:22:00 -07:00
Treehugger Robot
19073f2067
Merge "bootable: leak less memory"
2019-10-24 00:03:38 +00:00
Josh Gao
a91e456fd4
Use adbd_system_binaries to track adbd's dependencies.
...
required doesn't propagate from apexes, so we need a separate phony
target to track adbd's dependenecies.
Test: m
Change-Id: I13977d1376de63839bf182d2cfa56b5c6c63aba9
2019-10-23 14:33:51 -07:00
George Burgess IV
1b03fc5493
bootable: leak less memory
...
`misc_device_` is a std::string, so it allocates and manages its own
memory. Hence, the strdup here is immediately leaked.
Caught by the static analyzer
Bug: None
Test: TreeHugger
Change-Id: Iffb1ff60f6087e470a0979d202150567272e8b1c
2019-10-23 12:09:07 -07:00
Xin Li
50186b1213
Skip QD1A.190821.011 in stage-aosp-master am: a5d835720a
...
am: 1b130a6a11
2019-10-16 21:34:03 -07:00
Xin Li
1b130a6a11
Skip QD1A.190821.011 in stage-aosp-master
...
am: a5d835720a
2019-10-16 21:16:02 -07:00
Xin Li
a5d835720a
Skip QD1A.190821.011 in stage-aosp-master
...
Bug: 141248619
Change-Id: I3404ae5bfb5c54df05495a62cba58cd4e818b2ff
2019-10-16 15:19:11 -07:00
Nick Desaulniers
4f569e1436
Merge "[bootable][recovery] fix -Wreorder-init-list" am: 0d76cad830 am: 843c0bbb01
...
am: bd99b40ae9
2019-10-11 09:34:51 -07:00
Nick Desaulniers
bd99b40ae9
Merge "[bootable][recovery] fix -Wreorder-init-list" am: 0d76cad830
...
am: 843c0bbb01
2019-10-11 09:29:11 -07:00
Nick Desaulniers
843c0bbb01
Merge "[bootable][recovery] fix -Wreorder-init-list"
...
am: 0d76cad830
2019-10-11 09:22:05 -07:00
Nick Desaulniers
0d76cad830
Merge "[bootable][recovery] fix -Wreorder-init-list"
2019-10-11 15:50:07 +00:00
Nick Desaulniers
1cb510d96f
[bootable][recovery] fix -Wreorder-init-list
...
C++20 will require members in a designated initializer to be in order
unlike C99.
Bug: 139945549
Test: mm
Change-Id: I6f8d658448f7e5dd980bf95b890b15cb0aab7407
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com >
2019-10-10 16:33:58 -07:00
David Anderson
b3a599342d
Merge "Add IBootControl 1.1 support to libboot_control." am: 47bb0c8b59 am: 1cde53c252
...
am: 4c60b113b1
2019-10-10 12:45:53 -07:00
David Anderson
4c60b113b1
Merge "Add IBootControl 1.1 support to libboot_control." am: 47bb0c8b59
...
am: 1cde53c252
2019-10-10 12:38:30 -07:00
David Anderson
1cde53c252
Merge "Add IBootControl 1.1 support to libboot_control."
...
am: 47bb0c8b59
2019-10-10 12:31:35 -07:00
David Anderson
47bb0c8b59
Merge "Add IBootControl 1.1 support to libboot_control."
2019-10-10 19:19:49 +00:00
Tao Bao
70e92b2a8e
Merge "Update OWNERS." am: 938e736f91 am: 03a5bd4d0d
...
am: bfdff1ce7d
2019-10-09 09:08:01 -07:00
Tao Bao
bfdff1ce7d
Merge "Update OWNERS." am: 938e736f91
...
am: 03a5bd4d0d
2019-10-09 08:58:32 -07:00
Tao Bao
03a5bd4d0d
Merge "Update OWNERS."
...
am: 938e736f91
2019-10-09 08:52:01 -07:00
Tao Bao
938e736f91
Merge "Update OWNERS."
2019-10-09 15:33:13 +00:00
Tao Bao
7d47aebd79
Update OWNERS.
...
Test: N/A
Change-Id: I290fe43ee14fa3751f9ddb2c009bff235d8e1cff
2019-10-08 20:32:42 -07:00
Tianjie Xu
ce1e355bd5
Merge "Run BORINGSSL_self_test() in updater_main" am: 8316f2f09a am: 0b89939ddf
...
am: 49e732cf65
2019-10-07 16:21:37 -07:00
Tianjie Xu
49e732cf65
Merge "Run BORINGSSL_self_test() in updater_main" am: 8316f2f09a
...
am: 0b89939ddf
2019-10-07 16:15:19 -07:00
Tianjie Xu
0b89939ddf
Merge "Run BORINGSSL_self_test() in updater_main"
...
am: 8316f2f09a
2019-10-07 16:08:48 -07:00
Tianjie Xu
8316f2f09a
Merge "Run BORINGSSL_self_test() in updater_main"
2019-10-07 22:51:44 +00:00
Tao Bao
fe12eead1b
Merge "minadbd: Return battery level via getprop." am: e0e34a7f5c am: 58b5a5a550
...
am: a216efcb8d
2019-10-07 09:08:35 -07:00
