Commit graph

67746 commits

Author SHA1 Message Date
Florian Mayer
29109ea457 Merge "Allow to target atrace apps by glob." am: 83eae36647
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1584933

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85b1610dd1c64e9881a6adca0eb05b2874f108b6
2021-02-15 12:25:18 +00:00
Florian Mayer
83eae36647 Merge "Allow to target atrace apps by glob." 2021-02-15 12:04:06 +00:00
Treehugger Robot
83ff1049ed Merge changes from topic "uid_pid with recovery mode" am: 0130a782ec
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1585103

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idac79861c7f119f7afabbb71545a97807dc51f96
2021-02-13 21:52:04 +00:00
Marco Ballesio
3067ef3ec0 libprocessgroup: adopt cgroup v2 freezer search path am: a7148f82a1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1585102

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b9b318b710c5ab3f53e08489c3df8dcfc2cd663
2021-02-13 21:52:00 +00:00
Marco Ballesio
b33b95f6ef Revert^4 "libprocessgroup: uid/pid hierarchy for cgroup v2" am: 4dac81680f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1585101

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id88c7f5f6b9193af5adc8ebfb19b316c0b2dd938
2021-02-13 21:51:47 +00:00
Treehugger Robot
0130a782ec Merge changes from topic "uid_pid with recovery mode"
* changes:
  libprocessgroup: fix uid/pid hierarchy for recovery mode
  libprocessgroup: adopt cgroup v2 freezer search path
  Revert^4 "libprocessgroup: uid/pid hierarchy for cgroup v2"
2021-02-13 21:32:31 +00:00
Mohammad Islam
60662d06e3 Merge "Create an encrypted directory for decompressing compressed APEX" am: 223902d81c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1551154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18c71a9640338cc3996719c48f03778ed8e5602a
2021-02-12 10:50:06 +00:00
Mohammad Islam
223902d81c Merge "Create an encrypted directory for decompressing compressed APEX" 2021-02-12 10:16:55 +00:00
Josh Gao
24fd318fcd Merge "tombstone.proto: reserve numbers for future growth." am: 517d64f0c6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1584265

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If995627afe3656b734d310774b9dcda392996950
2021-02-12 05:20:56 +00:00
Josh Gao
517d64f0c6 Merge "tombstone.proto: reserve numbers for future growth." 2021-02-12 02:58:17 +00:00
Marco Ballesio
9e628a6b42 libprocessgroup: fix uid/pid hierarchy for recovery mode
configure the cgroup v2 hierarchy for recovery mode, and create uid/pid
groups with attributes following the container cgroup directory.

Bug: 168907513
Test: verified correct pid migration in normal and recovery modes
Change-Id: Idc8b96b4db075383a6a2e523c241b0bc632c7030
2021-02-11 17:03:19 -08:00
Marco Ballesio
a7148f82a1 libprocessgroup: adopt cgroup v2 freezer search path
With the new uid/pid hierarchy the search path looks into uid_0, which
is always present.

Bug: 168907513
Test: verified that the cgroup v2 hierarchy works correctly in normal
mode
Test: verified that the cgroup v2 hierarchy works correctly in recovery
mode

Change-Id: If33594e4891128148da64bed47e68fa74667013d
2021-02-11 17:03:06 -08:00
Marco Ballesio
4dac81680f Revert^4 "libprocessgroup: uid/pid hierarchy for cgroup v2"
This reverts commit 088924af2a.

Bug: 168907513
Test: verified correct function of the cgroup v2 hierarchy in normal and
recovery mode

Change-Id: I6e9d21ebe832326ed5a5b2c356fe8363c1546a80
2021-02-11 15:01:43 -08:00
Tri Vo
5729b640f2 Merge changes I9e4cbf11,I41cde13a am: 83e66f792e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1584264

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8acfbea6c34b2c475c8db6a6fa92d03a9f6dadb
2021-02-11 22:57:31 +00:00
Tri Vo
83e66f792e Merge changes I9e4cbf11,I41cde13a
* changes:
  trusty: Allow fuzzing without coverage
  trusty: Fix up error messages
