Merge "storage: turn off pixel storage debugging code on user builds" into udc-qpr-dev
diff --git a/camera/sepolicy/hal_camera_default.te b/camera/sepolicy/hal_camera_default.te
index 62eef4a..dd00cc3 100644
--- a/camera/sepolicy/hal_camera_default.te
+++ b/camera/sepolicy/hal_camera_default.te
@@ -7,3 +7,6 @@
binder_call(hal_camera_default, vendor_pbcs_app);
binder_call(hal_camera_default, vendor_pcs_app);
+
+# Allow Lyric HAL to start ISP Service
+add_service(hal_camera_default, vendor_camera_isp_service)
diff --git a/camera/sepolicy/service.te b/camera/sepolicy/service.te
index 330c7ff..1f1ac79 100644
--- a/camera/sepolicy/service.te
+++ b/camera/sepolicy/service.te
@@ -3,3 +3,5 @@
type hal_pixel_remote_camera_service, hal_service_type, protected_service, service_manager_type;
type vendor_camera_lyricconfigprovider_service, hal_service_type, protected_service, service_manager_type;
+
+type vendor_camera_isp_service, hal_service_type, protected_service, service_manager_type;
diff --git a/camera/sepolicy/service_contexts b/camera/sepolicy/service_contexts
index bec3402..50b89df 100644
--- a/camera/sepolicy/service_contexts
+++ b/camera/sepolicy/service_contexts
@@ -3,3 +3,6 @@
com.google.pixel.camera.connectivity.hal.provider.ICameraProvider/default u:object_r:hal_pixel_remote_camera_service:s0
com.google.pixel.camera.services.lyricconfigprovider.ILyricConfigProvider/default u:object_r:vendor_camera_lyricconfigprovider_service:s0
+
+com.google.pixel.camera.isp.IIspService/default u:object_r:vendor_camera_isp_service:s0
+
diff --git a/gpu/gpu.mk b/gpu/gpu.mk
deleted file mode 100644
index f7a3542..0000000
--- a/gpu/gpu.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gpu/sepolicy
-
-PRODUCT_PACKAGES += android.hardware.neuralnetworks-shim-service-armnn
diff --git a/gpu/sepolicy/file_contexts b/gpu/sepolicy/file_contexts
deleted file mode 100644
index 571c211..0000000
--- a/gpu/sepolicy/file_contexts
+++ /dev/null
@@ -1 +0,0 @@
-/vendor/bin/hw/android\.hardware\.neuralnetworks-shim-service-armnn u:object_r:hal_neuralnetworks_armnn_exec:s0
diff --git a/gpu/sepolicy/hal_neuralnetworks_armnn.te b/gpu/sepolicy/hal_neuralnetworks_armnn.te
deleted file mode 100644
index d08ec2c..0000000
--- a/gpu/sepolicy/hal_neuralnetworks_armnn.te
+++ /dev/null
@@ -1,18 +0,0 @@
-type hal_neuralnetworks_armnn, domain;
-hal_server_domain(hal_neuralnetworks_armnn, hal_neuralnetworks)
-
-type hal_neuralnetworks_armnn_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_neuralnetworks_armnn)
-
-add_service(hal_neuralnetworks_armnn, armnn_nnapi_service);
-
-allow hal_neuralnetworks_armnn armnn_app_service:service_manager find;
-
-get_prop(hal_neuralnetworks_armnn, hwservicemanager_prop)
-
-allow isolated_app app_data_file:file setattr;
-
-allow hal_neuralnetworks_armnn fwk_stats_service:service_manager find;
-binder_call(hal_neuralnetworks_armnn, system_server);
-binder_use(hal_neuralnetworks_armnn)
-
diff --git a/gpu/sepolicy/priv_app.te b/gpu/sepolicy/priv_app.te
deleted file mode 100644
index c2452f1..0000000
--- a/gpu/sepolicy/priv_app.te
+++ /dev/null
@@ -1,3 +0,0 @@
-allow priv_app armnn_app_service:service_manager find;
-allow priv_app armnn_nnapi_service:service_manager find;
-
diff --git a/gpu/sepolicy/service.te b/gpu/sepolicy/service.te
deleted file mode 100644
index cb788b6..0000000
--- a/gpu/sepolicy/service.te
+++ /dev/null
@@ -1,5 +0,0 @@
-type armnn_nnapi_service, app_api_service, service_manager_type, isolated_compute_allowed_service;
-type armnn_vendor_service, service_manager_type, hal_service_type;
-type armnn_dba_service, app_api_service, service_manager_type, isolated_compute_allowed_service;
-type armnn_app_service, service_manager_type;
-
diff --git a/gpu/sepolicy/service_contexts b/gpu/sepolicy/service_contexts
deleted file mode 100644
index d81ca78..0000000
--- a/gpu/sepolicy/service_contexts
+++ /dev/null
@@ -1,4 +0,0 @@
-com.google.armnn.IArmnnVendorService/default u:object_r:armnn_vendor_service:s0
-android.hardware.neuralnetworks.IDevice/google-armnn u:object_r:armnn_nnapi_service:s0
-com.google.armnn.IArmnnpAppService/default u:object_r:armnn_app_service:s0
-
diff --git a/pixel_metrics/sepolicy/genfs_contexts b/pixel_metrics/sepolicy/genfs_contexts
index 3be226a..45ba566 100644
--- a/pixel_metrics/sepolicy/genfs_contexts
+++ b/pixel_metrics/sepolicy/genfs_contexts
@@ -1,6 +1,7 @@
#vendor-metrics
genfscon sysfs /kernel/metrics/resume_latency/resume_latency_metrics u:object_r:sysfs_vendor_metrics:s0
genfscon sysfs /kernel/metrics/irq/long_irq_metrics u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /kernel/metrics/irq/stats_reset u:object_r:sysfs_vendor_metrics:s0
genfscon sysfs /kernel/metrics/irq/storm_irq_metrics u:object_r:sysfs_vendor_metrics:s0
genfscon sysfs /kernel/metrics/thermal/tr_by_group/tmu/stats u:object_r:sysfs_vendor_metrics:s0
genfscon sysfs /kernel/metrics/thermal/tr_by_group/spmic/stats u:object_r:sysfs_vendor_metrics:s0