Commit graph

56156 commits

Author SHA1 Message Date
Automerger Merge Worker
84c79e4e15 Merge "Creating logical and snapshot partitions uses timeout in tests" am: 274bd807a6
Change-Id: I374a5f77c951db18a8daa50104f39471f8a2b25d
2020-01-31 16:09:32 +00:00
Automerger Merge Worker
fb4209d8ee Merge "Correct /sys/kernel/tracing permissions" am: 1fad2b39a3
Change-Id: I699781e70a86357bd77f268d8b3264ac0a04ce72
2020-01-31 16:08:59 +00:00
Automerger Merge Worker
9e3a7c41c2 Merge "fs_mgr: Fix MapScratchPartitionIfNeeded signature" am: 838b1a1f94
Change-Id: Iad848705749bfcf5725f9532f00009517cb5355c
2020-01-30 18:14:40 +00:00
Automerger Merge Worker
8c2a9e8df3 Merge "Dependency cleanup for snapshot .bp" am: 68acec7723
Change-Id: I6dbf163c1649a503bc706c820a358d67bb33cf16
2020-01-30 18:13:21 +00:00
Automerger Merge Worker
88b99fbda4 Merge "Revive ACgroupController_getFlags LLNDK function to detect missing cgroups" am: 77840a1877
Change-Id: If7d0d03e7b055919f25ad7882dd69ecaf7e78568
2020-01-30 18:12:01 +00:00
Automerger Merge Worker
4eb7ba464e Merge "libsnapshot_test runs as root" am: 30abf7a9fc
Change-Id: I14c82cae7ec7b1c808340e7cbc4af94e0c4076a3
2020-01-30 18:09:53 +00:00
Automerger Merge Worker
ae02308fef Merge "set-verity-state: Link to libfs_mgr_binder." am: c335a34f6b
Change-Id: I1215ad0293017e93ce75a18ca6b659d07cc48d2a
2020-01-30 18:02:24 +00:00
Automerger Merge Worker
563e1b6a99 Merge "remount: Use /data for backing scratch storage." am: 21dcbd15bc
Change-Id: I8ab5ad02a2ae1e465cb300c106ee6d5967506da8
2020-01-30 18:02:21 +00:00
Treehugger Robot
274bd807a6 Merge "Creating logical and snapshot partitions uses timeout in tests" 2020-01-30 02:57:25 +00:00
Alistair Delva
1fad2b39a3 Merge "Correct /sys/kernel/tracing permissions" 2020-01-30 00:08:02 +00:00
David Anderson
838b1a1f94 Merge "fs_mgr: Fix MapScratchPartitionIfNeeded signature" 2020-01-29 22:48:08 +00:00
Treehugger Robot
68acec7723 Merge "Dependency cleanup for snapshot .bp" 2020-01-29 20:55:03 +00:00
Luca Stefani
32835b3967 fs_mgr: Fix MapScratchPartitionIfNeeded signature
Test: lunch aosp_x86_64-user; m

Change-Id: I0cd9be80baab664dd374593c1a4f45cea6a0cc78
2020-01-29 20:58:06 +01:00
Treehugger Robot
77840a1877 Merge "Revive ACgroupController_getFlags LLNDK function to detect missing cgroups" 2020-01-29 18:50:12 +00:00
Treehugger Robot
30abf7a9fc Merge "libsnapshot_test runs as root" 2020-01-29 18:43:53 +00:00
Alessio Balsini
153ccacfb6 Creating logical and snapshot partitions uses timeout in tests
CreateLogicalAndSnapshotPartition is used in first-stage init and by
default never blocks (thanks to a timeout set to 0).  This causes some
libsnapshot tests to fail, because snapshot devices may be accessed
before there actual creation is complete.
Fix by introducing a timeout_ms argument, set to 0 if unspecified.

Test: libsnapshot_test
Bug: 142513589
Change-Id: I5e23adaaf6df8603df501b9a25fdd1e9d8c15252
Signed-off-by: Alessio Balsini <balsini@google.com>
2020-01-29 18:24:50 +00:00
David Anderson
c335a34f6b Merge "set-verity-state: Link to libfs_mgr_binder." 2020-01-29 17:55:06 +00:00
David Anderson
21dcbd15bc Merge "remount: Use /data for backing scratch storage." 2020-01-29 17:55:06 +00:00
Suren Baghdasaryan
cee468fb79 Revive ACgroupController_getFlags LLNDK function to detect missing cgroups
ACgroupController_getFlags was reverted due to LLNDK breakage, however
it allows detection of cgroups that failed to mount in a more efficient
way. Revive the function as a weakly linked symbol to allow for it to
be missing in case older LLNDK library is being used with the new
system software. This effectively reverts the commit
aa1d54f0cc "Remove ACgroupController_getFlags to fix API breakage"'
except it declares ACgroupController_getFlags function as weak and
targets it for API level 30. If LLNKD library does not contain
ACgroupController_getFlags the behavior falls back to the current
way of identifying cgroups that failed to mount.

