Commit graph

78453 commits

Author SHA1 Message Date
Steven Moreland
9ab2be3708 Merge "hidl2aidl: conversion of gatekeeper hidl to aidl" am: f35d1a765d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2161817

Change-Id: I4ea26b1f760a1d7262450642502da984d2568987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:32:33 +00:00
Treehugger Robot
859473ce28 Merge "overlayfs: Fix -user build break" am: 7d07586695
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2222075

Change-Id: I890fb483f2d86d75b60e4bc289578eee2185658c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:28:13 +00:00
Treehugger Robot
1806deb5d4 Merge "Fix module-file name collisions" am: 7cad2e8654
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2205530

Change-Id: Icf100d7036ab32f2db3c14c22da92d4f84be2af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:23:42 +00:00
Jaegeuk Kim
978c70eccb Merge "fs_mgr: remove atgc mount option for zoned device" am: 4ae0eb0f86
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2222346

Change-Id: Idb23ac87d80ae30eb818f3476433207e2c8320d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:06:10 +00:00
David Anderson
c4d75a0f06 Merge "remount: Remove unused errno propagation." am: 2dcde2a36a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2180364

Change-Id: I476f678f4bcc30528eee2c6e70241069ae3d5dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:57:09 +00:00
David Anderson
81e9c6addc Merge "remount: Remove errno interaction from fs_mgr_overlayfs_teardown." am: eec8932c35
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2176922

Change-Id: I859fe1948a3a04c90d599efb3f6c28e2132fde44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:52:06 +00:00
Steven Moreland
f35d1a765d Merge "hidl2aidl: conversion of gatekeeper hidl to aidl" 2022-09-21 21:26:01 +00:00
Treehugger Robot
7d07586695 Merge "overlayfs: Fix -user build break" 2022-09-21 10:11:09 +00:00
Yi-Yo Chiang
602ac4b03c overlayfs: Fix -user build break
Bug: 241179247
Fixes: 247941706
Test: Treehugger
Change-Id: I2a7683014bb7c6f23a81a6d4b1199f19a8c184b9
2022-09-21 07:08:45 +00:00
Treehugger Robot
7cad2e8654 Merge "Fix module-file name collisions" 2022-09-20 23:24:20 +00:00
Jaegeuk Kim
4ae0eb0f86 Merge "fs_mgr: remove atgc mount option for zoned device" 2022-09-20 20:02:08 +00:00
Cole Faust
7e279e97a3 Fix module-file name collisions
Bazel doesn't allow a module and file with the same name.

Bug: 198619163
Test: Presubmits
Change-Id: I345086764071ca649de1ac11804e21675cd5e59d
2022-09-20 12:33:47 -07:00
David Anderson
2dcde2a36a Merge "remount: Remove unused errno propagation." 2022-09-20 18:23:29 +00:00
David Anderson
eec8932c35 Merge "remount: Remove errno interaction from fs_mgr_overlayfs_teardown." 2022-09-20 18:23:19 +00:00
Jaegeuk Kim
36755637ca fs_mgr: remove atgc mount option for zoned device
F2FS gives EINVAL when trying to mount zoned device with atgc. This patch
allows to keep the single fstab to support legacy and zoned devices at the
same time.

Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I47a667443e7e60cb6729553b2ca24026e21fd90d
2022-09-20 10:07:18 -07:00
Treehugger Robot
f02ac1c6fe Merge "Some device that platform base on android12 doesn't support A/B update, it looks virtual A/B is also not mandatory. so this test case should check ro.vendor.api_level first." am: 4ea99506b0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219605

Change-Id: I8e551a0bfaa92d457ffc4c2cac9ab1bceb70864f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 08:47:40 +00:00
Treehugger Robot
4ea99506b0 Merge "Some device that platform base on android12 doesn't support A/B update, it looks virtual A/B is also not mandatory. so this test case should check ro.vendor.api_level first." 2022-09-20 08:13:28 +00:00
David Anderson
76dd810ecf remount: Remove unused errno propagation.
This removes all remaining save/restores of errno in
fs_mgr_overlayfs.cpp.

Bug: 241179247
Test: adb-remount-test.sh
Change-Id: I8bae6eb2752fe9460763455e88f9b82ad57c10e4
2022-09-19 22:30:06 -07:00
David Anderson
0aabcbc973 remount: Remove errno interaction from fs_mgr_overlayfs_teardown.
This patch eliminates errno as part of the return contract for
fs_mgr_overlayfs_teardown().

