ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
67375 commits 1 branch 0 tags 217 MiB
Commit graph

67375 commits

This branch
This branch
All branches
Author SHA1 Message Date
Akilesh Kailash
305e576481 Merge "libsnapshot:snapuserd: Handle un-aligned IO request" am: 06ee6f1753 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1545308

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7bcc515172aab7f35ca8ee486bfc91b981291117
 2021-01-12 07:07:52 +00:00
Akilesh Kailash
06ee6f1753 Merge "libsnapshot:snapuserd: Handle un-aligned IO request" 2021-01-12 06:51:47 +00:00
Akilesh Kailash
d2ad50103e libsnapshot:snapuserd: Handle un-aligned IO request 
If the requested IO is not 4k aligned and spans
between two COW Operations, then we will have
to split the IO as we need to read the partial
buffers from two COW operations.

BUG: 176918488
Test: cow_snapuserd_test - Data verification with unaligned IO
      Full OTA on cuttlefish
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Icf6801e1767112b92cb7991808860f119adebda2
 2021-01-12 01:09:21 +00:00
Peter Collingbourne
945704b449 Merge "Remove ANDROID_EXPERIMENTAL_MTE." am: 942e5eef44 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1542047

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I386040a28b2ccc0d5f07f3ac3caec6676069f989
 2021-01-11 21:07:33 +00:00
Matthew Maurer
a4c021f228 Merge changes I595cb4ee,Ie8623a70 am: b026acb71e 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1544688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib853b7c5a9e7d589fd2234313a796602b14b8d72
 2021-01-11 21:05:59 +00:00
Peter Collingbourne
942e5eef44 Merge "Remove ANDROID_EXPERIMENTAL_MTE." 2021-01-11 20:42:44 +00:00
Matthew Maurer
b026acb71e Merge changes I595cb4ee,Ie8623a70 
* changes:
  trusty: tipc-test: Use dma_buf rather than memfd
  trusty: tipc-test: Test multi-page support
 2021-01-11 20:12:22 +00:00
Peter Collingbourne
cd27807bfe Remove ANDROID_EXPERIMENTAL_MTE. 
Now that the feature guarded by this flag has landed in Linux 5.10
we no longer need the flag, so we can remove it.

Bug: 135772972
Change-Id: I02fa50848cbd0486c23c8a229bb8f1ab5dd5a56f
 2021-01-11 10:55:51 -08:00
Matthew Maurer
8ca6ab0161 trusty: tipc-test: Use dma_buf rather than memfd 
Test: tipc-test -t send-fd
Bug: 117221195
Change-Id: I595cb4ee5fc24d8cafc9a3e706346139a974d674
 2021-01-11 10:23:46 -08:00
Matthew Maurer
b6e795513b trusty: tipc-test: Test multi-page support 
Test: tipc-test -t send-fd
Bug: 117221195
Change-Id: Ie8623a70f6935ede6bb5e9dd1a7945a7e356d854
 2021-01-11 10:23:30 -08:00
Gavin Corkery
1d6fd9a190 Merge "Add /metadata/watchdog" am: 09494764ae 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1530812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I519c466fcc6e5277092c3fec43d455978b8b850d
 2021-01-08 09:29:26 +00:00
Gavin Corkery
09494764ae Merge "Add /metadata/watchdog" 2021-01-08 08:20:45 +00:00
Gavin Corkery
badf3962bc Add /metadata/watchdog 
This directory will be used to store the mitigation count
from Package Watchdog in the case of a boot loop, in
order to persist the value across fs-checkpointing
rollbacks. One integer will be stored in a file in this
directory, which will be read and then deleted at the
next boot. No userdata is stored.

See go/rescue-party-reboot for more context.

Test: Manual test using debug.crash_sysui property
      and inspecting file
Bug: 171951174
Change-Id: I2bd5e1ebe14d7e9e4f0e0dbeb90cf76b8400752e
 2021-01-07 19:41:07 +00:00
Nicolas Geoffray
6d2e6e246c Merge "Add boot animation progress system property." am: 5266e041ef 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1530810

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43d8e2907a466aa3e241b0756dcc1ba7427d741f
 2021-01-07 09:40:46 +00:00
Nicolas Geoffray
5266e041ef Merge "Add boot animation progress system property." 2021-01-07 09:23:35 +00:00
Shawn Willden
94ab937da8 Merge "Revert^2 "Revise KeymasterMessage versioning system"" am: e3e5ae9eae 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1541058

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf0bc7dfa8c31fd203f05b142640220f4a269115
 2021-01-06 23:18:02 +00:00
Shawn Willden
e3e5ae9eae Merge "Revert^2 "Revise KeymasterMessage versioning system"" 2021-01-06 22:58:32 +00:00
Shawn Willden
9323f4113b Revert^2 "Revise KeymasterMessage versioning system" 
24d46bd512

