Commit graph

51838 commits

Author SHA1 Message Date
Elliott Hughes
b0fff2743c Merge "Remove perfprofd reference." am: 97c06703f6 am: 03cca21541
am: fa66ee3411

Change-Id: I49cf6f641759d28eedbe262dbcaaab952073feee
2019-07-17 12:05:10 -07:00
Elliott Hughes
fa66ee3411 Merge "Remove perfprofd reference." am: 97c06703f6
am: 03cca21541

Change-Id: Ie9e1f86fdbfaa5e1f73fc6d1e4f052c90412b85c
2019-07-17 11:56:06 -07:00
Elliott Hughes
03cca21541 Merge "Remove perfprofd reference."
am: 97c06703f6

Change-Id: If6374e130ff430e7171ac71c7889844aab10775f
2019-07-17 11:47:44 -07:00
Josh Gao
0942b6f7a8 Merge changes I35f8843e,Icd2a94f8,I6c20f3b3 am: 1f1a0009fc am: 1c8ecd77cd
am: ce2024c2e9

Change-Id: Icd4d2c547fd83f1ecf8ea9a5452fdabb895ab15b
2019-07-17 11:39:05 -07:00
Steven Moreland
56a27c0b7e Merge "libutils: RefBase remove 'basetype' typedefs" am: 6b924d5a97 am: bb15e25719
am: ad6267c726

Change-Id: Ibef35039302c5306f227ee64a6b4cc9a4302e9cb
2019-07-17 11:37:53 -07:00
Treehugger Robot
97c06703f6 Merge "Remove perfprofd reference." 2019-07-17 18:30:37 +00:00
Josh Gao
ce2024c2e9 Merge changes I35f8843e,Icd2a94f8,I6c20f3b3 am: 1f1a0009fc
am: 1c8ecd77cd

Change-Id: I84b695eab24839e8aa40bc7b203d6ed584c021b7
2019-07-17 11:29:15 -07:00
Steven Moreland
ad6267c726 Merge "libutils: RefBase remove 'basetype' typedefs" am: 6b924d5a97
am: bb15e25719

Change-Id: I63f67d1a5a869e87d9040fdd2d954390b0ed3bc2
2019-07-17 11:27:54 -07:00
Josh Gao
1c8ecd77cd Merge changes I35f8843e,Icd2a94f8,I6c20f3b3
am: 1f1a0009fc

Change-Id: I13b66d553915bf4bdada12e854214d3232150423
2019-07-17 11:20:59 -07:00
Steven Moreland
bb15e25719 Merge "libutils: RefBase remove 'basetype' typedefs"
am: 6b924d5a97

Change-Id: I45de9fe25279c0a787a98ec2e10a2f3fd5f18516
2019-07-17 11:20:14 -07:00
Josh Gao
1f1a0009fc Merge changes I35f8843e,Icd2a94f8,I6c20f3b3
* changes:
  adb: win32: don't shutdown socket when closing.
  adb: win32: silence wine test failure.
  adb: win32: fix adb_test.
2019-07-17 18:04:29 +00:00
Treehugger Robot
6b924d5a97 Merge "libutils: RefBase remove 'basetype' typedefs" 2019-07-17 17:49:28 +00:00
Elliott Hughes
ffaabf54ba Remove perfprofd reference.
Dead and gone.

Test: treehugger
Change-Id: I8c08cada5313ddede5ebb4973d61cef2bb8a0a7e
2019-07-17 08:17:44 -07:00
Tri Vo
f474068ae0 Merge "Set /sys/power/wake_lock permissions on init." am: e75c6c841b am: b00894dc64
am: b95867eb30

Change-Id: Id2391be3c5f5f1cd735f09855e86faae2d3d8d93
2019-07-16 19:16:34 -07:00
Tri Vo
b95867eb30 Merge "Set /sys/power/wake_lock permissions on init." am: e75c6c841b
am: b00894dc64

Change-Id: I2e3cbbb520fb9451e77ebbe78c3642a2ef152583
2019-07-16 19:05:39 -07:00
Tri Vo
b00894dc64 Merge "Set /sys/power/wake_lock permissions on init."
am: e75c6c841b

Change-Id: I300152717163bc5419015c03b5dc23a2beb62422
2019-07-16 18:55:40 -07:00
Tri Vo
e75c6c841b Merge "Set /sys/power/wake_lock permissions on init." 2019-07-17 01:30:45 +00:00
Badhri Jagan Sridharan
a3524ac08a [automerger skipped] Merge "usbd: Exit in case of charger mode." into qt-r1-dev
am: 1674790b4c -s ours
am skip reason: change_id I3ba5be883c49e5ca3e4dad4443528e4eee8b25b9 with SHA1 abc92991ea is in history

