From 76c4f2043477d3bc7553f439ff7ebabf93422efb Mon Sep 17 00:00:00 2001 From: Hasini Gunasinghe Date: Tue, 20 Dec 2022 06:02:35 +0000 Subject: [PATCH] [Port ag/20645453] Map Rust KeyMint to same SELinux policy as C++ Allow the Rust and C++ implementations of the KeyMint HAL service to be toggled easily, by mapping them to the same SELinux policy. Bug: 197891150 Bug: 225036046 Test: VtsAidlKeyMintTargetTest Change-Id: Ic43985f32aaabb2560ef0b02573a1e587e24fc6a --- legacy/whitechapel_pro/file_contexts | 1 - vendor/file_contexts | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/legacy/whitechapel_pro/file_contexts b/legacy/whitechapel_pro/file_contexts index 7655c288..24192252 100644 --- a/legacy/whitechapel_pro/file_contexts +++ b/legacy/whitechapel_pro/file_contexts @@ -1,7 +1,6 @@ # Binaries /vendor/bin/dumpsys u:object_r:vendor_dumpsys:s0 /vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.trusty u:object_r:hal_gatekeeper_default_exec:s0 -/vendor/bin/hw/android\.hardware\.security\.keymint-service\.trusty u:object_r:hal_keymint_default_exec:s0 /vendor/bin/hw/android\.hardware\.contexthub-service\.generic u:object_r:hal_contexthub_default_exec:s0 /vendor/bin/hw/android\.hardware\.nfc-service\.st u:object_r:hal_nfc_default_exec:s0 diff --git a/vendor/file_contexts b/vendor/file_contexts index e1e071bc..5e7d177f 100644 --- a/vendor/file_contexts +++ b/vendor/file_contexts @@ -23,6 +23,8 @@ /vendor/bin/trusty_metricsd u:object_r:trusty_metricsd_exec:s0 /vendor/bin/chre u:object_r:chre_exec:s0 /vendor/bin/init\.uwb\.calib\.sh u:object_r:vendor_uwb_init_exec:s0 +/vendor/bin/hw/android\.hardware\.security\.keymint-service\.trusty u:object_r:hal_keymint_default_exec:s0 +/vendor/bin/hw/android\.hardware\.security\.keymint-service\.rust\.trusty u:object_r:hal_keymint_default_exec:s0 # Vendor Firmwares /vendor/firmware(/.*)? u:object_r:vendor_fw_file:s0