Merge "Add SePolicy allowances for ICameraIdRemapper" into udc-qpr-dev
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
diff --git a/storage/Android.bp b/storage/Android.bp
index 54e097e..c8671d1 100644
--- a/storage/Android.bp
+++ b/storage/Android.bp
@@ -5,6 +5,7 @@
sh_binary {
name: "dump_storage.sh",
src: "dump_storage.sh",
+ init_rc: ["init.storage.rc"],
vendor: true,
sub_dir: "dump",
}
diff --git a/storage/init.storage.rc b/storage/init.storage.rc
new file mode 100644
index 0000000..445f74b
--- /dev/null
+++ b/storage/init.storage.rc
@@ -0,0 +1,2 @@
+on property:ro.build.type=userdebug
+ write /dev/sys/block/bootdevice/pixel/enable_pixel_ufs_logging 1
diff --git a/storage/sepolicy/file_contexts b/storage/sepolicy/file_contexts
index eda4cf7..a0efd28 100644
--- a/storage/sepolicy/file_contexts
+++ b/storage/sepolicy/file_contexts
@@ -1 +1,2 @@
/vendor/bin/dump/dump_storage\.sh u:object_r:dump_storage_exec:s0
+/sys/devices/platform/[0-9]+\.ufs/pixel/enable_pixel_ufs_logging u:object_r:sysfs_scsi_devices_0000:s0