Change-Id: I516c8670d1659e9ae400606f5d792aa52123f89f
2019-07-16 16:35:28 -07:00
TreeHugger Robot
1674790b4c Merge "usbd: Exit in case of charger mode." into qt-r1-dev 2019-07-16 23:04:47 +00:00
Josh Gao
08bd13eb3d adb: win32: don't shutdown socket when closing.
This appears to be an attempt to do orderly shutdown, but it doesn't
wait until the socket becomes readable, so it doesn't actually work. We
implement orderly shutdown elsewhere already, so delete this so that we
don't accidentally shutdown a duped socket.

Test: wine adb_test
Change-Id: I35f8843e8e6dbc7886fd545f0e43375a005e160f
2019-07-16 15:22:58 -07:00
Josh Gao
2ad4c3696f adb: win32: silence wine test failure.
Wine implements sockets with their own internal socketpair, which
results in the poll disconnect test failing.

Bug: http://b/117568356
Test: wine adb_test.exe
Change-Id: Icd2a94f8297fefd5c02e6517568fe288b168032c
2019-07-16 15:22:51 -07:00
Josh Gao
efd8ae2d54 adb: win32: fix adb_test.
At some point between Q and master, adb_test.exe stopped working because
it wasn't being linked with -municode?

Test: wine adb_test.exe
Change-Id: I6c20f3b3241cee2052d31d1ca85b8a9738828f6e
2019-07-16 15:21:59 -07:00
Tri Vo
c6a84e873b Set /sys/power/wake_lock permissions on init.
system_suspend need to be an early_hal as it's required before storage
encryption can get unlock on FDE devices.

/sys/power/wake_lock is a dependency of system_suspend (only in Q and
earlier). Permissions on this file need to be set early enough.

Bug: 136777986
Bug: 133175847
Test: boot blueline
Change-Id: I8a9d3374b327e451fb98d2279d1bac9477a9560d
2019-07-16 14:33:00 -07:00
Steven Moreland
18daa7b5f0 libutils: RefBase remove 'basetype' typedefs
useless/unused

Bug: N/A
Test: N/A
Change-Id: I72462a64411a58d22e071f20e2c950bd99fdffb1
2019-07-16 21:06:28 +00:00
Mark Salyzyn
5f99cdec35 [automerger skipped] Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden" into qt-r1-dev
am: afaa2a9016 -s ours
am skip reason: change_id I8782d09b7b389d899aed07b3e6c528280af2d6c8 with SHA1 8cf2103083 is in history

Change-Id: Idd011ab95183b7801ddb57cf042237bf295ff3fb
2019-07-16 13:40:25 -07:00
David Anderson
333de839f2 Merge "Revert "Revert "Remove libfiemap_writer from fs_mgr and move it to gsid.""" am: eb599db1c5 am: 9047835824
am: 09a959f1bd

Change-Id: Ibb7071de2cdaa8429b239d52a7b6071911f6ffc5
2019-07-16 13:20:23 -07:00
David Anderson
dc40a5e9ce Merge "libdm: Fix race conditions in LoopControl::Attach." am: 974dadf904 am: 4605a96076
am: accbf6d963

Change-Id: Id82fa140485a4ba5b0a8c329f0cb334f4723e148
2019-07-16 13:20:18 -07:00
TreeHugger Robot
afaa2a9016 Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden" into qt-r1-dev 2019-07-16 20:15:14 +00:00
David Anderson
09a959f1bd Merge "Revert "Revert "Remove libfiemap_writer from fs_mgr and move it to gsid.""" am: eb599db1c5
am: 9047835824

Change-Id: Ibc1bdd23d49f1b0d9df9f5a045b9cd82ae7451ed
2019-07-16 13:10:21 -07:00
David Anderson
accbf6d963 Merge "libdm: Fix race conditions in LoopControl::Attach." am: 974dadf904
am: 4605a96076

Change-Id: Ia75415390bd61d4625bf7e7547c660b2b1e23f78
2019-07-16 13:10:15 -07:00
David Anderson
9047835824 Merge "Revert "Revert "Remove libfiemap_writer from fs_mgr and move it to gsid."""
am: eb599db1c5

Change-Id: I818660e3f297ba1f801ee7b215ce1d3de052a837
2019-07-16 12:47:27 -07:00
David Anderson
4605a96076 Merge "libdm: Fix race conditions in LoopControl::Attach."
am: 974dadf904