2021-02-11 22:39:29 +00:00
Florian Mayer
f124707283 Allow to target atrace apps by glob.
Test: Run trace against "com.google.android.*" and use camera.
Bug: 180021291
Change-Id: I9baa7847476b152284e7557e27f1eba1ee835695
2021-02-11 19:31:48 +00:00
Elliott Hughes
5e859102be Merge "Remove special config for /dev/hw_random." am: 3e455e3ae1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1583544

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id93f84d74bd44434d55b3b225b66b03bc2a5727a
2021-02-11 19:31:19 +00:00
Elliott Hughes
3e455e3ae1 Merge "Remove special config for /dev/hw_random." 2021-02-11 18:04:45 +00:00
Mitch Phillips
94427fed35 Merge "[GWP-ASan] Update metadata field name." am: 3e01373d3a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1582536

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I783bf58494a6b52a9f58a81aeaa7ea2aab29d118
2021-02-11 06:12:00 +00:00
Mitch Phillips
3e01373d3a Merge "[GWP-ASan] Update metadata field name." 2021-02-11 05:47:33 +00:00
Josh Gao
fc4fb216d1 tombstone.proto: reserve numbers for future growth.
Test: treehugger
Change-Id: I66adbe70e95363b0083d6eed746de3bc6d17ae28
2021-02-10 16:59:50 -08:00
Tri Vo
19eccb4f51 trusty: Allow fuzzing without coverage
Bug: 171750250
Test: m
Change-Id: I9e4cbf11fd223092f9ad800b35d0502c27f71e8f
2021-02-10 16:46:24 -08:00
Treehugger Robot
257b978dbd Merge "BatteryMonitor: Add helper of logValues()" am: 23a1348509
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1580979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I969341ee25378ef43a8bf5d0cb052b776c062024
2021-02-10 23:23:59 +00:00
Elliott Hughes
61fb3d0b69 Remove special config for /dev/hw_random.
There's no need for system_server to access this any more, so no need to
have weaker permissions than we'll get by default (ignoring the fact
that SELinux policy is our real protection here anyway).

Bug: http://b/179086242
Test: treehugger
Change-Id: I584e87f027f44e10190c2e5c2eb85785f61f8bd5
2021-02-10 15:13:46 -08:00
Treehugger Robot
23a1348509 Merge "BatteryMonitor: Add helper of logValues()" 2021-02-10 23:03:44 +00:00
Tri Vo
ce812a22ca trusty: Fix up error messages
Bug: 171750250
Test: m
Change-Id: I41cde13a891da36c85df6a451b2d051c18365797
2021-02-10 13:31:24 -08:00
Mitch Phillips
2aaad2a696 [GWP-ASan] Update metadata field name.
Bug: N/A
Test: Build succeeds.
Change-Id: I889fbc6722695c9c738352c174c8817548a0faa1
2021-02-10 11:38:28 -08:00
Akilesh Kailash
f0f96830a8 Merge "libsnapshot:snapuserd: Batch merge copy operation" am: 7cd1c03178
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1580192

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c63b126e96a3ff941b88cea88a93a7800312235
2021-02-10 05:31:00 +00:00
Akilesh Kailash
7cd1c03178 Merge "libsnapshot:snapuserd: Batch merge copy operation" 2021-02-10 05:08:48 +00:00
Alistair Delva
73efa18f57 Merge "Create /data/misc/a11ytrace folder to store accessibility trace data." am: 0893839385
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1580633

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5847594f87db333286101235d9b273fabf8d23e8
2021-02-10 04:52:37 +00:00
Alistair Delva
0893839385 Merge "Create /data/misc/a11ytrace folder to store accessibility trace data." 2021-02-10 04:13:35 +00:00
Akilesh Kailash
c42cac92f7 Merge "libsnapshot: No transition of snapuserd during second stage init" am: b5f0a3b73b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1581175

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8033e33e19d8b5239c3e39a38406dd6ac7379b4
2021-02-10 01:23:02 +00:00
Akilesh Kailash
b5f0a3b73b Merge "libsnapshot: No transition of snapuserd during second stage init" 2021-02-10 00:35:23 +00:00
Akilesh Kailash
66914e2b2e libsnapshot:snapuserd: Batch merge copy operation
Allow batch merge of copy operations during merge.
When metadata is read from COW device, assign
the chunk-id by validating there is no overlap
of copy operations. Furthermore, detect the blocks
which are contiguous and batch merge them.

No regression in merge time for full OTA (~35-40 seconds)

Merge time for incremental OTA of ~200M takes about 2 minutes
as compared to 15-20+ minutes without this change.

Add unit test to test ReadMetadata() functionality.

Multiple incremental OTA and full OTA test done on pixel.
adb reboot during merge and validate the merge resume operations.

