Commit graph

59955 commits

Author SHA1 Message Date
Maciej Żenczykowski
cfe842456e Merge "NetlinkEvent - ignore captive portal and pref64 nd user opts" am: 23bfaae6dc
Change-Id: I14928091507f1bcd1ed74103a65473abff103bf9
2020-04-02 03:07:44 +00:00
David Anderson
fabc36445e fs_mgr: Allow commas in boot device paths.
If the value of androidboot.boot_devices has a comma in its path, it'll
get split and /dev/block/by-name symlinks won't work. As a workaround,
add "androidboot.boot_device" as a valid command-line parameter. It can
be repeated multiple times to retain multiple-boot-device semantics.

Bug: 153024538
Test: device boots with androidboot.boot_device= set
Change-Id: I1be5aeec287ba198768c3452b1930d59b2f13463
2020-04-01 19:58:18 -07:00
Maciej Żenczykowski
23bfaae6dc Merge "NetlinkEvent - ignore captive portal and pref64 nd user opts" 2020-04-02 02:37:19 +00:00
Josh Gao
36d298b43e Merge changes I90e10c74,I038d1df4,I4299bd96 am: 73d44bb6c2 am: 72138abaa7
Change-Id: Ie48b479ef861990e3b2ab81cdcc6542232cd09cb
2020-04-01 23:20:14 +00:00
Josh Gao
d6998c98d8 Merge changes I90e10c74,I038d1df4,I4299bd96 am: 73d44bb6c2 am: 72138abaa7
Change-Id: Ifa3354b755dab76cff00f3e7ceb0a80e5dd6657d
2020-04-01 23:19:26 +00:00
Josh Gao
72138abaa7 Merge changes I90e10c74,I038d1df4,I4299bd96 am: 73d44bb6c2
Change-Id: Ia63c3ad5c91d59de688379c97a820899fe5400ea
2020-04-01 22:51:26 +00:00
Josh Gao
73d44bb6c2 Merge changes I90e10c74,I038d1df4,I4299bd96
* changes:
  adbd: delete unused variable.
  adb: move things around to prepare to add LZ4.
  adb: fix misindentation in Android.bp
2020-04-01 22:38:38 +00:00
Bill Peckham
647a8cdd44 Ignore functionfs mounts.
Vendors may add additional functionfs mounts. Since these
will never be remounted, we can safely filter these out.

Bug: 153008210
Test: Test device with previously unfiltered entries.
Change-Id: I7f384b8a0ce93dd6701fe3c4d9dd2557370b31e1
2020-04-01 14:29:12 -07:00
Josh Gao
e485bdf06e adbd: delete unused variable.
Bug: https://issuetracker.google.com/150827486
Test: m adb com.android.adbd.apex
Change-Id: I90e10c74d695659c702dea4173cb33ac5ca1a102
2020-04-01 13:09:31 -07:00
Josh Gao
6e697f2f8c adb: move things around to prepare to add LZ4.
Bug: https://issuetracker.google.com/150827486
Test: m adb com.android.adbd.apex
Change-Id: I038d1df4f179ddb23102016d781c9bd90da5a546
2020-04-01 13:09:29 -07:00
Josh Gao
31d42aa73c adb: fix misindentation in Android.bp
Bug: https://issuetracker.google.com/150827486
Test: none
Change-Id: I4299bd962963a58ef5f075405b99b1d1e4c1febc
2020-04-01 13:09:16 -07:00
Jooyung Han
ab9dfa4321 Add min_sdk_version:R to updatable apexes
APEXes introduced in R need to set min_sdk_version to ensure that they
are built against correct version(30 or R) of stubs (libc/liblog/...).

Bug: 152655956
Test: /vendor/google/build/build_mainline_modules.sh
Change-Id: Id3f94a2ac09bd7bf7f9a4a0c2f62b624f29509d0
2020-04-02 03:02:16 +09:00
Nikita Ioffe
9fd393f430 Make init.userspace_reboot.is_supported a rw property
General recommendation is to avoid read-only properties, and instead control
"read-onlines" by only allowing init/vendor_init to set the property.

