Commit Graph

8566 Commits

Author SHA1 Message Date
Tom Cherry e57fdb72f2 [automerger skipped] Merge "Move init and ueventd scripts from / to /system/etc" am: 154f7e9b79 am: 054861f9eb -s ours
am: 038282ddfb -s ours
am skip reason: change_id I1fb6690d4302a1884d8521c21a9754b2ca710d5a with SHA1 24dd3146e1 is in history

Change-Id: I47bc5a96164ccb51882b6237b46497b107d31542
2019-11-13 08:21:18 -08:00
Tom Cherry 038282ddfb [automerger skipped] Merge "Move init and ueventd scripts from / to /system/etc" am: 154f7e9b79
am: 054861f9eb -s ours
am skip reason: change_id I1fb6690d4302a1884d8521c21a9754b2ca710d5a with SHA1 24dd3146e1 is in history

Change-Id: I6f54fad5521da4145893b3ad9dc70548ffbc4f08
2019-11-13 08:13:36 -08:00
Tom Cherry 054861f9eb Merge "Move init and ueventd scripts from / to /system/etc"
am: 154f7e9b79

Change-Id: I60b076de3aefa8dc40cac3b36965857ab48429f8
2019-11-13 08:05:59 -08:00
Tom Cherry 154f7e9b79 Merge "Move init and ueventd scripts from / to /system/etc" 2019-11-13 14:36:47 +00:00
Tom Cherry a762387a5b Merge "Move init and ueventd scripts from / to /system/etc" into qt-qpr1-dev-plus-aosp
am: e5939e8297

Change-Id: If9b38a494e6385ccd2e5ae31c15d5d429b082efc
2019-11-12 07:57:06 -08:00
Tom Cherry e5939e8297 Merge "Move init and ueventd scripts from / to /system/etc" into qt-qpr1-dev-plus-aosp 2019-11-12 15:46:21 +00:00
David Anderson af2f63cbf9 Merge "bootloader_message: Add helpers for handling IBootControl MergeStatus." am: 405f4d3552 am: ff8131a493
am: 80415b0f40

Change-Id: I37a2e32ce7cfc88cff58ea6297480130bfba0de2
2019-11-09 07:21:16 -08:00
David Anderson 80415b0f40 Merge "bootloader_message: Add helpers for handling IBootControl MergeStatus." am: 405f4d3552
am: ff8131a493

Change-Id: Id94bb0563331d162d5bef13c6d5465175395bdcd
2019-11-09 07:17:15 -08:00
David Anderson ff8131a493 Merge "bootloader_message: Add helpers for handling IBootControl MergeStatus."
am: 405f4d3552

Change-Id: Ic37fa503b0e3eea75e2c7076e01979e05b3fe2b8
2019-11-09 07:13:15 -08:00
David Anderson 405f4d3552 Merge "bootloader_message: Add helpers for handling IBootControl MergeStatus." 2019-11-09 15:04:52 +00:00
David Anderson cf8427af89 bootloader_message: Add helpers for handling IBootControl MergeStatus.
Move merge_status from bootloader_control_ab, which is in vendor space,
to a new generic AOSP struct in system space. This will allow more
devices to share the same HAL implementation.

This patch also changes libboot_control to compensate for merge_status
moving out of vendor space. The reference HAL library now also provides
separate helper functions for managing the merge status, so devices
using a custom boot control HAL can still take advantage of the new misc
implementation.

Bug: 139156011
Test: manual test
Change-Id: I5cd824e25f9d07aad1476301def5cdc3f506b029
2019-11-08 15:22:21 -08:00
Tom Cherry 24dd3146e1 Move init and ueventd scripts from / to /system/etc
There is no reason for these scripts to continue to exist in /, when
they are better suited for /system/etc.  There are problems keeping
them at / as well, particularly that they cannot be updated with
overlayfs.

Bug: 131087886
Bug: 140313207
Test: build/boot + boot to recovery
Merged-In: I1fb6690d4302a1884d8521c21a9754b2ca710d5a
Change-Id: I1fb6690d4302a1884d8521c21a9754b2ca710d5a
2019-11-07 19:38:23 +00:00
Tianjie Xu d3a9bf5cf3 Merge "Stop setting usb config from recovery init script" am: 6105aa1a4a am: 4e0d813e39
am: 216e31cd8e

Change-Id: I23c949b684fe4f9b23b1895286cd672c5f109144
2019-11-07 11:34:37 -08:00
Tom Cherry bcd3f35462 Move init and ueventd scripts from / to /system/etc
There is no reason for these scripts to continue to exist in /, when
they are better suited for /system/etc.  There are problems keeping
them at / as well, particularly that they cannot be updated with
overlayfs.

Bug: 131087886
Bug: 140313207
Test: build/boot + boot to recovery
Merged-In: I1fb6690d4302a1884d8521c21a9754b2ca710d5a
Change-Id: I1fb6690d4302a1884d8521c21a9754b2ca710d5a
2019-11-07 11:29:06 -08:00
Tianjie Xu 216e31cd8e Merge "Stop setting usb config from recovery init script" am: 6105aa1a4a
am: 4e0d813e39

Change-Id: I5d6461df326ece34dbaac6216d0caa479397463b
2019-11-07 11:22:06 -08:00
Tianjie Xu 4e0d813e39 Merge "Stop setting usb config from recovery init script"
am: 6105aa1a4a

Change-Id: I39a81f9e1e8327794f3f6032508181645870c9cd
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 c9548fce84 Merge "bootloader_message: Carve out space reserved for system." am: 8243388d57 am: bf23ee57e4
am: 1caaf16379