Bug: 179629624
Test: incremental OTA and full OTA on pixel,
      cow_snapuserd_test
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I4cd84e4923e42afacc796b8cec01738b1bb1f420
2021-02-09 23:53:49 +00:00
Akilesh Kailash
03e803455e libsnapshot: No transition of snapuserd during second stage init
When there is a transition of daemon from selinux stage, we observe
intermittent hangs during OTA. This is a workaround wherein
we don't do the transition and allow the daemon to continue which
was spawned during selinux stage.

Bug: 179331261
Test: Incremental OTA, full OTA on pixel
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I622a0ed8afcd404bac4919b1de00728de2c12eaf
2021-02-09 22:45:29 +00:00
Treehugger Robot
62aefa5eab Merge "adb-remount-test.sh: Fix failure due to missing host tool hexdump" am: dc0ea9d65e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1579507

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic5e9a86c68680968e7966d95ec2545dde8892838
2021-02-09 22:27:29 +00:00
Treehugger Robot
dc0ea9d65e Merge "adb-remount-test.sh: Fix failure due to missing host tool hexdump" 2021-02-09 21:52:19 +00:00
Hongming Jin
87f55fe2af Create /data/misc/a11ytrace folder to store accessibility trace data.
Bug: 157601519
Test: manual check
Change-Id: I0a12246c8b30e8c68e1dd1fa80135f8945f343dc
2021-02-09 11:54:46 -08:00
Treehugger Robot
c9884e0e8b Merge "Relax the language around parallel_restorecon." am: cb9e1decf0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1581174

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id02b1e0c65140389dc66e0833ed9e9b3a101c413
2021-02-09 09:39:47 +00:00
Treehugger Robot
cb9e1decf0 Merge "Relax the language around parallel_restorecon." 2021-02-09 08:32:24 +00:00
Yi-Yo Chiang
fa405414d7 adb-remount-test.sh: Fix failure due to missing host tool hexdump
As we are just using it to generate gibberish, we might as well just
hardcode the gibberish in the script.

Also fix unhandled `grep` failure.

Bug: 179752308
Test: Forrest
Change-Id: I534c7cacdb12a104f26d380fe3a571332091490e
2021-02-09 16:11:23 +08:00
David Anderson
bb159ad483 Relax the language around parallel_restorecon.
Bug: 179702321
Change-Id: I030c861d1e676bca63a25317a509fcd2438b664e
2021-02-08 22:30:39 -08:00
Treehugger Robot
64552741e0 Merge "libfs_avb: verifying vbmeta digest early" am: c9924a763d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1580326

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If081433ccb92bf7472196d281e4bfe93b781afb1
2021-02-09 02:06:37 +00:00
Treehugger Robot
c9924a763d Merge "libfs_avb: verifying vbmeta digest early" 2021-02-09 01:20:20 +00:00
Yifan Hong
083023734c Merge "Add compression to dump" am: 2277c27fcc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1576926

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie49910af4cd7aa725f4e0a7e4ef9b2a757f10a60
2021-02-08 23:30:30 +00:00
Yifan Hong
605e7d20ee BatteryMonitor: Add helper of logValues()
... that logs values for an arbitrary health info and
health config.

This allows health 2.1 HAL implementation to log the
updated health info struct, which is not stored in
BatteryMonitor.

Test: healthd kernel log has correct values
Bug: 179326883
Change-Id: I394ef3f317229f94f4db82de5635d9380c183394
2021-02-08 15:22:28 -08:00
Yifan Hong
2277c27fcc Merge "Add compression to dump" 2021-02-08 22:47:05 +00:00
Treehugger Robot
e0b8e50bb1 Merge "libsnapshot: Disable the update space swap test on non-VABC." am: a24aef614a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1576399

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9db3ee06dc375d0d4881a296b879da2b1aa5bc5
2021-02-08 22:14:36 +00:00
Treehugger Robot
c01d4b4de6 Merge "Add support for compressed snapshot merges in fastboot." am: 20bf5a8aff
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1576928

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I812f190718e1f4561e41f28dc66d2b84d506c687
2021-02-08 22:13:54 +00:00
Yifan Hong
59c30624fd Merge "libsnapshot: Communicate compression status to update_engine." am: 3e6b93ca11
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1573336

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d521d63995cc5e8f9803eb2172955e187ead32d
2021-02-08 22:08:32 +00:00