commit c6c39a5554a98dc11a203231f44328cb6f313be1
author Jooyung Han <jooyung@google.com> Tue Jan 07 20:21:51 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 07 20:21:51 2025 -0800
tree 488309979bcf8bf11565ef4b1b5a7eb0b26fa08a
parent bcfe6a497a8865c207f1662b642a5698f1b5b7ad
parent 205cdad1600c1107d2457205544ee25d1f4d4de0

Merge "Virtual Face: use file_contexts in system/sepolicy" into main am: 9cc048b171 am: 205cdad160

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3431788

Change-Id: I9bbef0f52e558e58d26689cc7cb9053d49a8a4ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

biometrics/face/aidl/default/apex/Android.bp

diff --git a/biometrics/face/aidl/default/apex/Android.bp b/biometrics/face/aidl/default/apex/Android.bp
index c4632d4..0561145 100644
--- a/biometrics/face/aidl/default/apex/Android.bp
+++ b/biometrics/face/aidl/default/apex/Android.bp
@@ -19,7 +19,7 @@
 apex {
     name: "com.android.hardware.biometrics.face.virtual",
     manifest: "manifest.json",
-    file_contexts: "file_contexts",
+    file_contexts: ":com.android.biometrics.virtual.face-file_contexts",
     key: "com.android.hardware.key",
     certificate: ":com.android.hardware.certificate",
     updatable: false,

biometrics/face/aidl/default/apex/file_contexts

diff --git a/biometrics/face/aidl/default/apex/file_contexts b/biometrics/face/aidl/default/apex/file_contexts
deleted file mode 100644
index 4f935c1..0000000
--- a/biometrics/face/aidl/default/apex/file_contexts
+++ /dev/null
@@ -1,3 +0,0 @@
-(/.*)?                                          u:object_r:vendor_file:s0
-/etc(/.*)?                                      u:object_r:vendor_configs_file:s0
-/bin/hw/android\.hardware\.biometrics\.face-service\.example u:object_r:hal_face_default_exec:s0
\ No newline at end of file