From ebcc08249beeb449e41eec30d2bd0078990f4f4c Mon Sep 17 00:00:00 2001
From: Matthias Kramm <kramm@google.com>
Date: Wed, 19 Jun 2019 20:15:50 +0000
Subject: [PATCH] Revert "Allow hal_face to write to
 /data/vendor/camera_calibration/*."

This reverts commit 3a44b17897f9fb5096a9f007414335160b11a5af.

Reason for revert: Moved to downstream repo.

Change-Id: I7d3ad43335f71ed03e7a93bc5c96a8933785afd8
---
 private/compat/29.0/29.0.ignore.cil | 1 -
 private/file_contexts               | 3 ---
 public/file.te                      | 2 --
 public/hal_face.te                  | 4 ----
 vendor/hal_camera_default.te        | 4 ----
 5 files changed, 14 deletions(-)

diff --git a/private/compat/29.0/29.0.ignore.cil b/private/compat/29.0/29.0.ignore.cil
index ac46969d3..8fc3155d8 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 c1ed338e5..8150fa633 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/public/file.te b/public/file.te
index 9e0101ade..c78ddd5b9 100644
--- a/public/file.te
+++ b/public/file.te
@@ -406,8 +406,6 @@ type app_fuse_file, file_type, data_file_type, core_data_file_type, mlstrustedob
 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 4e3644f2f..b25058642 100644
--- a/public/hal_face.te
+++ b/public/hal_face.te
@@ -10,7 +10,3 @@ allow hal_face ion_device:chr_file r_file_perms;
 # 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 06c1d9cad..5bc4a6191 100644
--- a/vendor/hal_camera_default.te
+++ b/vendor/hal_camera_default.te
@@ -9,7 +9,3 @@ allow hal_camera_default fwk_sensor_hwservice:hwservice_manager find;
 # 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;