Change-Id: I55cf76a792a593e05e22b504998bd4fb3ef2189d
2019-11-05 14:43:29 -08:00
David Anderson 1caaf16379 Merge "bootloader_message: Carve out space reserved for system." am: 8243388d57
am: bf23ee57e4

Change-Id: Ib8d83d458577c317e3bff08e9ab28dd553b89553
2019-11-05 14:37:27 -08:00
David Anderson bf23ee57e4 Merge "bootloader_message: Carve out space reserved for system."
am: 8243388d57

Change-Id: I1c124ae8e05e0fbb76b95ce27f3c56ce9b1740be
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 033225bc26 Merge "Start adbd in user mode if bootloader is unlocked" am: b65dd9cb0c am: e5288e6b69
am: 845bf488cb

Change-Id: I0ac1f3a38e0def87e3d06e34e49097f311da6a18
2019-11-05 14:13:30 -08:00
Tianjie Xu 845bf488cb Merge "Start adbd in user mode if bootloader is unlocked" am: b65dd9cb0c
am: e5288e6b69

Change-Id: I02c35302868aacdbc5ff513034f42e475a0805c7
2019-11-05 14:07:27 -08:00
Tianjie Xu e5288e6b69 Merge "Start adbd in user mode if bootloader is unlocked"
am: b65dd9cb0c

Change-Id: I0daecb3e2a15c449babfc94d6f3deca8b55a4924
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 f289bba2cf [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 547b9dc313
am: 50a5d5da7e -s ours
am skip reason: subject contains skip directive

Change-Id: I88fce7b65ac0028b8140f0d07844feca55325151
2019-10-31 14:01:10 -07:00
Xin Li 50a5d5da7e DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 547b9dc313

Change-Id: I6a34c7e4acdbdcff47847f069ec3a989ed41b6ba
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 8f621f209d [automerger skipped] Merge Coral/Flame into AOSP master am: c73a97c6ee -s ours am: 5854abbb43 -s ours am: 341e99e9b4 -s ours
am: 450fdc6943 -s ours
am skip reason: change_id Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c with SHA1 cf6b4dce12 is in history

Change-Id: I60ba22e7886673d4ac45e3f7d12f48a9c2565686
2019-10-26 22:23:08 -07:00
Xin Li 450fdc6943 [automerger skipped] Merge Coral/Flame into AOSP master am: c73a97c6ee -s ours am: 5854abbb43 -s ours
am: 341e99e9b4 -s ours
am skip reason: change_id Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c with SHA1 cf6b4dce12 is in history

Change-Id: I47843f764156112cfe2ff164c98186ca4a773d7d
2019-10-26 22:16:07 -07:00
Xin Li 341e99e9b4 [automerger skipped] Merge Coral/Flame into AOSP master am: c73a97c6ee -s ours
am: 5854abbb43 -s ours
am skip reason: change_id Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c with SHA1 cf6b4dce12 is in history

Change-Id: Idc3f78654c812b946011f2b7b9dc179536108c94
2019-10-26 22:10:12 -07:00
Xin Li 5854abbb43 [automerger skipped] Merge Coral/Flame into AOSP master
am: c73a97c6ee -s ours
am skip reason: change_id Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c with SHA1 cf6b4dce12 is in history

Change-Id: Ib87c586d8c444dbc786556c2e1e32c1eaa6f0c3f
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 0a4214046d Merge "Use adbd_system_binaries to track adbd's dependencies." am: e52af1a4cc am: cf6b4dce12 am: d7ec9f7267
am: 8128a47d72

Change-Id: I02a45a1da5b05bf85eecb4885caab92e327aaebc
2019-10-24 14:52:07 -07:00
Josh Gao 8128a47d72 Merge "Use adbd_system_binaries to track adbd's dependencies." am: e52af1a4cc am: cf6b4dce12
am: d7ec9f7267

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

Change-Id: I5462dbc2fa3bc0b593cb19bad11e634fb3dca5e6
2019-10-24 14:39:01 -07:00
Josh Gao cf6b4dce12 Merge "Use adbd_system_binaries to track adbd's dependencies."
am: e52af1a4cc

Change-Id: Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c
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 e08a9c45f8 Merge "bootable: leak less memory" am: 19073f2067 am: 37395747a8 am: 5026bd6047
am: 67cce21e5d

Change-Id: I5997d7896b54bb7874c3598c9db4b4fad745dbc5
2019-10-23 17:43:05 -07:00
George Burgess IV 67cce21e5d Merge "bootable: leak less memory" am: 19073f2067 am: 37395747a8
am: 5026bd6047

Change-Id: I3d33089fb30ee61b960b18fdb1a785eb1ed2028e
2019-10-23 17:36:04 -07:00
George Burgess IV 5026bd6047 Merge "bootable: leak less memory" am: 19073f2067
am: 37395747a8

Change-Id: If49a5e1a2d997346cc1c1fc5a8652eb033a5f1a7
2019-10-23 17:29:00 -07:00
George Burgess IV 37395747a8 Merge "bootable: leak less memory"
am: 19073f2067

Change-Id: I55463429524f54941b47fce9f0c318ae47993414
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 fd707a5fbd Skip QD1A.190821.011 in stage-aosp-master am: a5d835720a am: 1b130a6a11
am: 50186b1213

Change-Id: I65ad2ff8d7d0306cec19d305fd55948255fe6859
2019-10-16 21:53:07 -07:00
Xin Li 50186b1213 Skip QD1A.190821.011 in stage-aosp-master am: a5d835720a
am: 1b130a6a11

Change-Id: Iee1c54ca65b238954a97bde782d52ab16a11c682
2019-10-16 21:34:03 -07:00