Test: build and verify correct operation with a missing cgroup
Change-Id: I9158ef53aba97972d41d71dd3396ac43796a7004
Merged-In: I9158ef53aba97972d41d71dd3396ac43796a7004
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2020-01-29 17:24:06 +00:00
Alistair Delva
ebb5b3bd48 Correct /sys/kernel/tracing permissions
In Android kernels >4.4 we will see an empty /sys/kernel/tracing
directory which is notionally where you should mount tracefs if you
don't want to mount debugfs. As we move towards not mounting debugfs,
ensure that the non-legacy location also has adequate permissions to be
read by tracing tools.

Note that this change will be OK even if the board init.rc doesn't mount
tracefs here, because sysfs will always create this directory.

Bug: 148436518
Change-Id: I674587d0f08effdb8471a82e3b1ceec3af8588de
2020-01-29 09:10:50 -08:00
Alessio Balsini
5dd50b2b84 Dependency cleanup for snapshot .bp
Reorder, remove and fix some of the dependencies in the Android.bp for
snapshot.

Test: m, snapshot_test, OTA
Bug: 142513589
Change-Id: Id214a8d6453a5675e60cda4352094dc3987292ec
Signed-off-by: Alessio Balsini <balsini@google.com>
2020-01-29 16:31:06 +00:00
Alessio Balsini
a7383b4001 libsnapshot_test runs as root
Add flag in Android.bp to force the execution of libsnapshot_test as
root.

Test: m
Bug: 142513589
Change-Id: I9d047a9e1f9ea6d6e5540fa66fb42603ea136641
Signed-off-by: Alessio Balsini <balsini@google.com>
2020-01-29 16:31:06 +00:00
Tom Cherry
24808cdee0 Merge changes I303549ae,Ia36e0d2e,Ibdea2961
am: 20610c3082

Change-Id: I821dda4d6ecab52392c57c2db889757fd34bf2ba
2020-01-29 08:29:29 -08:00
Tom Cherry
20610c3082 Merge changes I303549ae,Ia36e0d2e,Ibdea2961
* changes:
  liblog: fix host tests
  liblog: do not allow loggers to write to binary buffers
  liblog: remove fake_log_device
2020-01-29 16:02:14 +00:00
Nikita Ioffe
c082f8f47c Merge "Trigger boot animation on userspace reboot"
am: 2d88794a7d

Change-Id: Ie828fa6ea8b54ac7832b45153247d838f0566a7e
2020-01-29 03:32:55 -08:00
Nikita Ioffe
2d88794a7d Merge "Trigger boot animation on userspace reboot" 2020-01-29 11:24:01 +00:00
Josh Gao
baef7c2982 Merge "Move jdwp connection abstraction from ART apex to adbd apex."
am: e30aa60128

Change-Id: I6be637e9d3873c4b8b0abe76505d9d82cccbc516
2020-01-28 16:09:09 -08:00
Josh Gao
e30aa60128 Merge "Move jdwp connection abstraction from ART apex to adbd apex." 2020-01-29 00:03:22 +00:00
Tom Cherry
5676f3d916 liblog: fix host tests
1) Fix up the host tests for new logging format
2) Add recently added tests to the host test
3) Ensure that properties are cleaned up by liblog-unit-tests

Test: unit tests
Change-Id: I303549aecc26d11ec87e59d48758ced4c198b72c
2020-01-28 13:07:11 -08:00
Tom Cherry
f48f685e60 liblog: do not allow loggers to write to binary buffers
Do not write to binary buffers, this was already done for logd,
but wasn't explicitly done for other loggers, so do that too.

Test: unit tests
Change-Id: Ia36e0d2e1b6c833780239a5ef459abea99bc4a1f
2020-01-28 13:07:11 -08:00
David Anderson
c13586faea remount: Use /data for backing scratch storage.
Currently, this is only enabled for Virtual A/B devices. When /data uses
F2FS, then proper pinning support must be enabled.

Because /data cannot be mounted in recovery, we can't delete the scratch
image backed by /data while in fastbootd. Instead, we mark it as
disabled in /metadata. The remount command now has an init script that
checks for and removes a disabled scratch partition.

Bug: 134949511
Test: adb remount on V A/B device with patched F2FS
Change-Id: Ifc8720378259654472d3822e97059b6c366f601d
2020-01-28 12:04:38 -08:00
Tom Cherry
e2187bfbbc liblog: remove fake_log_device
This is now dead code as __android_log_stderr_logger() has superseded it.

