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

78630 commits

This branch
This branch
All branches
Author SHA1 Message Date
Treehugger Robot
a7070f997a Merge "Explicitly install RemoteProvisioner for keymint" am: 173bc15585 am: b946199762 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219544

Change-Id: I17cf41e4c3483715c278f7d2d06e0e87dd8e6645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 02:55:14 +00:00
Treehugger Robot
b946199762 Merge "Explicitly install RemoteProvisioner for keymint" am: 173bc15585 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219544

Change-Id: Id5b46253e553540069dd7edd14fd8ece719b23d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 02:10:18 +00:00
Treehugger Robot
173bc15585 Merge "Explicitly install RemoteProvisioner for keymint" 2022-09-23 00:46:20 +00:00
Automerger Merge Worker
906e07fadd Merge "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." into android13-tests-dev am: 9be0c7bbbc" am: f2bbe1d91a am: 856be5e634 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219604

Change-Id: I89d1786f4e14d1d30d4e6f477a68b941112b86ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-21 23:23:08 +00:00
Steven Moreland
80cb3880ce Merge "hidl2aidl: conversion of gatekeeper hidl to aidl" am: f35d1a765d am: 9ab2be3708 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2161817

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

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

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

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

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

Change-Id: I9dc2a80f5331142b4fb3b427dc7db6a261c2bd71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-21 23:03:04 +00:00
Automerger Merge Worker
856be5e634 Merge "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." into android13-tests-dev am: 9be0c7bbbc" am: f2bbe1d91a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219604

Change-Id: I30b70ff93f76358909ea43eccade756d0cb50eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-21 22:36:41 +00:00
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
Automerger Merge Worker
f2bbe1d91a Merge "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." into android13-tests-dev am: 9be0c7bbbc" 2022-09-21 21:31:56 +00:00
Treehugger Robot
c7d46a7b05 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." into android13-tests-dev am: 9be0c7bbbc 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219604

Change-Id: I1e3dc03ad750eef1fa629f6cf8349259161e2ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-21 21:31:48 +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
9be0c7bbbc 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." into android13-tests-dev 2022-09-21 00:07:44 +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
4c00574318 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 am: f02ac1c6fe 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219605

Change-Id: I6aafd33cb333a7322d1e37f26b5b660ca08d1060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 09:17:24 +00: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
Treehugger Robot
8e0bc647be Merge "charger: fix secondary display not turning off after first display was off" am: e18dd44fdb am: 8cd08557d2 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199477

Change-Id: Ia5dac900ff39df8d59a0b3a1615516dc83f5b2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 05:51:39 +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
0fce06cc32 Merge "Remove Python enables identical to global defaults." am: 44e21ec352 am: 298e4b8497 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2220546

Change-Id: I4b21a8d17dc582152650392c7df7bbc62cef093f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 17:35:29 +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
biandonglei
bfd3e38284 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:44:46 +00:00
Florian Mayer
201f2751c9 Merge "Do not use GetBoolProperty in signal handler" am: 1ee1567b93 am: f512ece7b2 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219636

Change-Id: I6e740125f998f2fe42a65bdc62739880571bafad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 22:42:47 +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
Inseob Kim
ed673496c2 Explicitly install RemoteProvisioner for keymint 
This is effectively a no-op change; both packages are installed.
However, removing required and moving it to PRODUCT_PACKAGES cuts the
dependency from vendor modules to system-ext modules. This is needed for
vendor-only build test.

Test: build and see both packages are installed
Change-Id: I6620020a1eccfab08594c9be3b298611bd237f1d
 2022-09-16 20:54:03 +09:00