Commit graph

75832 commits

Author SHA1 Message Date
Treehugger Robot
5efde0b299 Merge "Promote HWASan tests to presubmit." am: 8874ad6378
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2130634

Change-Id: Ie583c101fbb4c16b9fb555932b470bddb9dffba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 17:50:33 +00:00
Treehugger Robot
8874ad6378 Merge "Promote HWASan tests to presubmit." 2022-06-21 17:32:43 +00:00
Treehugger Robot
ccd2778601 Merge "Promote HWASan tests to presubmit." am: 03d309beb2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2128564

Change-Id: I642650cc900960205c3c20acb668bb2dfb66f83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:28:39 +00:00
Treehugger Robot
03d309beb2 Merge "Promote HWASan tests to presubmit." 2022-06-21 16:11:21 +00:00
Florian Mayer
4effd2f901 Promote HWASan tests to presubmit.
They have been passing and do not show significant slowdown.

Change-Id: I3eba6ecb746160d75e9a2c9561bceb71a09117d3
2022-06-17 22:29:09 +00:00
Florian Mayer
db5b2c9fc0 Promote HWASan tests to presubmit.
They have been passing and do not show significant slowdown.

Change-Id: I64328118f0606c1b62a793fb8913eed5e5ba9578
2022-06-17 22:18:49 +00:00
Treehugger Robot
4e91550e23 [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: cef4850d9f -s ours
am skip reason: Merged-In Id47c567ad92ae4d9d7325a7a8589825a2ff4232b with SHA-1 505eeb7699 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2130214

Change-Id: I8f3b39aca551be7d7065bf6e0ff685a67bcc60a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:07:10 +00:00
Xin Li
12c7d67861 [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: aed9c42ecb -s ours
am skip reason: Merged-In Id47c567ad92ae4d9d7325a7a8589825a2ff4232b with SHA-1 505eeb7699 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2130214

Change-Id: I1add36e2c283c25e49ec876058442b6e8bc7fa80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:06:25 +00:00
Treehugger Robot
cef4850d9f Merge "DO NOT MERGE - Skip SQ3A.220605.009" 2022-06-17 14:29:00 +00:00
Xin Li
aed9c42ecb DO NOT MERGE - Skip SQ3A.220605.009
Bug: 236045730
Merged-In: Id47c567ad92ae4d9d7325a7a8589825a2ff4232b
Change-Id: I7c69dcd35188fb0be59cd1e37d07051c1a56375c
2022-06-16 22:50:49 -07:00
Treehugger Robot
dfb29a21e9 Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: e0f57d2883
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2128496

Change-Id: Id6b20794927bd7286ebb3448ded2edced4c32937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 20:31:20 +00:00
Treehugger Robot
e0f57d2883 Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" 2022-06-16 19:14:41 +00:00
Bob Badour
453d3e4924 [LSC] Add LOCAL_LICENSE_KINDS to system/core
Added SPDX-license-identifier-Apache-2.0 to:
  debuggerd/test_permissive_mte/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: Ic48cf8a972147eba8a955136be74204c013ca436
2022-06-16 10:01:01 -07:00
Akilesh Kailash
ff1c54931b Merge "libsnapshot: Fix vts_libsnapshot_test for GRF with Vendor on S" am: 7e6cdc9f5e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2118787

Change-Id: Ifcabbc37c45b3868ec516468004aaec7eea043fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 00:44:38 +00:00
Akilesh Kailash
7e6cdc9f5e Merge "libsnapshot: Fix vts_libsnapshot_test for GRF with Vendor on S" 2022-06-15 23:24:47 +00:00
Akilesh Kailash
c898925104 libsnapshot: Fix vts_libsnapshot_test for GRF with Vendor on S
If the vendor partition is on S and system partition is on T,
certain tests in vts_libsnapshot_test used to fail. This is primarily
because of inconsistent check between daemon and vts test.

vts test checks the userspace.snapshots.enabled property which is true on T
but never checks if the underlying vendor partition is on S. Hence,
vts test will enable userspace snapshots. However, daemon checks
the vendor partition and disables userspace snapshots thereby
leading to inconsistency.

This is only a problem on vts tests. The underlying OTA on devices
works fine as we have the vendor partition check.

Bug: 231401995
Test: vts_libsnapshot_test on S vendor and T system
      vts_libsnapshot_test on T vendor and T system
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Iad4f299bd2e07c9c01f5fbee6a20e2f01bf1778a
2022-06-15 20:50:02 +00:00
Florian Mayer
226258d02f Merge "Add permissive MTE mode." am: 514c41c6e2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2101441

Change-Id: I65fb04fe5ad6eba01e8a7533baf18c45ff606da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 17:17:38 +00:00
Florian Mayer
514c41c6e2 Merge "Add permissive MTE mode." 2022-06-15 16:58:25 +00:00
Treehugger Robot
79c6750b85 Merge "Chmod for existing nodes which mode not the same as ueventd.rc" am: a50d431830
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2063313

Change-Id: If9b135a575e643a5676b258513df8ec3f3484347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 16:48:26 +00:00
Treehugger Robot
a50d431830 Merge "Chmod for existing nodes which mode not the same as ueventd.rc" 2022-06-14 14:14:15 +00:00
Treehugger Robot
b6ac0cc227 Merge "charge the permissions for the proc/bootconfig" am: 5683591ff9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2121492

Change-Id: Icf1aa5b773ec4eaa87648446305150f2d229d2f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 20:55:41 +00:00
Treehugger Robot
5683591ff9 Merge "charge the permissions for the proc/bootconfig" 2022-06-13 20:17:11 +00:00
Treehugger Robot
b794161d4f Merge "fastboot: vendor boot img util OOB" am: b8505050b3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2117967

Change-Id: Iac67798fb8e73acfab50665e675a5aa9035048db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:30:38 +00:00
David Anderson
b10db488c1 Merge "sh_binary_host for 'adb-remount-test.sh'." am: 4aaff2b264
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2116135

Change-Id: I331d01d7cb2526357e7e695b5014dd6f5efa6b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:30:17 +00:00
Treehugger Robot
b8505050b3 Merge "fastboot: vendor boot img util OOB" 2022-06-13 18:22:33 +00:00
David Anderson
4aaff2b264 Merge "sh_binary_host for 'adb-remount-test.sh'." 2022-06-13 18:06:11 +00:00
zexin.hou
46314853fe charge the permissions for the proc/bootconfig
The current/proc/bootconfig node is the root user group,but some Android modules of our company do not have permission to access the root user group node. We want to add the same permissions to /proc/cmdline for the proc/bootconfig node in init.rc

Change-Id: I98f63a09cf7306be65c40674b1b28f1153c705fb
2022-06-13 12:42:47 +00:00
Yi-yo Chiang
0d9240f898 Merge "Auto enable usb adb if booting with debug ramdisk" am: 155bba8b0c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2119852

Change-Id: Ia48b9e86f53cbc5e6f86c6979ae73baa79b09967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 12:38:54 +00:00
Yi-yo Chiang
155bba8b0c Merge "Auto enable usb adb if booting with debug ramdisk" 2022-06-10 12:08:34 +00:00
Akilesh Kailash
62482af6a1 Merge "snapuserd: Update verification" am: 2ba3ae310e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2038964

Change-Id: If13a32e7719876f4160803eba9cf157575fd367b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 23:03:33 +00:00
Akilesh Kailash
2ba3ae310e Merge "snapuserd: Update verification" 2022-06-09 22:43:32 +00:00
Jaegeuk Kim
2af8162621 Merge "Add zoned device support" am: 3f9c8a8c3a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2115359

Change-Id: I50295036d99166f8defd404d7e55e1cc93efee25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 15:09:58 +00:00
Jaegeuk Kim
3f9c8a8c3a Merge "Add zoned device support" 2022-06-09 14:53:25 +00:00
jiajia tang
a1c8f00e70 sh_binary_host for 'adb-remount-test.sh'.
"adb-remount-test.sh" is sh_binary,
not cc_prebuilt_binary.

Test: m
Test: cd system/core/fs_mgr; mma

Change-Id: Ie5e2446f87d38905d728e2c5a76f6f02381d10ce
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
2022-06-08 22:05:06 +00:00
Akilesh Kailash
f790606591 snapuserd: Update verification
Initiate update verification from daemon. This will help
in two ways:

1: We avoid reading everything into page-cache. Since,
low end devices are already short on memory, we don't
want to read and populate page-cache which can slow
down boot.

2: During boot, once the selinux transition is done, daemon
is all ready to kick off the verification since verity is
already setup. Note that we are still guarded by update_verifier.
Update_verifier will still block marking new slot as
boot success until the verification is completed. So, there
is no change in the behavior.

Bug: 193863442
Test: Full and incremental OTA on Pixel 6

Incremental OTA of 500M (Monthly OTA)

Boot-time (Without this patch): 38 seconds
Boot-time (With this patch): 32 seconds

Full OTA of 2.2G:

Boot-time (Without this patch): 27 seconds
Boot-time (With this patch): 21 seconds

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I4f17db19bdd0dd261902c670be6212862d861fe1
2022-06-08 20:26:10 +00:00
Jaegeuk Kim
e67e570028 Add zoned device support
Format f2fs zoned device.

Bug: 172378121
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ic7f564ce5786c635ee1e1f6d0b33c1f4d08f780a
2022-06-08 13:12:15 -07:00
Yi-Yo Chiang
70c53f5d52 Auto enable usb adb if booting with debug ramdisk
If booting with debug ramdisk (ro.force.debuggable is true), override
the persistent property "persist.sys.usb.config" to always enable adb.
This ensures a consistent debug experience. The developer can expect
that after debug ramdisk (debug boot image) is flashed,
1. Device is rootable with (adb root)
2. adb is enabled automatically
3. no-auth (if $ADB_VENDOR_KEYS is used)

Bug: 223517900
Test: 1. Flash & boot user build, verify device doesn't have usb
  debugging enabled.
  2. Reboot to bootloader and flash vendor_boot-debug.img.
  3. Boot and verify usb debugging is automatically enabled.
  4. Enter Developer Options and manually turn off usb debugging.
  5. Reboot and verify that usb debugging is automatically enabled.
Change-Id: I729e961d645f2dd521ead8ca30b5cb8eb1d9f909
2022-06-08 23:07:13 +08:00
Kean Mariotti
c0e0892a5a Merge "Revert "Set the log callback earlier for showing system property set denials"" am: 526fbe2a37
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2118487

Change-Id: I016b315fb5b79b330125a0d1ca746a7430144f16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 09:32:41 +00:00
Kean Mariotti
526fbe2a37 Merge "Revert "Set the log callback earlier for showing system property set denials"" 2022-06-08 09:07:42 +00:00
Kean Mariotti
3a6040eb71 Revert "Set the log callback earlier for showing system property set denials"
This reverts commit 8c224faa24.

Reason for revert: 235312897

Change-Id: I80684c80bb6f97853449d429bbf948c07d4cb651
2022-06-08 07:57:53 +00:00
Alex Hong
219306f683 Merge "Set the log callback earlier for showing system property set denials" am: af74368a36
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1684665

Change-Id: I1698ef9d4f862497325ef1f96f8b78f732889ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 05:53:21 +00:00
Alex Hong
af74368a36 Merge "Set the log callback earlier for showing system property set denials" 2022-06-08 05:37:22 +00:00
Treehugger Robot
5bfe8317b3 Merge "Implement GetRootOfTrust" am: 7e25d3e8fa
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2115452

Change-Id: Ie005e4728e08610dd4ae1449b589219a8af25b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:59:45 +00:00
Treehugger Robot
7e25d3e8fa Merge "Implement GetRootOfTrust" 2022-06-07 22:43:20 +00:00
Shawn Willden
396bc3f964 Implement GetRootOfTrust
Bug: 219076736
Test: VtsAidlKeyMintTargetTest
Change-Id: I8485360f253ca20f008c5df5090e79c1781fbb4f
2022-06-07 13:19:23 -06:00
Keith Mok
1e490f032e fastboot: vendor boot img util OOB
If vendor image size is less than what the header claims,
there is OOB access.
And it did not check page size equal to zero also.

Bug: 234208198
Test: fastboot_fuzzer
Change-Id: Iec08acf9bb354db4c4cd25e3a0c581974fee7eed
2022-06-07 16:14:43 +00:00
Daniel Angell
17cfc1aee4 Merge "Increase num_retries to reduce likelihood of test flake" am: f3e2a9d5c4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2116279

Change-Id: I241db49f5ab836465c35e00256119594e7859f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:48:20 +00:00
Daniel Angell
f3e2a9d5c4 Merge "Increase num_retries to reduce likelihood of test flake" 2022-06-06 23:31:35 +00:00
Daniel Angell
6c2d812508 Increase num_retries to reduce likelihood of test flake
Flakiness was observed in this build:
https://android-build.googleplex.com/builds/pending/P35853772/qemu_generic_arm32_gicv3_test_debug/latest/view/logs/build_error.log

But most other builds do not have this issue.

Bug: 234788755
Change-Id: I4cf7d05a56eb678164bf0006bfb190442d6d4e03
2022-06-06 21:25:17 +00:00
David Drysdale
fe5cf1222e Merge "Make crate vendor_available" am: ad226c11a9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2105625

Change-Id: Ib5bf4008fd52ae0d1baabae86549e68de8afa045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 07:08:46 +00:00