Change-Id: I4edcfdada8321ff181db70002a2661b821f6b33f
Bug: 176867651
Merged-In: Idefcdd64afa7977f6dc2c4299e69cc5065dcc20d
 2021-01-06 19:54:24 +00:00
Jaegeuk Kim
73e781bb04 Merge "Pass wiped and fs_type to vold to format encrypted partition" am: 7ef01c913f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1530481

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cbc187c695039a36fad74de4fd5fdf318b87aff
 2021-01-06 19:43:27 +00:00
Jaegeuk Kim
7ef01c913f Merge "Pass wiped and fs_type to vold to format encrypted partition" 2021-01-06 19:12:34 +00:00
Treehugger Robot
1acab60bb6 Merge "Revert "Revise KeymasterMessage versioning system"" am: f24141175a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1540851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4548e6a27fd5260ba9c5c8b016562700141c0b8
 2021-01-06 09:45:47 +00:00
Treehugger Robot
f24141175a Merge "Revert "Revise KeymasterMessage versioning system"" 2021-01-06 09:24:43 +00:00
Bonian Chen
24d46bd512 Revert "Revise KeymasterMessage versioning system" 
Revert "Revise KeymasterMessage versioning system"

Revert "Revise KeymasterMessage versioning system"

Revert "Add new message versioning protocol"

Revert submission 1533821-new_km_versioning

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=adt3-userdebug&lkgb=7064747&lkbb=7064769&fkbb=7064769, bug 176867651
Reverted Changes:
I040fe7f62:Revise KeymasterMessage versioning system
Ibea104c39:Revise KeymasterMessage versioning system
Ibea104c39:Revise KeymasterMessage versioning system
I425fb45fc:Add new message versioning protocol

Change-Id: I1569334c59cb62be6aae4a42ce999f40c7a472de
BUG: 176867651
 2021-01-06 06:42:21 +00:00
Treehugger Robot
2f76ec20bf Merge "Adding Car GSI public key" am: 208cad671d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1533905

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib87534c6cb5ee6faa95fb312653b1a8c876cea04
 2021-01-06 04:39:35 +00:00
Treehugger Robot
3df7577a2b Merge "Add assemble_cvd to com.android.virt" am: bd11a5c73a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1539924

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a0166572789b263dd8e09e97120e55e6ad33fea
 2021-01-06 04:28:40 +00:00
Treehugger Robot
6fe271403c Merge "Revert "libprocessgroup: move freezer to uid/pid hierarchy"" am: bde5350eed 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1539808

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1191e0725ad82b60a38cd82c3a2737e760eef80e
 2021-01-06 04:28:01 +00:00
Treehugger Robot
b749531c35 Merge "Revise KeymasterMessage versioning system" am: 936557b6f0 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1534104

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibefae79e7a288088990a6756db16a65efa000007
 2021-01-06 04:26:51 +00:00
Treehugger Robot
208cad671d Merge "Adding Car GSI public key" 2021-01-06 01:05:43 +00:00
Treehugger Robot
bd11a5c73a Merge "Add assemble_cvd to com.android.virt" 2021-01-06 00:07:44 +00:00
Treehugger Robot
bde5350eed Merge "Revert "libprocessgroup: move freezer to uid/pid hierarchy"" 2021-01-05 23:33:12 +00:00
Treehugger Robot
936557b6f0 Merge "Revise KeymasterMessage versioning system" 2021-01-05 22:40:06 +00:00
Marco Ballesio
b01aa99408 Revert "libprocessgroup: move freezer to uid/pid hierarchy" 
This reverts commit 1414a0d4d8.

Reason for revert: reversions of CLs from http://b/174776875 removed dependencies for this CL, and made the freezer non-functional. This CL has to be reverted as well

Bug:174776875
Change-Id: Idbd9532374bb661330b3c7546bbdf086a046aba3
 2021-01-05 21:36:44 +00:00
Yifan Hong
f045de2ddf Merge "LRAP->DAP" am: 8995b50b80 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1532009

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92813365686af6a203e0527dff649f20c3d938e2
 2021-01-05 19:40:05 +00:00
Treehugger Robot
1382046a77 Merge "Reland "Create a pool of 20 measurement files per library for coverage."" am: d3ba0e28cd 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1532864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I857831a708081b15ad15ca65a87af6d02938a8ca
 2021-01-05 19:39:50 +00:00