Since ro.init.userspace_reboot.is_supported was added in this release, and
nobody outside of the platform is querying it directly, it should be fine to
simply rename it.

Test: adb shell getprop init.userspace_reboot.is_supported
Test: atest CtsUserspaceRebootHostSideTestCases
Bug: 152803929
Change-Id: I7552d5ccc6e9b750a6081947eef8fcb027be13e1
Merged-In: I7552d5ccc6e9b750a6081947eef8fcb027be13e1
(cherry picked from commit 663cd35030)
2020-04-01 18:24:57 +01:00
Tom Cherry
f84aa059e0 Merge "init: don't sync() before shutting down services" am: d54a4bf9a3 am: 5bff2ac286
Change-Id: I6b9a332da417ffa93fb6127a9f6e207e76fcd848
2020-04-01 16:07:24 +00:00
Tom Cherry
e69fc7ae18 Merge "init: don't sync() before shutting down services" am: d54a4bf9a3 am: 5bff2ac286
Change-Id: I0167b94f0680ccf01ed0f5e337a81e685a298010
2020-04-01 16:07:22 +00:00
Tom Cherry
5bff2ac286 Merge "init: don't sync() before shutting down services" am: d54a4bf9a3
Change-Id: I8a6699ee125e03b672bf38e1bb2a41f63fdd2bea
2020-04-01 15:51:40 +00:00
Tom Cherry
d54a4bf9a3 Merge "init: don't sync() before shutting down services" 2020-04-01 15:40:44 +00:00
Nikita Ioffe
bc7e502f46 Merge "Make init.userspace_reboot.is_supported a rw property" am: 884b570100 am: 24d89ac980
Change-Id: Ia0d6a68bcff1564866d7305f69742f4233969524
2020-04-01 13:52:32 +00:00
Nikita Ioffe
0f5171234d Merge "Make init.userspace_reboot.is_supported a rw property" am: 884b570100 am: 24d89ac980
Change-Id: I1b559c32092c72f69ce79161e23c8a16efbd964f
2020-04-01 13:52:19 +00:00
Nikita Ioffe
92116e4129 Properly fail userspace reboot if it's not supported
Previously, after `adb reboot userspace` is called on a device that
doesn't suppor it, init would've logged an error and quietly exit the
shutdown sequence. This was leaving adb handing forever.

With this approach, init will fail setprop
"sys.powerctl=reboot,userspace" in case userspace reboot is not
supported.

Test: adb root
Test: adb setprop init.userspace_reboot.is_supported 0
Test: adb reboot userspace
Test: atest CtsInitTestCases
Bug: 146639622
Change-Id: I1264078f53ed3ff54638c7f3b6846b7437f98ee5
2020-04-01 14:34:54 +01:00
Nikita Ioffe
24d89ac980 Merge "Make init.userspace_reboot.is_supported a rw property" am: 884b570100
Change-Id: I09a3c3ba50963f2e6e9ecc33a0d9048390c4599f
2020-04-01 13:32:15 +00:00
Nikita Ioffe
884b570100 Merge "Make init.userspace_reboot.is_supported a rw property" 2020-04-01 13:14:21 +00:00
David Anderson
c3ed00599e [automerger skipped] Merge "libdm: Link libraries statically for VTS." into rvc-dev am: bcb856fe1a -s ours
am skip reason: Change-Id I9f356c854833b5e68820e4d3d4e9709af1288381 with SHA-1 e580566b00 is in history

Change-Id: I68152c57f213124e286840088518056bd519d689
2020-04-01 04:55:47 +00:00
David Anderson
bcb856fe1a Merge "libdm: Link libraries statically for VTS." into rvc-dev 2020-04-01 04:40:26 +00:00
TreeHugger Robot
f0fb5629e4 [automerger skipped] Merge changes from topic "minadbd_static_libadbd" into rvc-dev am: 3db222694d -s ours
am skip reason: Change-Id Ie479ae2fbaf1006228a531dab26c7d535ed403db with SHA-1 3735614b28 is in history

