Commit Graph

39227 Commits

Author SHA1 Message Date
Steven Moreland 0da5365ea7 Merge "init: use FQName parse"
am: 92ca281cba

Change-Id: I7ddb8343841a5e14b24b16a57ec2b8732845ffef
2018-03-07 21:59:30 +00:00
Treehugger Robot 92ca281cba Merge "init: use FQName parse" 2018-03-07 21:51:17 +00:00
Josh Gao 0360ada8f5 Merge "adbd: don't require authentication for userdebug/eng builds."
am: bf62136be4

Change-Id: If4e96ff8238ab5d2537d6c642ab59e13b49a2a6c
2018-03-07 21:35:16 +00:00
Mark Salyzyn a97acb8f83 Merge changes I51635278,I04c0038e
am: 80e48117c5

Change-Id: Ic8c06b6408bcff5d37c5cfb344380ef7e1c3e0df
2018-03-07 21:34:43 +00:00
Treehugger Robot bf62136be4 Merge "adbd: don't require authentication for userdebug/eng builds." 2018-03-07 21:23:57 +00:00
Treehugger Robot 80e48117c5 Merge changes I51635278,I04c0038e
* changes:
  liblog: save errno through log writing
  libion: cleanup logging
2018-03-07 21:12:46 +00:00
Steven Moreland 422367b97f init: use FQName parse
FQName::FQName(string) could leave the FQName in an
invalid state, and so this constructor is being removed
and the mValid member is being removed.

Bug: 73774955
Test: boots + interface_start control messages received by init
Change-Id: I58d4a089c0a0f1c2cc5129c5e87321e7f6663b72
2018-03-07 19:00:15 +00:00
Mark Salyzyn 72d3724ee5 liblog: save errno through log writing
Test: compile
Bug: 74258013
Change-Id: I5163527826855bc506ed324aaba47f8695aaf668
2018-03-07 10:56:51 -08:00
Mark Salyzyn 5be32c312c libion: cleanup logging
Get rid of trailing newlines as they just take wasted space.
Added a missing strerror(error) expansion for failure to open.

Test: compile
Bug: 74258013
Change-Id: I04c0038e1ca53d2ffe0a78386744f12874215c19
2018-03-07 10:56:06 -08:00
Tom Marshall 66f6a6dc67 fs_mgr: Ignore invalid DT device nodes
With treble, the vendor kernel and ramdisk are supposed to be used.
But vendors always find new and interesting ways to break things:

$ cat /proc/device-tree/firmware/android/fstab/system/dev; echo
/by-name/system_a
$

Change-Id: I826a96ebd625b52563d3cc970bf99d9b26dc093e
2018-03-07 17:59:57 +01:00
Chenbo Feng cc5234b494 Merge "Include iface index in the netlink event"
am: a026a176ff

Change-Id: I1a0c2b7b4359409c72f4764bd7a9fba0673a16f5
2018-03-07 08:21:42 +00:00
Treehugger Robot a026a176ff Merge "Include iface index in the netlink event" 2018-03-07 08:12:31 +00:00
Chenbo Feng 5e5e5e9a73 Include iface index in the netlink event
The TrafficController inside netd also get notified when the interface
on device added or removed, and it need both ifaceName and ifaceIndex
information from Netlink event. Add the ifaceIndex in the event can
avoid the TrafficController to run if_nametoindex again when receive
the event.

Bug: 30950746
Bug: 73137611
Test: new interface show up in bpf interface map.
Change-Id: Ia3b4aeb8eff345ce7cf03ccec88f0893cfe125c0
2018-03-07 11:39:52 +09:00
Josh Gao 51c06da6ca Merge "adbd: make static."
am: b41b33581e

Change-Id: Ibff3e3e19d7805fe4d70996ad1ba35372a3bd7b1
2018-03-06 23:22:46 +00:00
Treehugger Robot b41b33581e Merge "adbd: make static." 2018-03-06 23:04:46 +00:00
Andreas Gampe 1923e768ef Base: Add default tag manipulation
Allow the default tag (the program name) to be overwritten.

Bug: 34867873
Test: m
Test: logging_test
Test: manual
Change-Id: I4ef32bad413a7cc82e46ce16a2f26212925964b1
2018-03-06 14:45:11 -08:00
Christopher Ferris 186637f2a4 Merge "Remove leftover commented out code."
am: 3399853809

Change-Id: I7895a378abf355ad7db33033cf54d87009d464a8
2018-03-06 22:28:10 +00:00
Christopher Ferris 3399853809 Merge "Remove leftover commented out code." 2018-03-06 22:11:26 +00:00
Josh Gao 6eda1840cb adbd: don't require authentication for userdebug/eng builds.
By default, the build system only sets ro.adb.secure (to 1) when
building user builds.

Bug: http://b/73993211
Bug: http://b/74059119
Test: treehugger
Change-Id: I2a683257c1027394ded90c8d2634def6003e0525
2018-03-06 13:37:45 -08:00
Josh Gao 8db99f810d adbd: make static.
adbd is copied into the recovery image without the accompanying
linker/libraries, so it must be a static executable.