Change-Id: Ieb08ab0217f5d9a3dc9538672bbaf7037487b49b
2019-07-16 12:47:03 -07:00
David Anderson
eb599db1c5 Merge "Revert "Revert "Remove libfiemap_writer from fs_mgr and move it to gsid.""" 2019-07-16 19:03:09 +00:00
David Anderson
974dadf904 Merge "libdm: Fix race conditions in LoopControl::Attach." 2019-07-16 19:03:09 +00:00
Badhri Jagan Sridharan
c2cd790643 usbd: Exit in case of charger mode.
UsbGadget hal is not expected run in charger mode.
This should fix the following errors in charger mode:

[   86.609578] c4    612 init: Received control message 'interface_start' for 'android.hardware.usb.gadget@1.0::IUsbGadget/default' from pid: 565 (/system/bin/hwservicemanager)
[   86.618236] c7      1 init: Could not find 'android.hardware.usb.gadget@1.0::IUsbGadget/default' for ctl.interface_start

Bug: 135566354
Test: Manually verified that usbd exits early in charger mode.
Change-Id: I3ba5be883c49e5ca3e4dad4443528e4eee8b25b9
Merged-In: I3ba5be883c49e5ca3e4dad4443528e4eee8b25b9
2019-07-16 11:45:48 -07:00
Tom Cherry
e444532cb0 Merge "Add nolint for implicit borrowed_fd constructors" am: 8987f061c4 am: 2d9148abb2
am: 814f744fac

Change-Id: I6a0c9c1024ab338e91af49792c13ff54845b06a7
2019-07-16 01:48:39 -07:00
Tom Cherry
814f744fac Merge "Add nolint for implicit borrowed_fd constructors" am: 8987f061c4
am: 2d9148abb2

Change-Id: I190836f1b3e801decf6b39c448d6254c7806d8e1
2019-07-16 01:42:16 -07:00
Tom Cherry
2d9148abb2 Merge "Add nolint for implicit borrowed_fd constructors"
am: 8987f061c4

Change-Id: Ibfb6497be968af5e008c1b20de9de9e9041706a5
2019-07-16 01:37:16 -07:00
Treehugger Robot
8987f061c4 Merge "Add nolint for implicit borrowed_fd constructors" 2019-07-16 04:11:20 +00:00
Steven Moreland
98897088a0 Merge "Reserve 'init'." am: a19f51eccc am: 2cdc6d7baf
am: 28d1ddd03b

Change-Id: I7fd9e3fb2a3c1a8642deda41ca5ae00ae4b2f782
2019-07-15 20:19:48 -07:00
Steven Moreland
28d1ddd03b Merge "Reserve 'init'." am: a19f51eccc
am: 2cdc6d7baf

Change-Id: I871fc91eb9cd5adb159cd98c1820dab7d24fc7ed
2019-07-15 19:59:48 -07:00
Steven Moreland
c028a18373 Merge "Remove obsolete subdirs entry." am: 100e8ffbcd am: b8d01f377f
am: 08a65aa2d1

Change-Id: Ic96ff55c5e2f0a4e374c1176ca060956cd293683
2019-07-15 19:51:52 -07:00
Steven Moreland
2cdc6d7baf Merge "Reserve 'init'."
am: a19f51eccc

Change-Id: I7074046592fae42725536df2c2820e9b52983305
2019-07-15 19:50:45 -07:00
Steven Moreland
08a65aa2d1 Merge "Remove obsolete subdirs entry." am: 100e8ffbcd
am: b8d01f377f

Change-Id: I39d95123c45da8104dc8f21f65ac9944ad682474
2019-07-15 19:42:46 -07:00
Treehugger Robot
a19f51eccc Merge "Reserve 'init'." 2019-07-16 02:35:29 +00:00
Steven Moreland
b8d01f377f Merge "Remove obsolete subdirs entry."
am: 100e8ffbcd

Change-Id: I3e11bcc22e77e9c1f36278721c7f8bb7e05d5a08
2019-07-15 19:32:53 -07:00
Treehugger Robot
100e8ffbcd Merge "Remove obsolete subdirs entry." 2019-07-16 02:02:40 +00:00
Kiyoung Kim
4a98682a56 Merge "Run linkerconfig from init process" am: 2f174171d7 am: 7b64a9a73a
am: 78f234e0a4

Change-Id: I3f66fa2247ea11d302d209b84f2439767778767d
2019-07-15 18:12:39 -07:00
Ryan Prichard
7daaabbd2f Merge changes I5e33e5bf,I64237006 am: c37f4a4199 am: 4440f8bc20
am: bdbed08c47

Change-Id: If535ac145984d42bcc4913290933cd57e955e1b6
2019-07-15 18:01:26 -07:00
Christopher Ferris
5864f5792d Merge "Optimize code that only uses PageMap call." am: 1e7b753c36 am: bdcd4f8e85
am: 7a7b844499

Change-Id: Ia88d5a89f1934ed2666bdd5e080a436a644002f8
2019-07-15 17:57:10 -07:00