Change-Id: I87ca144566ff9c69070f5de8b9aa86b2a8d41e0d
2020-04-01 04:35:07 +00:00
TreeHugger Robot
3db222694d Merge changes from topic "minadbd_static_libadbd" into rvc-dev
* changes:
  Statically link libadbd into minadbd.
  adb: temporarily kill adb_benchmark.
  Move adbd's legacy USB implementation to fastboot.
2020-04-01 04:18:37 +00:00
Maciej Żenczykowski
a806a7153f NetlinkEvent - ignore captive portal and pref64 nd user opts
These are provided to userspace by newer kernels.

Test: builds
Bug: 150648313
Change-Id: I811c75e9a4739db149f502b9a43c99a8ed883341
2020-03-31 20:25:33 -07:00
Josh Gao
36fb67568c Statically link libadbd into minadbd.
Bug: http://b/150317254
Test: booted aosp_walleye-eng into recovery
Change-Id: Ie479ae2fbaf1006228a531dab26c7d535ed403db
Merged-In: Ie479ae2fbaf1006228a531dab26c7d535ed403db
(cherry picked from commit 3735614b28)
2020-03-31 19:16:08 -07:00
Tom Cherry
10615eb397 init: don't sync() before shutting down services
Devices in the lab are hitting an issue where they're getting stuck
likely in the sync() call in DoReboot() before we start the reboot
monitor thread and before we shut down services.

It's possible that concurrent writing to RW file systems is causing
this sync() call to take essentially forever.  To protect against
this, we need to remove this sync().  Note that we will still call
sync() after shutting down services.

Note that the service shutdown code has a timeout and there is a
reboot monitor thread that will shutdown the device if more than 30
seconds pass above that timeout.  This change increases that timeout
to 300 seconds to give the final sync() calls explicitly more time to
finish.

Bug: 150863651
Test: reboot functions normally
Test: put an infinite loop in DoReboot and the the reboot monitor thread
      triggers and shuts down the device appropriately
Change-Id: I6fd7d3a25d3225081388e39a14c9fdab21b592ba
2020-03-31 18:59:23 -07:00
Tom Cherry
0c09361d92 Merge "init: only print backtraces on subsequent reboots with a value" am: e55818cd83 am: 6ec231e7ad
Change-Id: Ia166c012bb0156b38e044e9bd1c4523606d1f8f5
2020-04-01 01:20:29 +00:00
Tom Cherry
6eef871628 Merge "init: only print backtraces on subsequent reboots with a value" am: e55818cd83 am: 6ec231e7ad
Change-Id: I5560436712aafb73b0afd8fbce5d4c72c7510d28
2020-04-01 01:20:27 +00:00
Tom Cherry
6ec231e7ad Merge "init: only print backtraces on subsequent reboots with a value" am: e55818cd83
Change-Id: I0b9da3a76c9759e001396fe48268a96f4a143bb1
2020-04-01 01:09:53 +00:00
Tom Cherry
e55818cd83 Merge "init: only print backtraces on subsequent reboots with a value" 2020-04-01 00:53:10 +00:00
David Anderson
05aea2e700 [automerger skipped] Merge "fastbootd: Unmount /cache before flashing." into rvc-dev am: ab4a2621aa -s ours
am skip reason: Change-Id I8a86bc4d12e4b3be020bbe47e02262a5aaa913a7 with SHA-1 2ffc31b090 is in history

