Merge "Use prebuilt m4 instead of system m4"
diff --git a/private/compat/29.0/29.0.ignore.cil b/private/compat/29.0/29.0.ignore.cil
index ac46969..8fc3155 100644
--- a/private/compat/29.0/29.0.ignore.cil
+++ b/private/compat/29.0/29.0.ignore.cil
@@ -5,7 +5,6 @@
(typeattribute new_objects)
(typeattributeset new_objects
( new_objects
- camera_calibration_vendor_data_file
ctl_apexd_prop
device_config_sys_traced_prop
runtime_apex_dir
diff --git a/private/file_contexts b/private/file_contexts
index c1ed338..8150fa6 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -539,9 +539,6 @@
# Face vendor data file
/data/vendor_de/[0-9]+/facedata(/.*)? u:object_r:face_vendor_data_file:s0
-# Directory for (auto)calibration file(s)
-/data/vendor/camera_calibration(/.*)? u:object_r:camera_calibration_vendor_data_file:s0
-
# Iris vendor data file
/data/vendor_de/[0-9]+/irisdata(/.*)? u:object_r:iris_vendor_data_file:s0
diff --git a/private/incidentd.te b/private/incidentd.te
index d077926..b907040 100644
--- a/private/incidentd.te
+++ b/private/incidentd.te
@@ -97,6 +97,7 @@
hal_audio_server
hal_bluetooth_server
hal_camera_server
+ hal_face_server
hal_graphics_allocator_server
hal_graphics_composer_server
hal_health_server
diff --git a/private/system_server.te b/private/system_server.te
index 20f2437..1626fab 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -280,10 +280,12 @@
hal_audio_server
hal_bluetooth_server
hal_camera_server
+ hal_face_server
hal_graphics_allocator_server
hal_graphics_composer_server
hal_health_server
hal_omx_server
+ hal_power_stats_server
hal_sensors_server
hal_vr_server
}:process { signal };
diff --git a/public/dumpstate.te b/public/dumpstate.te
index 614e1b8..3c5d91e 100644
--- a/public/dumpstate.te
+++ b/public/dumpstate.te
@@ -79,6 +79,7 @@
hal_bluetooth_server
hal_camera_server
hal_drm_server
+ hal_face_server
hal_graphics_allocator_server
hal_graphics_composer_server
hal_health_server
diff --git a/public/file.te b/public/file.te
index 9e0101a..c78ddd5 100644
--- a/public/file.te
+++ b/public/file.te
@@ -406,8 +406,6 @@
type face_vendor_data_file, file_type, data_file_type;
# Type for iris template file
type iris_vendor_data_file, file_type, data_file_type;
-# Type for calibration template file
-type camera_calibration_vendor_data_file, file_type, data_file_type;
# Socket types
type adbd_socket, file_type, coredomain_socket;
diff --git a/public/hal_face.te b/public/hal_face.te
index 4e3644f..b250586 100644
--- a/public/hal_face.te
+++ b/public/hal_face.te
@@ -10,7 +10,3 @@
# Allow read/write access to the face template directory.
allow hal_face face_vendor_data_file:file create_file_perms;
allow hal_face face_vendor_data_file:dir rw_dir_perms;
-
-# Allow writing new camera calibrations
-allow hal_face camera_calibration_vendor_data_file:dir rw_dir_perms;
-allow hal_face camera_calibration_vendor_data_file:file create_file_perms;
diff --git a/vendor/hal_camera_default.te b/vendor/hal_camera_default.te
index 06c1d9c..5bc4a61 100644
--- a/vendor/hal_camera_default.te
+++ b/vendor/hal_camera_default.te
@@ -9,7 +9,3 @@
# For collecting bugreports.
allow hal_camera_default dumpstate:fd use;
allow hal_camera_default dumpstate:fifo_file write;
-
-# Allow reading camera calibrations
-allow hal_camera_default camera_calibration_vendor_data_file:dir search;
-allow hal_camera_default camera_calibration_vendor_data_file:file r_file_perms;