Bug: http://b/74237641
Test: `file $ANDROID_PRODUCT_OUT/system/bin/adbd`
Change-Id: Ie8d0710f6002458519d3eea3d696e9016faafee8
2018-03-06 13:01:34 -08:00
Jerry Zhang e661d52573 Merge "Make libasyncio headers usable from C"
am: 5180d5b4dc

Change-Id: I4b47f895e8df147ac23adc0e762376ab3af10db1
2018-03-06 20:27:33 +00:00
Elliott Hughes 34063b3b35 Merge "Copy adb/OWNERS to diagnose_usb/OWNERS."
am: d555e08224

Change-Id: I1a1758d12d7a7174c5525d640386f0860b66fde0
2018-03-06 20:13:42 +00:00
Jerry Zhang 5180d5b4dc Merge "Make libasyncio headers usable from C" 2018-03-06 19:35:21 +00:00
Christopher Ferris 81744ac69f Remove leftover commented out code.
Test: Compiles.
Change-Id: Icf1cf1640e76450d5327395eb94dbd87d2faac36
2018-03-06 11:24:55 -08:00
Steven Moreland 241b93cfd3 libutils: Remove Static.cpp and darwin hacks.
Bug: N/A
Test: in internal master, the only libraries that reference this
  symbol are:
./prebuilts/sdk/tools/linux/bin/split-select android::gDarwinIsReallyAnnoying
./prebuilts/sdk/tools/linux/bin/aapt android::gDarwinIsReallyAnnoying
./prebuilts/sdk/tools/linux/bin/aapt2 android::gDarwinIsReallyAnnoying
./prebuilts/sdk/tools/linux/lib64/libaapt2_jni.so android::gDarwinIsReallyAnnoying
./prebuilts/sdk/tools/linux/lib64/libaapt2_jni.so android::gDarwinIsReallyAnnoying
+ VNDK libraries
Test: libutils_test

Change-Id: Id39e5ef6438e48fa225ba06dbb59902ca5b60f70
2018-03-06 17:44:08 +00:00
Treehugger Robot d555e08224 Merge "Copy adb/OWNERS to diagnose_usb/OWNERS." 2018-03-06 01:50:49 +00:00
Josh Gao ca6ec5c48b Merge changes from topic "adb_bp"
am: 9ee373ac2c

Change-Id: I120a5d3573afb08f4efbb94f047340572509bb06
2018-03-06 00:44:21 +00:00
Elliott Hughes ce55523ffc Copy adb/OWNERS to diagnose_usb/OWNERS.
Bug: N/A
Test: builds
Change-Id: Iba1922309ef178a41b5bb622065840f49f3c81cf
2018-03-05 15:47:43 -08:00
Josh Gao 9ee373ac2c Merge changes from topic "adb_bp"
* changes:
  adb: remove meaningless const.
  adb: convert Connection to a nonblocking interface.
  adb: use soong version stamping.
  adb: switch over to Android.bp.
2018-03-05 23:45:27 +00:00
Josh Gao ffbd3364a4 adb: remove meaningless const.
Returning a const value is pointless.

Test: mma
Change-Id: Ia578d75345361d53e4a29bb9724bfcc161b8d8be
2018-03-05 13:00:28 -08:00
Josh Gao 0bbf69cbbf adb: convert Connection to a nonblocking interface.
Rename the existing Connection to BlockingConnection, add a nonblocking
Connection, and add an adapter between the two, to enable future work
to reduce the impedance mismatch from implementing a blocking interface
on top of nonblocking primitives.

While we're here, delete A_SYNC, and remove one layer of pipes when
sending a packet (replacing it with a condition variable when using
BlockingConnectionAdapter).

Test: python test_device.py, manually plugging/unplugging devices
Change-Id: Ieac2bf937471d9d494075575f07e53b589aba20a
2018-03-05 13:00:28 -08:00
Josh Gao c7567fa52e adb: use soong version stamping.
Bug: http://b/71719137
Test: adb version
Change-Id: Ic735814574c83a7c2b8bef213592d494f5ec3860
2018-03-05 13:00:08 -08:00
Lorenzo Colitti 4a937a9ebc Merge "Add ek and lorenzo to OWNERS for system/core netlink code."
am: fc882a67d8

Change-Id: I9a1d14dde6ea92a2c578aa41e446479b7f721f2d
2018-03-05 19:42:29 +00:00
Treehugger Robot fc882a67d8 Merge "Add ek and lorenzo to OWNERS for system/core netlink code." 2018-03-05 19:21:37 +00:00
Lorenzo Colitti 29005acfd4 Add ek and lorenzo to OWNERS for system/core netlink code.
Test: builds
Change-Id: I3f3ffaf45b683a5f757d83f751a8adb8bb2e0daf
2018-03-05 19:18:02 +09:00
Jerry Zhang c3d4e7226a Make libasyncio headers usable from C
This allows us to enable LTP tests
for io_* syscalls.