Change-Id: Id6ae907072764761a5b51deb4aff81f7e4debb8a
2020-04-01 00:07:48 +00:00
David Anderson
ab4a2621aa Merge "fastbootd: Unmount /cache before flashing." into rvc-dev 2020-03-31 23:56:01 +00:00
Peter Collingbourne
d3a0918105 Merge "Fix off-by-one in ReadBuildIDFromMemory." am: bc1a6191f1 am: 5bdee1788c
Change-Id: Ib86c7e50a2c176f88315e28b038579f41ae8f16c
2020-03-31 23:34:39 +00:00
Peter Collingbourne
97e2f4f796 Merge "Fix off-by-one in ReadBuildIDFromMemory." am: bc1a6191f1 am: 5bdee1788c
Change-Id: Ibe26b85a455606f440050d60abaa0590d63daa2b
2020-03-31 23:34:37 +00:00
Peter Collingbourne
5bdee1788c Merge "Fix off-by-one in ReadBuildIDFromMemory." am: bc1a6191f1
Change-Id: I2e3a745dd1950d460e64cc7d8a60080bfd1ddad7
2020-03-31 23:19:36 +00:00
Peter Collingbourne
bc1a6191f1 Merge "Fix off-by-one in ReadBuildIDFromMemory." 2020-03-31 23:08:12 +00:00
Josh Gao
2b5fa5505f adb: temporarily kill adb_benchmark.
Temporarily delete adb_benchmark, since it seems difficult to make this
sensibly work with a single target that's used for both libadb and
libadbd benchmarking.

Bug: http://b/150317254
Test: treehugger
Change-Id: Ibf81fdff4f2b7304b586ce9a7955b4bc2c11484e
Merged-In: Ibf81fdff4f2b7304b586ce9a7955b4bc2c11484e
(cherry picked from commit c6cb89ea80)
2020-03-31 16:05:41 -07:00
Josh Gao
2783122071 Move adbd's legacy USB implementation to fastboot.
This code path is effectively dead in adbd, and fastboot's dependency on
libadbd makes it hard to refactor adbd's dependencies.

Bug: http://b/150317254
Test: built and flashed aosp_walleye-eng
Change-Id: I5118136d32fdcbbd011559ed0a4a71e1dc7bf064
Merged-In: I5118136d32fdcbbd011559ed0a4a71e1dc7bf064
(cherry picked from commit 0871824de6)
2020-03-31 16:05:36 -07:00
Tianjie Xu
31988c2f00 Merge "Support parsing of data descriptor" am: fcf2d8b89b am: 6476fabea6
Change-Id: I1753bf5e8ea8a024a80b9276b72816a00846d7e9
2020-03-31 22:18:33 +00:00
Tianjie Xu
3a080b497c Merge "Support parsing of data descriptor" am: fcf2d8b89b am: 6476fabea6
Change-Id: I8892d6c500601ff7dd9be7326bb48c2043a53d86
2020-03-31 22:18:33 +00:00
Tom Cherry
a25b646f70 Merge "fastbootd: sync() after flashing partitions or updating super" am: 8890d42939 am: 641282d0da
Change-Id: I1dc60e81266f0b11fa4b49534de386b911a9bccb
2020-03-31 22:18:20 +00:00
Tom Cherry
dfb50ad272 Merge "fastbootd: sync() after flashing partitions or updating super" am: 8890d42939 am: 641282d0da
Change-Id: If41678aafa3ad35939d2f6b396acca9c0e512250
2020-03-31 22:18:06 +00:00
Tianjie Xu
6476fabea6 Merge "Support parsing of data descriptor" am: fcf2d8b89b
Change-Id: I4e93b4535f8d7d268aed2b3396f2008687fedb5b
2020-03-31 22:04:34 +00:00
Tom Cherry
641282d0da Merge "fastbootd: sync() after flashing partitions or updating super" am: 8890d42939
Change-Id: I51ffae77484fea37221e80b4164153d70d31aacf
2020-03-31 22:04:12 +00:00
Tianjie Xu
fcf2d8b89b Merge "Support parsing of data descriptor" 2020-03-31 21:52:52 +00:00
Tom Cherry
8890d42939 Merge "fastbootd: sync() after flashing partitions or updating super" 2020-03-31 21:52:39 +00:00
Tom Cherry
9174a9bff8 init: only print backtraces on subsequent reboots with a value
Userspace reboot resets sys.powerctl to an empty string once it
starts, which was inadvertently triggering the backtrace of the main
init thread.

Test: no more unexpected backtraces
Change-Id: I35d6f1b37aa31a46ae9266647f41a709f28b6099
2020-03-31 14:36:03 -07:00