Bug: 147496863
Test: build
Change-Id: Ibdea2961ec4fc093bf9e35581dc1c46db2cff06a
2020-01-28 10:42:02 -08:00
Tom Cherry
06ae836095 Merge "liblog: always restore errno in logging functions"
am: 077839ab23

Change-Id: Iae9738f2c6b7df4ed30681432489a470b2051b5f
2020-01-28 09:24:10 -08:00
Tom Cherry
077839ab23 Merge "liblog: always restore errno in logging functions" 2020-01-28 16:25:12 +00:00
Nikita Ioffe
764c1ac8ba Trigger boot animation on userspace reboot
Also reset some more properties to make bootanimation work properly.

Test: adb reboot userspace
Bug: 148172262
Change-Id: I0154d4fe9377c019150f5b1a709c406925db584d
2020-01-28 10:42:44 +00:00
Yabin Cui
311002ec79 Merge "libunwindstack: add simpleperf presumit test."
am: 15778b7439

Change-Id: I68b1db3dffda20b74a842fa1ab23b40503fd3cc9
2020-01-27 19:57:26 -08:00
Maciej Żenczykowski
2b80b6e514 Merge "add nodad argument to ifc_act_on_address() and add it to header file"
am: 144f42d23d

Change-Id: I3ee666a3e3585a7f9191f4ce2882a7ba0b88f267
2020-01-27 19:52:51 -08:00
Yabin Cui
15778b7439 Merge "libunwindstack: add simpleperf presumit test." 2020-01-28 03:51:44 +00:00
Maciej Żenczykowski
144f42d23d Merge "add nodad argument to ifc_act_on_address() and add it to header file" 2020-01-28 03:51:01 +00:00
Suren Baghdasaryan
e7a707cfbd Merge "libprocessgroup: Prevent aggregate profiles from referencing stale ones"
am: 5562b076b7

Change-Id: I96db8c4038d17bb200946204a0548236ffb76c1a
2020-01-27 16:54:08 -08:00
Suren Baghdasaryan
5562b076b7 Merge "libprocessgroup: Prevent aggregate profiles from referencing stale ones" 2020-01-28 00:49:07 +00:00
Tom Cherry
ff464b1288 liblog: always restore errno in logging functions
Some recent changes can have these logging functions potentially set
errno.  This change places android::base::ErrnoRestorer at the entry
point of the public functions where we want to guarantee errno is
restored to ensure this will not happen again.

Test: build
Change-Id: Iab4170ab16b9c7301474a509ee42d38b370b91a4
2020-01-27 13:50:44 -08:00
Suren Baghdasaryan
8438595f21 libprocessgroup: Prevent aggregate profiles from referencing stale ones
Currently when vendor overrides a profile the profile object is being
replaced with a new one. However the old profile might have been
referenced by an aggregate profile and with such profile replacement
the aggregate profile is left referencing a stale object. Fix this by
replacing the content of the old profile with the content from the new
one instead of replacing the object itself.

Bug: 148311066
Test: override profiles referenced in aggregate profile and verify
Test: correct replacement
Change-Id: Iabddbf3580455e5263fedad6665cf52fb323e50a
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2020-01-27 21:07:27 +00:00
Tom Cherry
f74ad17a65 Merge "liblog: use default tag for loggability checks if no tag is provided"
am: 347d6406f0

Change-Id: Ib1df6a955d2420c050e7876898df32e31636f4b4
2020-01-27 12:41:22 -08:00
Tom Cherry
347d6406f0 Merge "liblog: use default tag for loggability checks if no tag is provided" 2020-01-27 20:36:28 +00:00
Quentin Perret
e1b817abd3 Merge "libprocessgroup: ensure schedboost_enabled is true with uclamp"
am: 16604b4141

Change-Id: Ib43b0aef04eba827977f496bd3a81b650a52c26f
2020-01-27 10:18:51 -08:00
Tom Cherry
2ec6a53a46 liblog: use default tag for loggability checks if no tag is provided
Bug: 116329414
Bug: 119867234
Test: new unit tests
Change-Id: I92a3f4f95e5f482f6fe20f17ed83c8ed367b06dc
2020-01-27 09:38:54 -08:00
Quentin Perret
16604b4141 Merge "libprocessgroup: ensure schedboost_enabled is true with uclamp" 2020-01-27 17:24:06 +00:00
David Anderson
3f52b42db0 Merge "Fix mounting /data on Virtual A/B devices without metadata encryption."
am: 21394f6e85

Change-Id: I6b413b57485f56cc31091a03dddbd78be4239fa3
2020-01-27 09:10:29 -08:00
David Anderson
21394f6e85 Merge "Fix mounting /data on Virtual A/B devices without metadata encryption." 2020-01-27 16:01:59 +00:00