Bug: 31152298
Test: LTP tests pass
Change-Id: Ic25189d8bf25cdacfa0f144ac57c7b2827adcd9f
2018-03-02 16:28:15 -08:00
Suren Baghdasaryan 27bae4cf7c Merge changes I394a7920,Ia847118c,Ic8396eee,I79a85c33,Id015e6a7, ...
am: 1d5b102671

Change-Id: Iec6ef1c08a1aed08e9376c367a6e69f8705a8518
2018-03-03 00:15:49 +00:00
Steven Moreland 96eea9a773 Merge "fastboot: only require Linux modules on Linux"
am: 24efdff2c5

Change-Id: Ic3b7aeee813ab0ef55e7a2ad0d71db6fdb3889c9
2018-03-03 00:14:29 +00:00
Yi Kong 4734981245 Merge "healthd: Fix negativity check after cast to unsigned enum"
am: 3dad67af05

Change-Id: If35b22e1a2e56a0a424aedc8d8e36d23c1ed5ea8
2018-03-03 00:09:34 +00:00
Suren Baghdasaryan 1d5b102671 Merge changes I394a7920,Ia847118c,Ic8396eee,I79a85c33,Id015e6a7, ...
* changes:
  lmkd: Select in-kernel vs userspace lmk based on kernel driver presence
  lmkd: Implement kill timeout
  lmkd: Allow killing multiple processes to downgrade memory pressure
  lmkd: Detect the highest level of vmpressure when event is detected
  lmkd: Close cgroup.event_control file when done writing
  lmkd: Remove stale dependency on libprocessgroup
  lmkd: Add ability to trace lmkd kills
  lmkd: add logic to kill the heaviest of the eligible processes
  lmkd: change defaults to disable event upgrade/downgrade logic
  lmkd: add ability to monitor all vmpressure events
2018-03-02 21:32:18 +00:00
Treehugger Robot 24efdff2c5 Merge "fastboot: only require Linux modules on Linux" 2018-03-02 20:44:29 +00:00
Treehugger Robot 3dad67af05 Merge "healthd: Fix negativity check after cast to unsigned enum" 2018-03-02 19:49:18 +00:00
Yi Kong 808e57e3f3 healthd: Fix negativity check after cast to unsigned enum
mapSysfsString return code is checked for negativity after being casted
to unsigned enum type, which will always be false. This is obviously
unintended behaviour.

Fixes tautological-unsigned-enum-zero-compare warning.

Bug: 72331526
Test: m
Change-Id: Icec76d7a1121cb56fd9d05feb70cede69954c322
2018-03-02 18:42:03 +00:00
Adam Lesinski c9c0460e99 Merge "Remove empty zip warning on host builds"
am: fd42c09813

Change-Id: Ic3d788dd7da989da048bfb410ca51bea716e3d08
2018-03-02 02:21:02 +00:00
Treehugger Robot fd42c09813 Merge "Remove empty zip warning on host builds" 2018-03-02 02:07:00 +00:00
Paul Crowley c30557f2bf Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery.""
am: b9ee9abebe

Change-Id: I46fd5105be75661eb74ab17528e03ac420e022dc
2018-03-02 01:43:48 +00:00
Treehugger Robot b9ee9abebe Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery."" 2018-03-02 01:26:32 +00:00
Tom Cherry 550ebdf9fb Merge "Restrict setting platform properties from vendor .prop files"
am: c3892c045f

Change-Id: I8d5cbc8addf03785d9effdde97c170d60b7c1255
2018-03-02 01:17:07 +00:00
Suren Baghdasaryan 2088f6ad03 lmkd: Select in-kernel vs userspace lmk based on kernel driver presence
(cherry pick from commit 979591b627)

Currently selection criteria for in-kernel vs userspace lmk is kernel
driver presence and device not being a Go device. This change removes
Go device check leaving kernel driver presence to be the only selection
criteria.

Bug: 71502948

Change-Id: I394a7920433a8d090e207ea86296356413a63fe7
Merged-In: I394a7920433a8d090e207ea86296356413a63fe7
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2018-03-02 01:16:05 +00:00
Suren Baghdasaryan 63dadcf79e lmkd: Implement kill timeout
(cherry pick from commit caa2dc56fd)

New ro.lmk.kill_timeout_ms property defines timeout in ms after a
successful kill cycle for more kills to be considered. This is
necessary because memory pressure after a kill does not go down
instantly and system needs time to reflect new memory state. This
timeout prevents extra kills in the period immediately after a
kill cycle. By default it is set to 0 which disables this feature.

Bug: 63631020
Test: alloc-stress

Change-Id: Ia847118c8c4a659a7fc38cd5cd0042acb514ae28
Merged-In: Ia847118c8c4a659a7fc38cd5cd0042acb514ae28
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2018-03-02 01:15:01 +00:00