| commit | 2cc40948013ef16b71fb3ed85b3a41e22f6decf6 | [log] [tgz] |
|---|---|---|
| author | Cody Schuffelen <schuffelen@google.com> | Tue Oct 29 18:52:25 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 29 18:52:25 2024 +0000 |
| tree | a00add866b284744a30e3aecb039bae9cbfc9488 | |
| parent | 5546dcd478ce42b4cdd959b08630a9b9b3f65c9a [diff] | |
| parent | 4ab29624adc1570b7c2e80274f8c98f99dee8bb7 [diff] |
Merge "Reapply "Use platform security domains in keymint/gatekeeper sepolicy"" into main am: 5937aec5c4 am: 4ab29624ad Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3324177 Change-Id: Ia85a4b1945986636f3ad7f6a637aa0f6a36ee9d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/gatekeeper/aidl/software/file_contexts b/gatekeeper/aidl/software/file_contexts index 23a62ea..cc4180e 100644 --- a/gatekeeper/aidl/software/file_contexts +++ b/gatekeeper/aidl/software/file_contexts
@@ -1,3 +1,3 @@ (/.*)? u:object_r:vendor_file:s0 /etc(/.*)? u:object_r:vendor_configs_file:s0 -/bin/hw/android\.hardware\.gatekeeper-service\.nonsecure u:object_r:hal_gatekeeper_remote_exec:s0 +/bin/hw/android\.hardware\.gatekeeper-service\.nonsecure u:object_r:hal_gatekeeper_default_exec:s0
diff --git a/security/keymint/aidl/default/file_contexts b/security/keymint/aidl/default/file_contexts index dce7e3c..41b02d5 100644 --- a/security/keymint/aidl/default/file_contexts +++ b/security/keymint/aidl/default/file_contexts
@@ -1,3 +1,3 @@ (/.*)? u:object_r:vendor_file:s0 /etc(/.*)? u:object_r:vendor_configs_file:s0 -/bin/hw/android\.hardware\.security\.keymint-service\.nonsecure u:object_r:hal_keymint_rust_exec:s0 +/bin/hw/android\.hardware\.security\.keymint-service\.nonsecure u:object_r:hal_keymint_default_exec:s0