The non-standard use of implicit errno makes it extremely difficult to
reason about how these functions can fail. As it turns out,
fs_mgr_overlayfs_teardown has been consistently failing for a long time,
but in a place where errno isn't set, which meant "enable-verity" never
saw the failure.

The failure was originating from umount2(MNT_DETACH) which guaranteed
that DeleteBackingImage would fail with EBUSY, and DeleteBackingImage is
a binder call that doesn't set errno.

This patch switches to umount() and returns a "busy" status if the
unmount fails with EBUSY. In this case it will also disable the scratch
partition. There is a long-standing existing bug where, for non-VAB
devices, it will delete the underlying scratch partition off super. This
is pretty risky with MNT_DETACH, but that path is left unchanged here.

Some duplicated code in set-verity-state was refactored as well, since
the return value of fs_mgr_overlayfs_teardown is now more complex.

Bug: 241179247
Test: adb-remount-test.sh
Change-Id: I2ca75332b75a302622ba9b86d122a6f2accdda3e
2022-09-19 22:30:05 -07:00
Treehugger Robot
8cd08557d2 Merge "charger: fix secondary display not turning off after first display was off" am: e18dd44fdb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199477

Change-Id: I11d8d878d1d41060f1dc7997dc024d50e59a2c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 05:21:51 +00:00
Treehugger Robot
e18dd44fdb Merge "charger: fix secondary display not turning off after first display was off" 2022-09-20 04:52:18 +00:00
Jack Wu
20b8a015c0 charger: fix secondary display not turning off after first display was off
turn off both display after first display was turned off

Bug: 242967285
Test: charging animation can show in display correctly
Signed-off-by: Jack Wu <wjack@google.com>
Change-Id: Ie5741b49322aaf8a3750b1977fb203e4d0df3539
2022-09-20 02:53:16 +00:00
Treehugger Robot
298e4b8497 Merge "Remove Python enables identical to global defaults." am: 44e21ec352
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2220546

Change-Id: I83d05c2d4438c0ee1ea9da4a9d027fbf1a86c7d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 17:06:34 +00:00
Treehugger Robot
44e21ec352 Merge "Remove Python enables identical to global defaults." 2022-09-19 16:39:57 +00:00
Subrahmanyaman
355e97773a hidl2aidl: conversion of gatekeeper hidl to aidl
Conversion of the gatekeeper hidl interface to stable aidl interface.

Bug: 205760843
Test: run vts -m VtsHalGatekeeperTarget
Change-Id: I7ca82780b1f834f00c3708dea55ac6500cd08c9c
2022-09-19 16:39:27 +00:00
Krzysztof Kosiński
519fdce310 Remove Python enables identical to global defaults.
Bug: 245854393
Test: presubmit
Change-Id: I67540844a28975f8f32539774748930907267764
2022-09-18 01:47:14 +00:00
biandonglei
9e7a73cf0c Some device that platform base on android12 doesn't support A/B update, it looks virtual A/B is also not mandatory. so this test case should check ro.vendor.api_level first.
test:
 run vts -m vts_ota_config_test -t VAB#Enabled

issue:
 245441425

Change-Id: I1795c931b28fd5fe28aa0f23717d4238fb352d37
2022-09-17 06:47:02 +00:00
Florian Mayer
f512ece7b2 Merge "Do not use GetBoolProperty in signal handler" am: 1ee1567b93
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219636

Change-Id: I6498ff07f1949d4567fe4df0533ca677bac20c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 21:56:52 +00:00
Florian Mayer
1ee1567b93 Merge "Do not use GetBoolProperty in signal handler" 2022-09-16 21:31:12 +00:00
Florian Mayer
094917deb7 Do not use GetBoolProperty in signal handler
This uses an std::string, which causes a heap allocation, which is not
async-safe.

Test: atest --no-bazel-mode permissive_mte_test
Change-Id: I4bd53d42d9a6a659abe62a964f14c81d9ec059d0
2022-09-16 12:01:40 -07:00
Treehugger Robot
c8820b2736 Merge "Updates the FB_COMMAND_SIZE from 64 to the linux max value of 4096 and updates the relevant unit tests." am: a67092a7b8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2214970

Change-Id: Ia04966a8e3895d1e9434a35e5d7d66f525b1cd13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 09:13:35 +00:00
Treehugger Robot
a67092a7b8 Merge "Updates the FB_COMMAND_SIZE from 64 to the linux max value of 4096 and updates the relevant unit tests." 2022-09-15 08:48:52 +00:00
Treehugger Robot
dcd275b3f8 Merge "Fix the build with a newer LLVM." am: eed5e27c24
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2214887