Yifan Hong
8995b50b80 Merge "LRAP->DAP" 2021-01-05 19:29:25 +00:00
Treehugger Robot
d3ba0e28cd Merge "Reland "Create a pool of 20 measurement files per library for coverage."" 2021-01-05 19:16:50 +00:00
Jiyong Park
3ed3d4cd94 Add assemble_cvd to com.android.virt 
assemble_cvd directly or indirectly depends on these modules. To add
assemble_cvd to the com.anroid.virt APEX, these modules are marked as
being available to the APEX.

Bug: 174639526
Test: m com.android.virt
Change-Id: Id3b2989a9f038a1cdc769a2021a116cf09ab1b15
 2021-01-05 14:46:01 +09:00
Jiyong Park
570fe2083c Merge "init: Sort the list of flattened APEX folders to avoid variations" am: 0f2c5417c3 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1538222

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie037afcf08a09507fc64f630b32cb3d1c6ba3971
 2020-12-31 04:20:38 +00:00
Jiyong Park
0f2c5417c3 Merge "init: Sort the list of flattened APEX folders to avoid variations" 2020-12-31 03:51:03 +00:00
Adrian DC
9449583bc3 init: Sort the list of flattened APEX folders to avoid variations 
* In 'ActivateFlattenedApexesFrom', the 'readdir' detects
   the APEX folders in a random way that depends on filesystems,
   built packages and order of the build chain

 * In normal cases, this is not an issue, however when building
   with Go configurations, we have a case where the package
   'com.android.tethering.inprocess' is built along the
   'com.android.tethering' overriden binary, and depending on
   the 'readdir' output, the mounts break the Tethering service

Change-Id: I8ac4a0284d8d885f732c71e846933869cf16a0bd
Signed-off-by: Adrian DC <radian.dc@gmail.com>
 2020-12-30 22:41:33 +01:00
Treehugger Robot
303c76d2ca Merge "snapuserd: Enable in recovery." am: da1264206c 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1530773

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49414bb66442045740461004c4f6f8c05564ffa9
 2020-12-30 09:17:05 +00:00
Treehugger Robot
da1264206c Merge "snapuserd: Enable in recovery." 2020-12-30 08:27:43 +00:00
Jaegeuk Kim
2ea307e93e Merge "fastboot: f2fs: handle return code correctly" am: 8e944335a4 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1536127

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If28c907d2ec6000e4dbebf85fa5b6ee4cc118d35
 2020-12-30 03:16:22 +00:00
Jaegeuk Kim
8e944335a4 Merge "fastboot: f2fs: handle return code correctly" 2020-12-30 02:54:32 +00:00
Daniel Rosenberg
cf0b935a07 Merge "libsnapshot: Add decompression check to Inspect_Cow" am: ff5f4cc734 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1533827

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b971727bf8b5cca77b42f1c8e646f62a88006ba
 2020-12-30 00:54:40 +00:00
Daniel Rosenberg
ff5f4cc734 Merge "libsnapshot: Add decompression check to Inspect_Cow" 2020-12-30 00:04:04 +00:00
Jaegeuk Kim
58d10c209a fastboot: f2fs: handle return code correctly 
The f2fs shares the fsck return code for sload.f2fs, since it calls fsck after
loading files.

enum {
	FSCK_SUCCESS                 = 0,
	FSCK_ERROR_CORRECTED         = 1 << 0,
	FSCK_SYSTEM_SHOULD_REBOOT    = 1 << 1,
	FSCK_ERRORS_LEFT_UNCORRECTED = 1 << 2,
	FSCK_OPERATIONAL_ERROR       = 1 << 3,
	FSCK_USAGE_OR_SYNTAX_ERROR   = 1 << 4,
	FSCK_USER_CANCELLED          = 1 << 5,
	FSCK_SHARED_LIB_ERROR        = 1 << 7,
};

Bug: 176471360
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I06289670834f29a59e704e772791f12328a073f8
 2020-12-29 19:56:36 +00:00
Jaegeuk Kim
a7635718c4 Pass wiped and fs_type to vold to format encrypted partition 
Bug: 172378121
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I358380fc47fe9d4d75337323c772ca1af122d2c6
 2020-12-29 11:13:35 -08:00
Daniel Rosenberg
588f732b91 Merge "libsnapshot: Add cluster breaks after ops" am: 53296d800b 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1533826

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I580168a1442e7cbedaf6af136406675390baeedd
 2020-12-29 02:47:50 +00:00
Daniel Rosenberg
71a642689c libsnapshot: Add decompression check to Inspect_Cow 
This adds the -d option to Inspect_Cow, which will cause it to attempt
to decompress all data blocks, reporting any errors it encounters.
Useful for detecting corruption in Cow files.

Bug: 172026020
Test: Inspect_Cow -d [cow_file]
Change-Id: Iebf5f7f485b33b36daab4ab07005ca37e51d692f
 2020-12-28 18:20:19 -08:00