| commit | 4ab29624adc1570b7c2e80274f8c98f99dee8bb7 | [log] [tgz] |
|---|---|---|
| author | Cody Schuffelen <schuffelen@google.com> | Tue Oct 29 18:17:22 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 29 18:17:22 2024 +0000 |
| tree | 8f46910ecece453546d1fc1e240c23f7de06eb23 | |
| parent | ff32615134dc7063fe51f9428f4298ea6c49782f [diff] | |
| parent | 5937aec5c4f29a146924418e88d7972f9e05149e [diff] |
Merge "Reapply "Use platform security domains in keymint/gatekeeper sepolicy"" into main am: 5937aec5c4 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3324177 Change-Id: I9144aa397ea9f10765380cc35b8a9353f7a02b35 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