Change-Id: Ic7622f413b4ec797a8721b0e14dafafce38d009c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 02:01:24 +00:00
Treehugger Robot
eed5e27c24 Merge "Fix the build with a newer LLVM." 2022-09-15 01:45:50 +00:00
Nicolas Gagnon
57fd8bef09 Merge "Port ADB's new handling of the USB packet ClearFeature(HALT) to Fastboot." am: 57ea923f30
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2185010

Change-Id: I496a3bdc2d05a312ab10aca3d6c24da1ae5a766a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 23:39:15 +00:00
Nicolas Gagnon
57ea923f30 Merge "Port ADB's new handling of the USB packet ClearFeature(HALT) to Fastboot." 2022-09-14 23:17:56 +00:00
Nicolas Gagnon
e21b7a552d Port ADB's new handling of the USB packet ClearFeature(HALT) to Fastboot.
This patch addresses Fastboot/Fastbootd connection issues seen on ARM Mac devices.

Original ADB patch: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/1699250/

Bug: 238779161
Test: 'fastboot update <path_to_update_archive>.zip' now works on ARM Mac.

Signed-off-by: Nicolas Gagnon <nicolasgagnon@google.com>
Change-Id: Id67904d91abc8b66ef1a00962e1fd57c97df98a7
2022-09-14 21:11:30 +00:00
Elliott Hughes
b795d6fa4b Fix the build with a newer LLVM.
Unify all our "noinline" variants to the current most common one, not
least because the new [[noinline]] syntax is fussier about where it goes.

Test: treehugger
Change-Id: Icfcb75c9d687f0f05c19f66ee778fd8962519436
2022-09-14 20:16:25 +00:00
Florian Mayer
af6218b6e8 Merge "[MTE] only upgrade to SYNC mode for MTE crashes" am: 565305b852
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2215566

Change-Id: Id670c487312bb2233d36764bc06a3160dda89251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 01:52:31 +00:00
Florian Mayer
565305b852 Merge "[MTE] only upgrade to SYNC mode for MTE crashes" 2022-09-14 01:22:45 +00:00
Florian Mayer
d705c2dbcd [MTE] only upgrade to SYNC mode for MTE crashes
Bug: 244471804
Test: atest mte_ugprade_test on emulator
Change-Id: Ie974cf2dec96267012f1b01b9a40dad86551b1be
2022-09-13 15:35:07 -07:00
Christopher Ferris
4cea1cd5ce Merge "Fix thread unwind in CallStack." am: 16909c5fc7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2215567

Change-Id: I9b652f9d0e3b93b8fd0cf32aac641847977bf680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 21:41:34 +00:00
Christopher Ferris
16909c5fc7 Merge "Fix thread unwind in CallStack." 2022-09-13 21:14:02 +00:00
Bradley Furman
7518e8ba7e Updates the FB_COMMAND_SIZE from 64 to the linux max value of 4096 and
updates the relevant unit tests.

BUG=182864081

Test: Update the size check to the existing unit tests

Change-Id: I66b08884a5228e164c22c575a6f6c82a236fece2
2022-09-13 20:58:06 +00:00
Pete Bentley
fbf5cb06ba Merge "init: Add option to listen on sockets before starting service." am: 39fee4c4c0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2215044

Change-Id: I3172a5c089e86a4715ae60689bc980fd09271259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 11:53:26 +00:00
Pete Bentley
39fee4c4c0 Merge "init: Add option to listen on sockets before starting service." 2022-09-13 11:32:27 +00:00
Treehugger Robot
4ab113b8fd Merge "Explain how to get a tombstone proto." am: 8c8df2284b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2215564

Change-Id: Id209c8e176cd89ea90b713a41d4fa6a3c69b1d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 02:15:10 +00:00
Treehugger Robot
8c8df2284b Merge "Explain how to get a tombstone proto." 2022-09-13 01:42:12 +00:00
Christopher Ferris
15fee82247 Fix thread unwind in CallStack.
The CallStack unwind of a different thread was broken since it
wasn't properly setting the tid value.

Fix this problem and add new unit tests to verify the behavior.

Bug: 246405269

Test: New unit tests pass.
Test: Ran unit tests for 1000 operations to verify not flaky.
Change-Id: I00342e6cdcdb4bcb68f29734dadee6c987c98040
2022-09-12 18:37:22 -07:00
Elliott Hughes
df2e7eb3cc Explain how to get a tombstone proto.
There's a link here from the javadoc, but a link to the javadoc from
here seems like a good idea.

Test: N/A
Change-Id: I89a29f72d086d08174e72f7d0aa0421fe417f733
2022-09-12 22:24:18 +00:00